Skip to content

Commit 148ef35

Browse files
authored
Merge pull request #126 from Yubico/ykfips-5.4
Add attestation metadata for YubiKey 5 FIPS series
2 parents 5cbfd6b + 6831211 commit 148ef35

File tree

4 files changed

+150
-2
lines changed

4 files changed

+150
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
* Added missing `<dependencyManagement>` declaration to
44
`webauthn-server-attestation` and `webauthn-server-core` POMs.
55

6+
webauthn-server-attestation:
7+
8+
* Added attestation metadata for YubiKey 5 FIPS series.
9+
610

711
== Version 1.9.0 ==
812

webauthn-server-attestation/src/main/resources/metadata.json

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"identifier": "2fb54029-7613-4f1d-94f1-fb876c14a6fe",
3-
"version": 14,
3+
"version": 15,
44
"vendorInfo": {
55
"url": "https://yubico.com",
66
"imageUrl": "https://developers.yubico.com/U2F/Images/yubico.png",
@@ -241,6 +241,67 @@
241241
}
242242
}
243243
]
244+
},
245+
246+
247+
{
248+
"deviceId": "1.3.6.1.4.1.41482.1.7",
249+
"displayName": "YubiKey 5/5C NFC FIPS",
250+
"transports": 12,
251+
"deviceUrl": "https://support.yubico.com/hc/en-us/articles/360021443340-YubiKey-5-NFC-FIPS",
252+
"imageUrl": "https://developers.yubico.com/U2F/Images/YK5.png",
253+
"selectors": [
254+
{
255+
"type": "x509Extension",
256+
"parameters": {
257+
"key": "1.3.6.1.4.1.45724.1.1.4",
258+
"value": {
259+
"type": "hex",
260+
"value": "c1f9a0bc1dd2404ab27f8e29047a43fd"
261+
}
262+
}
263+
}
264+
]
265+
},
266+
267+
{
268+
"deviceId": "1.3.6.1.4.1.41482.1.7",
269+
"displayName": "YubiKey 5 FIPS series",
270+
"transports": 4,
271+
"deviceUrl": "https://support.yubico.com/hc/en-us/articles/360021467359-YubiKey-5C-FIPS",
272+
"imageUrl": "https://developers.yubico.com/U2F/Images/YK5-series.png",
273+
"selectors": [
274+
{
275+
"type": "x509Extension",
276+
"parameters": {
277+
"key": "1.3.6.1.4.1.45724.1.1.4",
278+
"value": {
279+
"type": "hex",
280+
"value": "73bb0cd4e50249b89c6fb59445bf720b"
281+
}
282+
}
283+
}
284+
]
285+
},
286+
287+
{
288+
"deviceId": "1.3.6.1.4.1.41482.1.7",
289+
"displayName": "YubiKey 5Ci FIPS",
290+
"transports": 20,
291+
"deviceUrl": "https://support.yubico.com/hc/en-us/articles/360021443360-YubiKey-5Ci-FIPS",
292+
"imageUrl": "https://developers.yubico.com/U2F/Images/YK5Ci.png",
293+
"selectors": [
294+
{
295+
"type": "x509Extension",
296+
"parameters": {
297+
"key": "1.3.6.1.4.1.45724.1.1.4",
298+
"value": {
299+
"type": "hex",
300+
"value": "8520342148f943559bc88a53846e5083"
301+
}
302+
}
303+
}
304+
]
244305
}
245306
]
246307
}

webauthn-server-attestation/src/test/scala/com/yubico/webauthn/attestation/DeviceIdentificationSpec.scala

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
7373
.identity(testData.rp)
7474
.credentialRepository(Helpers.CredentialRepository.empty)
7575
.metadataService(new StandardMetadataService())
76+
.allowUnrequestedExtensions(true)
7677
.build()
7778

