Delete/fix unused code

Author: emlun

webauthn-server-attestation/src/integrationTest/scala/com/yubico/fido/metadata/FidoMetadataServiceIntegrationTest.scala

@@ -1,6 +1,5 @@
 package com.yubico.fido.metadata
 
-import com.fasterxml.jackson.databind.JsonNode
 import com.yubico.fido.metadata.AttachmentHint.ATTACHMENT_HINT_EXTERNAL
 import com.yubico.fido.metadata.AttachmentHint.ATTACHMENT_HINT_INTERNAL
 import com.yubico.fido.metadata.AttachmentHint.ATTACHMENT_HINT_NFC
@@ -10,7 +9,6 @@ import com.yubico.internal.util.CertificateParser
 import com.yubico.webauthn.FinishRegistrationOptions
 import com.yubico.webauthn.RelyingParty
 import com.yubico.webauthn.TestWithEachProvider
-import com.yubico.webauthn.data.AttestationObject
 import com.yubico.webauthn.test.Helpers
 import com.yubico.webauthn.test.RealExamples
 import org.bouncycastle.jce.provider.BouncyCastleProvider
@@ -22,13 +20,9 @@ import org.scalatest.tags.Network
 import org.scalatest.tags.Slow
 import org.scalatestplus.junit.JUnitRunner
 
-import java.io.IOException
-import java.security.cert.X509Certificate
 import java.time.Clock
 import java.time.ZoneOffset
-import java.util
 import java.util.Optional
-import scala.jdk.CollectionConverters.IteratorHasAsScala
 import scala.jdk.CollectionConverters.SetHasAsJava
 import scala.jdk.CollectionConverters.SetHasAsScala
 import scala.jdk.OptionConverters.RichOptional
