diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/AbstractSignerTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/AbstractSignerTest.java index 0dde518..2b9773f 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/AbstractSignerTest.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/AbstractSignerTest.java @@ -25,7 +25,7 @@ class AbstractSignerTest { list.add(KeyText.loadTestRSA()); CertificateProvider certificateProvider = new LocalCertificateProvider(list); TestVerifier verifier = new TestVerifier(certificateProvider); - Assertions.assertTrue(verifier.verify("", message, sg)); + Assertions.assertTrue(verifier.verify("6CDDAA92CAD75998325027647847330C1756291", message, sg)); } @Test diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/SignatureResultTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/SignatureResultTest.java index 2ecb0aa..263686f 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/SignatureResultTest.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/SignatureResultTest.java @@ -7,13 +7,13 @@ class SignatureResultTest { @Test void getResult() { - SignatureResult result = new SignatureResult("", "123456"); + SignatureResult result = new SignatureResult("6CDDAA92CAD75998325027647847330C1756291", "123456"); Assertions.assertEquals("123456", result.getSignature()); } @Test void testToString() { - SignatureResult result = new SignatureResult("", "123456"); - Assertions.assertEquals("{\"signature\":\"123456\"}", result.toString()); + SignatureResult result = new SignatureResult("6CDDAA92CAD75998325027647847330C1756291", "123456"); + Assertions.assertEquals("{\"certificateSerial\":\"6CDDAA92CAD75998325027647847330C1756291\",\"signature\":\"123456\"}", result.toString()); } } \ No newline at end of file diff --git a/scfs-api-rsa/pom.xml b/scfs-api-rsa/pom.xml index a8f5704..d57b4f2 100644 --- a/scfs-api-rsa/pom.xml +++ b/scfs-api-rsa/pom.xml @@ -21,4 +21,16 @@ 2.0.0-snapshot + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/scfs-api-rsa/src/test/java/com/czcb/scfs/api/rsa/RsaProfileTest.java b/scfs-api-rsa/src/test/java/com/czcb/scfs/api/rsa/RsaProfileTest.java index 573e4cf..0ab179a 100644 --- a/scfs-api-rsa/src/test/java/com/czcb/scfs/api/rsa/RsaProfileTest.java +++ b/scfs-api-rsa/src/test/java/com/czcb/scfs/api/rsa/RsaProfileTest.java @@ -15,6 +15,8 @@ class RsaProfileTest { PrivateKey key = KeyText.loadTestPrivateKeyRSA(); X509Certificate certificate = KeyText.loadTestRSA(); + System.out.println(certificate.getSerialNumber().toString(16).toUpperCase()); + RsaProfile profile = new RsaProfile.Builder() .channel(new DefaultChannel.Builder() .channelNo("0000") @@ -28,7 +30,7 @@ class RsaProfileTest { String message = "1234567"; String signResult = profile.getSignature().getSigner().sign(message).getSignature(); - Assertions.assertTrue(profile.getSignature().getVerifier().verify(null, message, signResult)); + Assertions.assertTrue(profile.getSignature().getVerifier().verify("6CDDAA92CAD75998325027647847330C1756291", message, signResult)); Assertions.assertEquals("0000", profile.getChannel().getChannelNo()); Assertions.assertEquals("100001", profile.getChannel().getAppNo()); diff --git a/scfs-api-sm/src/test/java/com/czcb/scfs/api/sm/SmProfileTest.java b/scfs-api-sm/src/test/java/com/czcb/scfs/api/sm/SmProfileTest.java index faf0628..e077880 100644 --- a/scfs-api-sm/src/test/java/com/czcb/scfs/api/sm/SmProfileTest.java +++ b/scfs-api-sm/src/test/java/com/czcb/scfs/api/sm/SmProfileTest.java @@ -13,7 +13,6 @@ import static com.czcb.scfs.api.sm.SMKeyText.PRIVATE_TEXT_SM2; class SmProfileTest { - @Test void test() { SmProfile profile = new SmProfile.Builder() @@ -23,13 +22,14 @@ class SmProfileTest { .build()) .privateKey(PemFile.loadPrivateKeyFromString(PRIVATE_TEXT_SM2, "EC", KonaProvider.NAME)) .addCertificate(PemFile.loadX509FromString(CERTIFICATE_TEXT_SM2, KonaProvider.NAME)) + .certificateSerial("B47BF250D13D6DC72D2869D340CDF8B830F2CFD320B652586C3D4861F86CA355") .build(); Assertions.assertNotNull(profile); String message = "1234567"; String signResult = profile.getSignature().getSigner().sign(message).getSignature(); - Assertions.assertTrue(profile.getSignature().getVerifier().verify(null, message, signResult)); + Assertions.assertTrue(profile.getSignature().getVerifier().verify("B47BF250D13D6DC72D2869D340CDF8B830F2CFD320B652586C3D4861F86CA355", message, signResult)); Assertions.assertEquals("0000", profile.getChannel().getChannelNo()); Assertions.assertEquals("100001", profile.getChannel().getAppNo()); diff --git a/scfs-api-spring-boot-starter/src/test/java/com/czcb/scfs/spring/boot/starter/ScfsApiGatewayPropertiesTest.java b/scfs-api-spring-boot-starter/src/test/java/com/czcb/scfs/spring/boot/starter/ScfsApiGatewayPropertiesTest.java index 635da56..0bdf480 100644 --- a/scfs-api-spring-boot-starter/src/test/java/com/czcb/scfs/spring/boot/starter/ScfsApiGatewayPropertiesTest.java +++ b/scfs-api-spring-boot-starter/src/test/java/com/czcb/scfs/spring/boot/starter/ScfsApiGatewayPropertiesTest.java @@ -85,7 +85,7 @@ class ScfsApiGatewayPropertiesTest { ScfsApiGatewayProperties.Cipher cipher = new ScfsApiGatewayProperties.Cipher(); cipher.setStoreType(StoreType.RESOURCES); cipher.setChannelPrivateKey("/home/key.pem"); - cipher.setChannelCertificateSerial("/home/c1.pem"); + cipher.setChannelCertificateSerial("B47BF250D13D6DC72D2869D340CDF8B830F2CFD320B652586C3D4861F86CA355"); cipher.setCertificate(Lists.newArrayList("/home/c2.pem")); ScfsApiGatewayProperties properties = new ScfsApiGatewayProperties(); @@ -93,7 +93,7 @@ class ScfsApiGatewayPropertiesTest { Assertions.assertNotNull(properties.getCipher()); - assertThatJson("{\"storeType\":\"RESOURCES\",\"channelPrivateKey\":\"/home/key.pem\",\"channelCertificate\":\"/home/c1.pem\",\"certificate\":\"/home/c2.pem\"}") + assertThatJson("{\"certificate\":[\"/home/c2.pem\"],\"channelCertificateSerial\":\"B47BF250D13D6DC72D2869D340CDF8B830F2CFD320B652586C3D4861F86CA355\",\"channelPrivateKey\":\"/home/key.pem\",\"storeType\":\"RESOURCES\"}") .isEqualTo(properties.getCipher()); } diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties index c319107..5f05b48 100644 --- a/scfs-api-test/src/main/resources/application.properties +++ b/scfs-api-test/src/main/resources/application.properties @@ -1,7 +1,7 @@ scfs.api-gateway.online=false scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway scfs.api-gateway.channel.channel-no=0000 -scfs.api-gateway.channel.app-no=000000 +scfs.api-gateway.channel.app-no=10 scfs.api-gateway.cipher.store-type=resources #scfs.api-gateway.cipher.channel-private-key=rsa_channel_private_key.pem #scfs.api-gateway.cipher.certificate=rsa_channel_certificate.pem diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java index f1303b2..a55ad3d 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java @@ -32,7 +32,7 @@ class ApiGatewayTest { void testQuery() { QueryBalanceRequest queryBalanceRequest = new QueryBalanceRequest(); queryBalanceRequest.setChannelNo("0000"); - queryBalanceRequest.setAppNo("000000"); + queryBalanceRequest.setAppNo("10"); queryBalanceRequest.setSerialNo(UUID.randomUUID().toString().replace("-", "")); queryBalanceRequest.setAccountNo("1012230221000010"); queryBalanceRequest.setRelationAcct("1");