7879
val result = rp.finishRegistration(
@@ -85,7 +86,10 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
8586
.user(testData.user)
8687
.challenge(testData.attestation.challenge)
8788
.pubKeyCredParams(
88-
List(PublicKeyCredentialParameters.ES256).asJava
89+
List(
90+
PublicKeyCredentialParameters.ES256,
91+
PublicKeyCredentialParameters.EdDSA,
92+
).asJava
8993
)
9094
.build()
9195
)
@@ -150,6 +154,21 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
150154
Set(USB, NFC),
151155
)
152156
}
157+
158+
it("a YubiKey 5.4 NFC FIPS.") {
159+
check(
160+
"YubiKey 5/5C NFC FIPS",
161+
RealExamples.YubikeyFips5Nfc,
162+
Set(USB, NFC),
163+
)
164+
}
165+
it("a YubiKey 5.4 Ci FIPS.") {
166+
check(
167+
"YubiKey 5Ci FIPS",
168+
RealExamples.Yubikey5ciFips,
169+
Set(USB, LIGHTNING),
170+
)
171+
}
153172
}
154173

155174
describe("fails to identify") {
@@ -259,6 +278,21 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
259278
Set(USB, NFC),
260279
)
261280
}
281+
282+
it("a YubiKey 5.4 NFC FIPS.") {
283+
check(
284+
"YubiKey 5/5C NFC FIPS",
285+
RealExamples.YubikeyFips5Nfc,
286+
Set(USB, NFC),
287+
)
288+
}
289+
it("a YubiKey 5.4 Ci FIPS.") {
290+
check(
291+
"YubiKey 5Ci FIPS",
292+
RealExamples.Yubikey5ciFips,
293+
Set(USB, LIGHTNING),
294+
)
295+
}
262296
}
263297
}
264298

webauthn-server-core/src/test/scala/com/yubico/webauthn/test/RealExamples.scala

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,4 +460,53 @@ object RealExamples {
460460
),
461461
)
462462

