Skip to content

Commit 9cb7678

Browse files
fdennisfdennis
committed
gradle spotlessApply
1 parent 9d42ad8 commit 9cb7678

2 files changed

Lines changed: 34 additions & 11 deletions

File tree

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/RegistrationTestData.scala‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,14 +436,31 @@ object RegistrationTestData {
436436

437437
val BasicAttestationEd448: RegistrationTestData = new RegistrationTestData(
438438
alg = COSEAlgorithmIdentifier.EdDSA,
439-
attestationObject = ByteArray.fromHex("a3686175746844617461589a49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97634100000539000102030405060708090a0b0c0d0e0f00208949ee95a419e9186eff6ae57b4138cabab993f5f74ad1215b9119f160d25409a4010103272007215839133e1ea9c30e3f84da22b86b4e558316a373c6a2eefa924070301bd58be1c526969dccad758da1a5a8d860304de3e9f18bbe9afb2562b03f8063666d74667061636b65646761747453746d74a363616c67266373696758453043021f6412053083668bdb23e10c27b50e13d6ca240b6a5f5680204b0782f77490df02207870bc2945ac305d5c5625df063bed07f78bfcc3d087c6e1c335154fb0d3472c63783563815901bf308201bb30820162a00302010202020f33300a06082a8648ce3d04030230673123302106035504030c1a59756269636f20576562417574686e20756e6974207465737473310f300d060355040a0c0659756269636f31223020060355040b0c1941757468656e74696361746f72204174746573746174696f6e310b3009060355040613025345301e170d3138303930363137343230305a170d3138303931333137343230305a30673123302106035504030c1a59756269636f20576562417574686e20756e6974207465737473310f300d060355040a0c0659756269636f31223020060355040b0c1941757468656e74696361746f72204174746573746174696f6e310b30090603550406130253453059301306072a8648ce3d020106082a8648ce3d030107034200049250559f0ed62a9b4fe2691466f5f26bffa3adceb8c586255e6517608371e20e0e57a32154bbfb5c9733490ae7be5ad51e3b0eefb244bf59a8ef8e70700145dc300a06082a8648ce3d0403020347003044022016c364e7be13502ffd6c5a056df524fac3e2e9232ec1d281552e91f437936aae02205de77c0656bcc6a691758118276ee7bdc7525ad2fed6385ce883de7c86202a8f"),
439+
attestationObject =
440+
ByteArray.fromHex("a3686175746844617461589a49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97634100000539000102030405060708090a0b0c0d0e0f00208949ee95a419e9186eff6ae57b4138cabab993f5f74ad1215b9119f160d25409a4010103272007215839133e1ea9c30e3f84da22b86b4e558316a373c6a2eefa924070301bd58be1c526969dccad758da1a5a8d860304de3e9f18bbe9afb2562b03f8063666d74667061636b65646761747453746d74a363616c67266373696758453043021f6412053083668bdb23e10c27b50e13d6ca240b6a5f5680204b0782f77490df02207870bc2945ac305d5c5625df063bed07f78bfcc3d087c6e1c335154fb0d3472c63783563815901bf308201bb30820162a00302010202020f33300a06082a8648ce3d04030230673123302106035504030c1a59756269636f20576562417574686e20756e6974207465737473310f300d060355040a0c0659756269636f31223020060355040b0c1941757468656e74696361746f72204174746573746174696f6e310b3009060355040613025345301e170d3138303930363137343230305a170d3138303931333137343230305a30673123302106035504030c1a59756269636f20576562417574686e20756e6974207465737473310f300d060355040a0c0659756269636f31223020060355040b0c1941757468656e74696361746f72204174746573746174696f6e310b30090603550406130253453059301306072a8648ce3d020106082a8648ce3d030107034200049250559f0ed62a9b4fe2691466f5f26bffa3adceb8c586255e6517608371e20e0e57a32154bbfb5c9733490ae7be5ad51e3b0eefb244bf59a8ef8e70700145dc300a06082a8648ce3d0403020347003044022016c364e7be13502ffd6c5a056df524fac3e2e9232ec1d281552e91f437936aae02205de77c0656bcc6a691758118276ee7bdc7525ad2fed6385ce883de7c86202a8f"),
440441
clientDataJson = """{"challenge":"AAEBAgMFCA0VIjdZEGl5Yls","origin":"https://localhost","type":"webauthn.create","tokenBinding":{"status":"supported"}}""",
441-
privateKey = Some(ByteArray.fromHex("308183020101300506032b6571043b04393994e9831a4ff9c59b19a72bb954588772b579535bde45dba37293c166bade3a18b709887f959a72c719f0ca2903a4d14a32f098f36463d247813a00133e1ea9c30e3f84da22b86b4e558316a373c6a2eefa924070301bd58be1c526969dccad758da1a5a8d860304de3e9f18bbe9afb2562b03f80")),
442-
attestationCertChain = List(RegistrationTestDataGenerator.importAttestationCa("MIIBuzCCAWKgAwIBAgICDzMwCgYIKoZIzj0EAwIwZzEjMCEGA1UEAwwaWXViaWNvIFdlYkF1dGhuIHVuaXQgdGVzdHMxDzANBgNVBAoMBll1YmljbzEiMCAGA1UECwwZQXV0aGVudGljYXRvciBBdHRlc3RhdGlvbjELMAkGA1UEBhMCU0UwHhcNMTgwOTA2MTc0MjAwWhcNMTgwOTEzMTc0MjAwWjBnMSMwIQYDVQQDDBpZdWJpY28gV2ViQXV0aG4gdW5pdCB0ZXN0czEPMA0GA1UECgwGWXViaWNvMSIwIAYDVQQLDBlBdXRoZW50aWNhdG9yIEF0dGVzdGF0aW9uMQswCQYDVQQGEwJTRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJJQVZ8O1iqbT+JpFGb18mv/o63OuMWGJV5lF2CDceIODlejIVS7+1yXM0kK575a1R47Du+yRL9ZqO+OcHABRdwwCgYIKoZIzj0EAwIDRwAwRAIgFsNk574TUC/9bFoFbfUk+sPi6SMuwdKBVS6R9DeTaq4CIF3nfAZWvMamkXWBGCdu573HUlrS/tY4XOiD3nyGICqP", "EC", "MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgOHnGiMuvqnoNrn0Ak6u7dBTeLlX1SvPEpUEoV3+ufcygCgYIKoZIzj0DAQehRANCAASSUFWfDtYqm0/iaRRm9fJr/6OtzrjFhiVeZRdgg3HiDg5XoyFUu/tclzNJCue+WtUeOw7vskS/WajvjnBwAUXc")),
443-
assertion = Some(AssertionTestData(
444-
request = JacksonCodecs.json().readValue("""{"publicKeyCredentialRequestOptions":{"challenge":"N3LjI2J5ylyWe3ED5OT4XHLRqHwm_J48_D_hoJOFf30","hints":[],"userVerification":"preferred","extensions":{}},"username":"test@test.org"}""", classOf[AssertionRequest]),
445-
response = PublicKeyCredential.parseAssertionResponseJson("""{"id":"iUnulaQZ6Rhu_2rle0E4yrq5k_X3StEhW5EZ8WDSVAk","response":{"authenticatorData":"SZYN5YgOjGh0NBcPZHZgW4_krrmihjLHmVzzuoMdl2MBAAAFOQ","clientDataJSON":"eyJjaGFsbGVuZ2UiOiJOM0xqSTJKNXlseVdlM0VENU9UNFhITFJxSHdtX0o0OF9EX2hvSk9GZjMwIiwib3JpZ2luIjoiaHR0cHM6Ly9sb2NhbGhvc3QiLCJ0eXBlIjoid2ViYXV0aG4uZ2V0IiwidG9rZW5CaW5kaW5nIjp7InN0YXR1cyI6InN1cHBvcnRlZCJ9fQ","signature":"IuPj_4DjsdAlyMmCHVomccIzXWYGL2LpbvnJGrTbBEsTv22Y5TcRy3n3iW0uaUyzObSViVnHkloAIOKkuUATsuX_gUTfuNc2BW8WlNz8Jd92knsyVYInxduHxgCGTXxmhQ6Nu1yYify6994x6Hs6cysA"},"clientExtensionResults":{},"type":"public-key"}""")
446-
)),
442+
privateKey = Some(
443+
ByteArray.fromHex("308183020101300506032b6571043b04393994e9831a4ff9c59b19a72bb954588772b579535bde45dba37293c166bade3a18b709887f959a72c719f0ca2903a4d14a32f098f36463d247813a00133e1ea9c30e3f84da22b86b4e558316a373c6a2eefa924070301bd58be1c526969dccad758da1a5a8d860304de3e9f18bbe9afb2562b03f80")
444+
),
445+
attestationCertChain = List(
446+
RegistrationTestDataGenerator.importAttestationCa(
447+
"MIIBuzCCAWKgAwIBAgICDzMwCgYIKoZIzj0EAwIwZzEjMCEGA1UEAwwaWXViaWNvIFdlYkF1dGhuIHVuaXQgdGVzdHMxDzANBgNVBAoMBll1YmljbzEiMCAGA1UECwwZQXV0aGVudGljYXRvciBBdHRlc3RhdGlvbjELMAkGA1UEBhMCU0UwHhcNMTgwOTA2MTc0MjAwWhcNMTgwOTEzMTc0MjAwWjBnMSMwIQYDVQQDDBpZdWJpY28gV2ViQXV0aG4gdW5pdCB0ZXN0czEPMA0GA1UECgwGWXViaWNvMSIwIAYDVQQLDBlBdXRoZW50aWNhdG9yIEF0dGVzdGF0aW9uMQswCQYDVQQGEwJTRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJJQVZ8O1iqbT+JpFGb18mv/o63OuMWGJV5lF2CDceIODlejIVS7+1yXM0kK575a1R47Du+yRL9ZqO+OcHABRdwwCgYIKoZIzj0EAwIDRwAwRAIgFsNk574TUC/9bFoFbfUk+sPi6SMuwdKBVS6R9DeTaq4CIF3nfAZWvMamkXWBGCdu573HUlrS/tY4XOiD3nyGICqP",
448+
"EC",
449+
"MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgOHnGiMuvqnoNrn0Ak6u7dBTeLlX1SvPEpUEoV3+ufcygCgYIKoZIzj0DAQehRANCAASSUFWfDtYqm0/iaRRm9fJr/6OtzrjFhiVeZRdgg3HiDg5XoyFUu/tclzNJCue+WtUeOw7vskS/WajvjnBwAUXc",
450+
)
451+
),
452+
assertion = Some(
453+
AssertionTestData(
454+
request = JacksonCodecs
455+
.json()
456+
.readValue(
457+
"""{"publicKeyCredentialRequestOptions":{"challenge":"N3LjI2J5ylyWe3ED5OT4XHLRqHwm_J48_D_hoJOFf30","hints":[],"userVerification":"preferred","extensions":{}},"username":"test@test.org"}""",
458+
classOf[AssertionRequest],
459+
),
460+
response =
461+
PublicKeyCredential.parseAssertionResponseJson("""{"id":"iUnulaQZ6Rhu_2rle0E4yrq5k_X3StEhW5EZ8WDSVAk","response":{"authenticatorData":"SZYN5YgOjGh0NBcPZHZgW4_krrmihjLHmVzzuoMdl2MBAAAFOQ","clientDataJSON":"eyJjaGFsbGVuZ2UiOiJOM0xqSTJKNXlseVdlM0VENU9UNFhITFJxSHdtX0o0OF9EX2hvSk9GZjMwIiwib3JpZ2luIjoiaHR0cHM6Ly9sb2NhbGhvc3QiLCJ0eXBlIjoid2ViYXV0aG4uZ2V0IiwidG9rZW5CaW5kaW5nIjp7InN0YXR1cyI6InN1cHBvcnRlZCJ9fQ","signature":"IuPj_4DjsdAlyMmCHVomccIzXWYGL2LpbvnJGrTbBEsTv22Y5TcRy3n3iW0uaUyzObSViVnHkloAIOKkuUATsuX_gUTfuNc2BW8WlNz8Jd92knsyVYInxduHxgCGTXxmhQ6Nu1yYify6994x6Hs6cysA"},"clientExtensionResults":{},"type":"public-key"}"""),
462+
)
463+
),
447464
) {
448465
override def regenerate() =
449466
TestAuthenticator.createBasicAttestedCredential(

‎webauthn-server-core/src/test/scala/com/yubico/webauthn/WebAuthnTestCodecs.scala‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,18 @@ object WebAuthnTestCodecs {
7474
val keyBytesEd25519 = 32
7575
val keyBytesEd448 = 57
7676

77-
val ed25519Oid = Array[Byte](0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70) // OID for Ed25519 1.3.101.112
78-
val ed448Oid = Array[Byte](0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x71) // OID for Ed448 1.3.101.113
77+
val ed25519Oid =
78+
Array[Byte](0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
79+
0x70) // OID for Ed25519 1.3.101.112
80+
val ed448Oid =
81+
Array[Byte](0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
82+
0x71) // OID for Ed448 1.3.101.113
7983

8084
val (crv, keyBytes) =
81-
if (encoded.length > 9 && encoded.slice(2, 9).sameElements(ed25519Oid)) (6L, keyBytesEd25519) // crv: Ed25519
82-
else if (encoded.length > 9 && encoded.slice(2, 9).sameElements(ed448Oid)) (7L, keyBytesEd448) // crv: Ed448
85+
if (encoded.length > 9 && encoded.slice(2, 9).sameElements(ed25519Oid))
86+
(6L, keyBytesEd25519) // crv: Ed25519
87+
else if (encoded.length > 9 && encoded.slice(2, 9).sameElements(ed448Oid))
88+
(7L, keyBytesEd448) // crv: Ed448
8389
else throw new IllegalArgumentException("Unknown EdDSA ASN.1 OID prefix")
8490

8591
coseKey.put(-1L, crv)

0 commit comments

Comments
 (0)