ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-02 11:16:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Undo test deletion which got lost in commit 391c6bf66f. (#4145)

Browse Source
This commit is contained in:
szymonsztuka 2018-11-01 10:29:59 +00:00 committed by GitHub
parent fcea655bf1
commit 777026eb79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/kotlin/net/corda/core/JarSignatureTestUtils.kt
View File

@ -25,8 +25,8 @@ object JarSignatureTestUtils {
.waitFor()) .waitFor())
} }
fun Path.generateKey(alias: String, password: String, name: String) = fun Path.generateKey(alias: String, password: String, name: String, keyalg: String = "RSA") =
executeProcess("keytool", "-genkey", "-keystore", "_teststore", "-storepass", "storepass", "-keyalg", "RSA", "-alias", alias, "-keypass", password, "-dname", name) executeProcess("keytool", "-genkey", "-keystore", "_teststore", "-storepass", "storepass", "-keyalg", keyalg, "-alias", alias, "-keypass", password, "-dname", name)
fun Path.createJar(fileName: String, vararg contents: String) = fun Path.createJar(fileName: String, vararg contents: String) =
executeProcess(*(arrayOf("jar", "cvf", fileName) + contents)) executeProcess(*(arrayOf("jar", "cvf", fileName) + contents))

11
core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
View File

@ -8,6 +8,7 @@ import net.corda.core.JarSignatureTestUtils.updateJar
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.CHARLIE_NAME
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.junit.After import org.junit.After
import org.junit.AfterClass import org.junit.AfterClass
@ -129,6 +130,16 @@ class JarSignatureCollectorTest {
assertFailsWith<SecurityException> { dir.getJarSigners(FILENAME) } assertFailsWith<SecurityException> { dir.getJarSigners(FILENAME) }
} }
// Signing with EC algorithm produces META-INF/*.EC file name not compatible with JAR File Spec however it's compatible with java.util.JarVerifier
// and our JarSignatureCollector
@Test
fun `one signer with EC algorithm`() {
dir.generateKey(CHARLIE, CHARLIE_PASS, CHARLIE_NAME.toString(), "EC")
dir.createJar(FILENAME, "_signable1", "_signable2")
val key = dir.signJar(FILENAME, CHARLIE, CHARLIE_PASS)
assertEquals(listOf(key), dir.getJarSigners(FILENAME)) // We only used CHARLIE's distinguished name, so the keys will be different.
}
private fun signAsAlice() = dir.signJar(FILENAME, ALICE, ALICE_PASS) private fun signAsAlice() = dir.signJar(FILENAME, ALICE, ALICE_PASS)
private fun signAsBob() = dir.signJar(FILENAME, BOB, BOB_PASS) private fun signAsBob() = dir.signJar(FILENAME, BOB, BOB_PASS)
} }