463+
val YubikeyFips5Nfc = Example(
464+
RelyingPartyIdentity.builder().id("demo.yubico.com").name("").build(),
465+
UserIdentity
466+
.builder()
467+
.name("6vTZo5MBEbaH")
468+
.displayName("6vTZo5MBEbaH")
469+
.id(ByteArray.fromBase64("tabbiLeU61rCtgcNOC+9J6doMN8DQnm2IEaa4Ps+gqU="))
470+
.build(),
471+
AttestationExample(
472+
"""{"type":"webauthn.create","challenge":"BkRnXYHVbiUEJYPPcVAOig","origin":"https://demo.yubico.com","crossOrigin":false,"other_keys_can_be_added_here":"do not compare clientDataJSON against a template. See https://goo.gl/yabPex"}""",
473+
ByteArray.fromBase64("o2NmbXRmcGFja2VkZ2F0dFN0bXSjY2FsZyZjc2lnWEcwRQIhAMrVMrCPZDK3RNFKKdDOYoSPsEqgSecbvfUIuPk84nIwAiA6VbneoEArKqgrwWnDcQi03kyWQrPmr3JqHtPUXNGitWN4NWOBWQLwMIIC7DCCAdSgAwIBAgIJAN1TJeaFJ6cVMA0GCSqGSIb3DQEBCwUAMC4xLDAqBgNVBAMTI1l1YmljbyBVMkYgUm9vdCBDQSBTZXJpYWwgNDU3MjAwNjMxMCAXDTE0MDgwMTAwMDAwMFoYDzIwNTAwOTA0MDAwMDAwWjBvMQswCQYDVQQGEwJTRTESMBAGA1UECgwJWXViaWNvIEFCMSIwIAYDVQQLDBlBdXRoZW50aWNhdG9yIEF0dGVzdGF0aW9uMSgwJgYDVQQDDB9ZdWJpY28gVTJGIEVFIFNlcmlhbCAxNzEzNzIyMzMzMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDeoY3vFmcuLvf1SL2oqIV5WaVs9VGyB4GPmtxdHY84v/+R2wtLKvAfjIH9eTIq3+Ev3+UQLipTY0Bb9Xn9Sp3KOBlDCBkTATBgorBgEEAYLECg0BBAUEAwUEAjAQBgkrBgEEAYLECgwEAwIBBDAiBgkrBgEEAYLECgIEFTEuMy42LjEuNC4xLjQxNDgyLjEuNzATBgsrBgEEAYLlHAIBAQQEAwIEMDAhBgsrBgEEAYLlHAEBBAQSBBDB+aC8HdJASrJ/jikEekP9MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAGl5dmZIe5GOHFOAvVUaWFWyet89UCHWKmLBTXXfuoPwYqatxGhVqIeiV4nAuFF127294SzJcMgzycToui5/g8OUonTvs9xWF9yH23fXjGcBWoGErlF7DqkycOz2NtjPhGwEfBnE++0/KRc/IN6bu7u/XPXNwNmCLcg0reERI23NO/ZftcWebjRBCwY3p6l0ahalKmrgqOi7bhU1AjbHmiEvJgeBcpZphS87eikierMO5PmwvdbV3okNseEoaeoHDDQ7Av6RwCtKCXwYupRs6sULgUwo0fz2znURA+zSuTzK4iZ/hmQvRVJtQBPtfpwBEmNEdwwZ1A+VxfspsYzA7AVoYXV0aERhdGFYn8Rs74KtG1Rkd1kdAIsIdZ7D5tLstPOUdL/qaWmSXQO3xQAAAALB+aC8HdJASrJ/jikEekP9ADCoKvXSwuTSIXADOmvBwyJiDqQ6hh3epKxT2gFcv7/fe7KF6ZidYuy5hytIti+jyUSkAQEDJyAGIVggqCr10sLk0iFwAzprwb1UlYO/I5e1odNDyARvWzyHZkuha2NyZWRQcm90ZWN0Ag=="),
474+
),
475+
AssertionExample(
476+
id = ByteArray.fromBase64Url(
477+
"qCr10sLk0iFwAzprwcMiYg6kOoYd3qSsU9oBXL-_33uyhemYnWLsuYcrSLYvo8lE"
478+
),
479+
clientData = """{"type":"webauthn.get","challenge":"P0MvFaK3Bz-YYVYfCXfBig","origin":"https://demo.yubico.com","crossOrigin":false}""",
480+
authDataBytes = ByteArray.fromBase64(
481+
"xGzvgq0bVGR3WR0Aiwh1nsPm0uy085R0v+ppaZJdA7cFAAAAAw=="
482+
),
483+
sig =
484+
ByteArray.fromBase64("Q0omzU9kPFnxd9njE5+fWLDDFxPIXRrPJ3fSGniU2+UHp1NUZJtMwc4iddbXiYNZ2GN5frrG3tf72oAoI+i3BQ=="),
485+
),
486+
)
487+
488+
val Yubikey5ciFips = Example(
489+
RelyingPartyIdentity.builder().id("demo.yubico.com").name("").build(),
490+
UserIdentity
491+
.builder()
492+
.name("6J8bPm5pgZxx")
493+
.displayName("6J8bPm5pgZxx")
494+
.id(ByteArray.fromBase64("cj5f7W52d8rucMRXw+F+k/tMcMjRZbWNmmayWQ/s1hY="))
495+
.build(),
496+
AttestationExample(
497+
"""{"type":"webauthn.create","challenge":"hnZ_h1C2W1hIvTv-TczSDQ","origin":"https://demo.yubico.com","crossOrigin":false}""",
498+
ByteArray.fromBase64("o2NmbXRmcGFja2VkZ2F0dFN0bXSjY2FsZyZjc2lnWEcwRQIgNjV3981oAhwpWDaw0VT7o/KK/OZ4MJF1Gx3p68dfgSkCIQClgMNxOuNeWlX3OEekplBvZyEdnjrgXHPK4+qxbgb6yWN4NWOBWQLwMIIC7DCCAdSgAwIBAgIJAJt5F3hRiVnmMA0GCSqGSIb3DQEBCwUAMC4xLDAqBgNVBAMTI1l1YmljbyBVMkYgUm9vdCBDQSBTZXJpYWwgNDU3MjAwNjMxMCAXDTE0MDgwMTAwMDAwMFoYDzIwNTAwOTA0MDAwMDAwWjBvMQswCQYDVQQGEwJTRTESMBAGA1UECgwJWXViaWNvIEFCMSIwIAYDVQQLDBlBdXRoZW50aWNhdG9yIEF0dGVzdGF0aW9uMSgwJgYDVQQDDB9ZdWJpY28gVTJGIEVFIFNlcmlhbCAyMDE0ODA0Mzc5MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETAZOKKrzwwAt0vCs9bDGCjmvATlCgCkn53Sp13iiRNQHa2HepLsy8Dm+h5K4wqkoKGuo16K1omdeUHSs8syPraOBlDCBkTATBgorBgEEAYLECg0BBAUEAwUEAjAQBgkrBgEEAYLECgwEAwIBBDAiBgkrBgEEAYLECgIEFTEuMy42LjEuNC4xLjQxNDgyLjEuNzATBgsrBgEEAYLlHAIBAQQEAwICJDAhBgsrBgEEAYLlHAEBBAQSBBCFIDQhSPlDVZvIilOEblCDMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAFybB6BcC0kstjohJiA8Aczi2MQqkVWOUaLTtdrWyPcbSHfiqjjtn2J4lDxrCossqvmwrpAJ6vZ4rvHpv8dcJAFCA8Q02SaMWU/HgBjf3EZsowaxJqTPYsq86UmQG0+Y9BGuLZ1higWE1Pptpgumwkimo7q/H6Hvv0Da2FReEzAHYpwwrDfak+O+s3HEiKRRoqAprheNSunp1YXCnq6PCMho+gFbM1ULgx7D3eN/AQfMlhwa7vN7SoDRA93o6Gojdh54Mm2M5KuxX5NmNgfcfn7csvhXuDEw3J6YUE1Nd79bOBFAdSc1ZcQLBGaggIYQwy7p0R8gWh0T4AZEk+GHsMdoYXV0aERhdGFYxMRs74KtG1Rkd1kdAIsIdZ7D5tLstPOUdL/qaWmSXQO3QQAAAAKFIDQhSPlDVZvIilOEblCDAECp43L1YZ3opECrhpd//EKA6uCMmhEftV7woLtQndymMNoWu/l6CvmQnuYGWsaIeVnQ6QP9e2x36VBO79iavVyupQECAyYgASFYIMMwT+xzGRGxDx68988LHQ2WBrHQ0/ikpBffxxPtyQ92Ilggq9B/tvF9OQzKJddRibjoYmYfZtVk20wt7OKpz/a4FLU="),
499+
),
500+
AssertionExample(
501+
id =
502+
ByteArray.fromBase64Url("qeNy9WGd6KRAq4aXf_xCgOrgjJoRH7Ve8KC7UJ3cpjDaFrv5egr5kJ7mBlrGiHlZ0OkD_Xtsd-lQTu_Ymr1crg"),
503+
clientData = """{"type":"webauthn.get","challenge":"gJQG3mUBQv5rR7mwUuHbxQ","origin":"https://demo.yubico.com","crossOrigin":false"}""",
504+
authDataBytes = ByteArray.fromBase64(
505+
"xGzvgq0bVGR3WR0Aiwh1nsPm0uy085R0v+ppaZJdA7cBAAAABQ=="
506+
),
507+
sig =
508+
ByteArray.fromBase64("MEQCIEZeZWSy5CfVPMIGnU1Fi3+K+8ID6YTDxdckc9174ICeAiA1qRNIbPoo2tMSR1wFi5PTb6s+nZ2q9apv9NhnDbNZig=="),
509+
),
510+
)
511+
463512
}

0 commit comments

Comments
 (0)