@@ -76,40 +70,6 @@ class FidoMetadataServiceIntegrationTest
             attachmentHints: Set[AttachmentHint],
         ): Unit = {
 
-          def getAttestationTrustPath(
-              attestationObject: AttestationObject
-          ): Option[util.List[X509Certificate]] = {
-            val x5cNode: JsonNode = getX5cArray(attestationObject)
-            if (x5cNode != null && x5cNode.isArray) {
-              val certs: util.List[X509Certificate] =
-                new util.ArrayList[X509Certificate](x5cNode.size)
-              for (binary <- x5cNode.elements().asScala) {
-                if (binary.isBinary)
-                  try certs.add(
-                    CertificateParser.parseDer(binary.binaryValue)
-                  )
-                  catch {
-                    case e: IOException =>
-                      throw new RuntimeException(
-                        "binary.isBinary() was true but binary.binaryValue() failed",
-                        e,
-                      )
-                  }
-                else
-                  throw new IllegalArgumentException(
-                    String.format(
-                      "Each element of \"x5c\" property of attestation statement must be a binary value, was: %s",
-                      binary.getNodeType,
-                    )
-                  )
-              }
-              Some(certs)
-            } else None
-          }
-
-          def getX5cArray(attestationObject: AttestationObject): JsonNode =
-            attestationObject.getAttestationStatement.get("x5c")
-
           val rp = RelyingParty
             .builder()
             .identity(testData.rp)

webauthn-server-attestation/src/test/scala/com/yubico/fido/metadata/FidoMds3Spec.scala

@@ -622,7 +622,7 @@ class FidoMds3Spec extends AnyFunSpec with Matchers {
     def makeStatusReportsBlob(
         statusReports: String,
         timeOfLastStatusChange: String,
-        authenticatorVersion: Int = 1,
+        authenticatorVersion: Int,
     ): (String, X509Certificate, java.util.Set[CRL]) =
       makeBlob(s"""{
         "legalHeader" : "Kom ihåg att du aldrig får snyta dig i mattan!",

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

@@ -235,19 +235,13 @@ class RelyingPartyRegistrationSpec
 
         describe("3. Let response be credential.response.") {
           it("If response is not an instance of AuthenticatorAttestationResponse, abort the ceremony with a user-visible error.") {
+            val testData = RegistrationTestData.Packed.BasicAttestationEdDsa
             val frob = FinishRegistrationOptions
               .builder()
-              .request(
-                RegistrationTestData.Packed.BasicAttestationEdDsa.request
-              )
-            val testData =
-              RegistrationTestData.Packed.BasicAttestationEdDsa.assertion.get
-            "frob.response(testData.response)" shouldNot compile
-            frob
-              .response(
-                RegistrationTestData.Packed.BasicAttestationEdDsa.response
-              )
-              .build() should not be null
+              .request(testData.request)
+            "frob.response(testData.response)" should compile
+            "frob.response(testData.assertion.get.response)" shouldNot compile
+            frob.response(testData.response).build() should not be null
           }
         }
 

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

@@ -48,7 +48,7 @@ class WebAuthnCodecsSpec
     Arbitrary(
       for {
         ySign: Byte <- Gen.oneOf(0x02: Byte, 0x03: Byte)
-        rawBytes: Seq[Byte] <- Gen.listOfN[Byte](32, Arbitrary.arbitrary[Byte])
+        rawBytes <- Gen.listOfN[Byte](32, Arbitrary.arbitrary[Byte])
         key = Try(
           Util
             .decodePublicKey(new ByteArray((ySign +: rawBytes).toArray))

webauthn-server-core/src/test/scala/com/yubico/webauthn/data/Generators.scala

@@ -360,8 +360,6 @@ object Generators {
       Set("appidExclude", "credProps", "largeBlob", "uvm")
     private val AuthenticationExtensionIds: Set[String] =
       Set("appid", "largeBlob", "uvm")
-    private val ExtensionIds: Set[String] =
-      RegistrationExtensionIds ++ AuthenticationExtensionIds
 
     private val ClientRegistrationExtensionOutputIds: Set[String] =
       RegistrationExtensionIds - "uvm"
@@ -445,12 +443,16 @@ object Generators {
       )
 
     def authenticatorRegistrationExtensionOutputs(
-        uvmGen: Gen[Option[CBORObject]] = Gen.option(Uvm.authenticatorOutput)
+        uvmGen: Gen[Option[CBORObject]] = Gen.option(Uvm.authenticatorOutput),
+        includeUnknown: Boolean = true,
     ): Gen[CBORObject] =
       for {
+        base <-
+          if (includeUnknown) unknownAuthenticatorRegistrationExtensionOutput
+          else Gen.const(CBORObject.NewMap())
         uvm: Option[CBORObject] <- uvmGen
       } yield {
-        val result = CBORObject.NewMap()
+        val result = base
         uvm.foreach(result.set("uvm", _))
         result
       }
@@ -511,12 +513,16 @@ object Generators {
       }
 
     def authenticatorAssertionExtensionOutputs(
-        uvmGen: Gen[Option[CBORObject]] = Gen.option(Uvm.authenticatorOutput)
+        uvmGen: Gen[Option[CBORObject]] = Gen.option(Uvm.authenticatorOutput),
+        includeUnknown: Boolean = true,
     ): Gen[CBORObject] =
       for {
+        base <-
+          if (includeUnknown) unknownAuthenticatorAssertionExtensionOutput
+          else Gen.const(CBORObject.NewMap())
         uvm: Option[CBORObject] <- uvmGen
       } yield {
-        val result = CBORObject.NewMap()
+        val result = base
         uvm.foreach(result.set("uvm", _))
         result
       }

webauthn-server-demo/src/test/scala/demo/webauthn/WebAuthnServerSpec.scala

@@ -251,7 +251,7 @@ class WebAuthnServerSpec
 
       def newServerWithAuthenticationRequest(
           testData: RegistrationTestData,
-          signatureCount: Option[Long] = None,
+          signatureCount: Option[Long],
       ) = {
         val assertionRequests: Cache[ByteArray, AssertionRequestWrapper] =
           newCache()