Skip to content

Commit b94fce4

Browse files
authored
Bugfix for Additional Data (#58)
* testcase for Additional Data added, Bugfix in Class * Update QrCodeTests.kt
1 parent 3f7c1ed commit b94fce4

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

decoder/src/main/java/dgca/verifier/app/decoder/model/GreenCertificate.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222

2323
package dgca.verifier.app.decoder.model
2424

25+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
2526
import com.fasterxml.jackson.annotation.JsonProperty
2627
import java.io.Serializable
2728
import java.util.*
2829

2930
/**
3031
* CBOR structure of the certificate
3132
*/
33+
@JsonIgnoreProperties(ignoreUnknown = true)
3234
data class GreenCertificate(
3335

3436
@JsonProperty("ver")

decoder/src/test/java/dgca/verifier/app/decoder/QrCodeTests.kt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,19 @@ class QrCodeTests {
127127
assertTrue(verify(hCert, pubkey))
128128
}
129129

130+
@Test
131+
fun testAdditionalData() {
132+
val hCert =
133+
"HC1:6BFOXN%TSMAHN-HWWK2J2YWO4VKY.R/R8K4T4FCCJ9P9MXKCIL9L514:O1T2B0E/GPWBI*EDUDBQEAJJKKKMEC8.-BP7U3-SY\$N- RE09+K3C.1X31SZJ:A45OI9YI:8D+FD%PD5DL3ADHABVCNAHLW 70SO:GOLIROGO3T59YLLYP-HQLTQ9R0+L67PPDFPVX1R270:6NEQ0R6AOM*PP:+P*.1D9R+Q6646C%6RF6VY9UKP-G9++9SH9WC5ME62H1KD3*I01JAF.7Y%HZJJ0W2D4OYGFO-O%Z8JH1PCDJ*3TFH2V4LC1GLOOIFMEH3NV%JLYE93JJTD8V.D ECO/A*5UP:H26Q.2QQ0MWZJZSJUOIZS4X355Y1NXO.%SG-T1SMHSUMF2OH61OA0:VXE5N74/VJND3LVGM334HGD+3/*JLDFYIH6.OOXTB+VMREQJAXQQOPGB+HXY9.RIDSH5H9SH9/E1R:LT1V490EHJZJL/0KD1L6XJ:OS SQI3TGGEPGBO4E05QCI6*3K-LCL*7%9VHSS:*3KUJN:C2GE2GS79KALPNVDSHRE\$QK2PPBV+HHUKS/IU6MH3HEW2T0PLR8M.JPPXA30TQAJ"
134+
val base45Decoder = Base45Decoder()
135+
val decoder = DefaultCertificateDecoder(base45Decoder)
136+
val result = decoder.decodeCertificate(hCert)
137+
assertTrue(result is CertificateDecodingResult.Success)
138+
val pubkey =
139+
"MIICfzCCAiSgAwIBAgIJAInLHHNtUCCaMAoGCCqGSM49BAMCMGsxCzAJBgNVBAYTAlNHMRIwEAYDVQQIDAlTaW5nYXBvcmUxJTAjBgNVBAoMHEdvdmVybm1lbnQgVGVjaG5vbG9neSBBZ2VuY3kxITAfBgNVBAMMGGNzY2Euc3RhZ2luZy5ub3RhcmlzZS5pbzAeFw0yMTA4MjQxMDM0MDFaFw0yMzA4MjQxMDM0MDFaMF8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIDAlTaW5nYXBvcmUxGzAZBgNVBAoMEk1pbmlzdHJ5IE9mIEhlYWx0aDEfMB0GA1UEAwwWZHNjLnN0YWdpbmcubW9oLmdvdi5zZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHppW+8K1L9XNmHnuehezl3JnvMKo3OFuclEaefGVbuTBrp2oYDE7vB91nm3ZqpR6tL/1I5IdZvr+TXYg1+wll6jgbwwgbkwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBRsCO6wnLBmqzoP0Py+G99vwOyHKzAfBgNVHSMEGDAWgBRw8Z6F7tNUNI+w2qkyzRBQdF8mzDA1BgNVHR8ELjAsMCqgKKAmhiRodHRwczovL3N0YWdpbmcubm90YXJpc2UuaW8vY3NjYS5jcmwwMAYDVR0lBCkwJwYLKwYBBAGON49lAQEGCysGAQQBjjePZQECBgsrBgEEAY43j2UBAzAKBggqhkjOPQQDAgNJADBGAiEA7d5fnIuMeTl8c+sRpRKY9+3dKfLQ3nWj+paMsIhwKXMCIQDJ4xK9gyxaEnBIOj7FX1g20MloicdfPc2pximZbOrbEg=="
140+
assertTrue(verify(hCert, pubkey))
141+
}
142+
130143
@Test
131144
fun testTaggedJsonCreation() {
132145
val hCert =
@@ -151,4 +164,4 @@ class QrCodeTests {
151164
Assert.fail()
152165
}
153166
}
154-
}
167+
}

0 commit comments

Comments
 (0)