-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Security fixes: - Bumped Jackson dependency to version 2.9.10.1 which has patched CVE-2019-16942 `webauthn-server-core`: Bug fixes: - Fixed bug introduced in 1.4.0, which caused `RegistrationResult.attestationMetadata` to always be empty. `webauthn-server-attestation`: - New enum constant `Transport.LIGHTNING` - Fixed transports field of YubiKey NEO/NEO-n in `metadata.json`. - Added YubiKey 5Ci to `metadata.json`. - Most `deviceUrl` fields in `metadata.json` changed to point to stable addresses in Yubico knowledge base instead of dead redirects in store.
- Loading branch information
Showing
25 changed files
with
996 additions
and
547 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
...attestation/src/test/scala/com/yubico/webauthn/attestation/DeviceIdentificationSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // Copyright (c) 2018, Yubico AB | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are met: | ||
| // | ||
| // 1. Redistributions of source code must retain the above copyright notice, this | ||
| // list of conditions and the following disclaimer. | ||
| // | ||
| // 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| // this list of conditions and the following disclaimer in the documentation | ||
| // and/or other materials provided with the distribution. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| // FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| // DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| // SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| // CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| package com.yubico.webauthn.attestation | ||
|
|
||
| import java.util.Collections | ||
|
|
||
| import com.yubico.internal.util.CertificateParser | ||
| import com.yubico.internal.util.JacksonCodecs | ||
| import com.yubico.webauthn.attestation.resolver.SimpleAttestationResolver | ||
| import com.yubico.webauthn.attestation.resolver.SimpleTrustResolver | ||
| import com.yubico.webauthn.test.RealExamples | ||
| import com.yubico.webauthn.FinishRegistrationOptions | ||
| import com.yubico.webauthn.RelyingParty | ||
| import com.yubico.webauthn.attestation.Transport.LIGHTNING | ||
| import com.yubico.webauthn.attestation.Transport.NFC | ||
| import com.yubico.webauthn.attestation.Transport.USB | ||
| import com.yubico.webauthn.data.PublicKeyCredentialCreationOptions | ||
| import com.yubico.webauthn.data.PublicKeyCredentialParameters | ||
| import com.yubico.webauthn.test.Helpers | ||
| import org.junit.runner.RunWith | ||
| import org.scalatest.FunSpec | ||
| import org.scalatest.Matchers | ||
| import org.scalatest.junit.JUnitRunner | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
|
|
||
| @RunWith(classOf[JUnitRunner]) | ||
| class DeviceIdentificationSpec extends FunSpec with Matchers { | ||
|
|
||
| def metadataService(metadataJson: String): StandardMetadataService = { | ||
| val metadata = Collections.singleton(JacksonCodecs.json().readValue(metadataJson, classOf[MetadataObject])) | ||
| new StandardMetadataService( | ||
| new SimpleAttestationResolver(metadata, SimpleTrustResolver.fromMetadata(metadata)) | ||
| ) | ||
| } | ||
|
|
||
| describe("A RelyingParty with the default StandardMetadataService") { | ||
|
|
||
| describe("correctly identifies") { | ||
| def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]) { | ||
| val rp = RelyingParty.builder() | ||
| .identity(testData.rp) | ||
| .credentialRepository(Helpers.CredentialRepository.empty) | ||
| .metadataService(new StandardMetadataService()) | ||
| .build() | ||
|
|
||
| val result = rp.finishRegistration(FinishRegistrationOptions.builder() | ||
| .request(PublicKeyCredentialCreationOptions.builder() | ||
| .rp(testData.rp) | ||
| .user(testData.user) | ||
| .challenge(testData.attestation.challenge) | ||
| .pubKeyCredParams(List(PublicKeyCredentialParameters.ES256).asJava) | ||
| .build()) | ||
| .response(testData.attestation.credential) | ||
| .build()); | ||
|
|
||
| result.isAttestationTrusted should be (true) | ||
| result.getAttestationMetadata.isPresent should be (true) | ||
| result.getAttestationMetadata.get.getDeviceProperties.isPresent should be (true) | ||
| result.getAttestationMetadata.get.getDeviceProperties.get().get("displayName") should equal (expectedName) | ||
| result.getAttestationMetadata.get.getTransports.isPresent should be (true) | ||
| result.getAttestationMetadata.get.getTransports.get.asScala should equal (transports) | ||
| } | ||
|
|
||
| it("a YubiKey NEO.") { | ||
| check("YubiKey NEO/NEO-n", RealExamples.YubiKeyNeo, Set(USB, NFC)) | ||
| } | ||
| it("a YubiKey 4.") { | ||
| check("YubiKey 4/YubiKey 4 Nano", RealExamples.YubiKey4, Set(USB)) | ||
| } | ||
| it("a YubiKey 5 NFC.") { | ||
| check("YubiKey 5 NFC", RealExamples.YubiKey5, Set(USB, NFC)) | ||
| } | ||
| it("a YubiKey 5 Nano.") { | ||
| check("YubiKey 5 Series security key", RealExamples.YubiKey5Nano, Set(USB)) | ||
| } | ||
| it("a YubiKey 5Ci.") { | ||
| check("YubiKey 5Ci", RealExamples.YubiKey5Ci, Set(USB, LIGHTNING)) | ||
| } | ||
| it("a Security Key by Yubico.") { | ||
| check("Security Key by Yubico", RealExamples.SecurityKey, Set(USB)) | ||
| } | ||
| it("a Security Key 2 by Yubico.") { | ||
| check("Security Key by Yubico", RealExamples.SecurityKey2, Set(USB)) | ||
| } | ||
| it("a Security Key NFC by Yubico.") { | ||
| check("Security Key NFC by Yubico", RealExamples.SecurityKeyNfc, Set(USB, NFC)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| describe("The default AttestationResolver") { | ||
| describe("successfully identifies") { | ||
| def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]) { | ||
| val cert = CertificateParser.parseDer(testData.attestationCert.getBytes) | ||
| val resolved = StandardMetadataService.createDefaultAttestationResolver().resolve(cert) | ||
| resolved.isPresent should be (true) | ||
| resolved.get.getDeviceProperties.isPresent should be (true) | ||
| resolved.get.getDeviceProperties.get.get("displayName") should equal (expectedName) | ||
| resolved.get.getTransports.isPresent should be (true) | ||
| resolved.get.getTransports.get.asScala should equal (transports) | ||
| } | ||
|
|
||
| it("a YubiKey NEO.") { | ||
| check("YubiKey NEO/NEO-n", RealExamples.YubiKeyNeo, Set(USB, NFC)) | ||
| } | ||
| it("a YubiKey 4.") { | ||
| check("YubiKey 4/YubiKey 4 Nano", RealExamples.YubiKey4, Set(USB)) | ||
| } | ||
| it("a YubiKey 5 NFC.") { | ||
| check("YubiKey 5 NFC", RealExamples.YubiKey5, Set(USB, NFC)) | ||
| } | ||
| it("a YubiKey 5 Nano.") { | ||
| check("YubiKey 5 Series security key", RealExamples.YubiKey5Nano, Set(USB)) | ||
| } | ||
| it("a YubiKey 5Ci.") { | ||
| check("YubiKey 5Ci", RealExamples.YubiKey5Ci, Set(USB, LIGHTNING)) | ||
| } | ||
| it("a Security Key by Yubico.") { | ||
| check("Security Key by Yubico", RealExamples.SecurityKey, Set(USB)) | ||
| } | ||
| it("a Security Key 2 by Yubico.") { | ||
| check("Security Key by Yubico", RealExamples.SecurityKey2, Set(USB)) | ||
| } | ||
| it("a Security Key NFC by Yubico.") { | ||
| check("Security Key NFC by Yubico", RealExamples.SecurityKeyNfc, Set(USB, NFC)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.