Include backup flags in RegisteredCredential generator

Author: emlun

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

@@ -73,13 +73,21 @@ object Generators {
           userHandle <- arbitrary[ByteArray]
           publicKeyCose <- arbitrary[ByteArray]
           signatureCount <- arbitrary[Int]
-        } yield RegisteredCredential
-          .builder()
-          .credentialId(credentialId)
-          .userHandle(userHandle)
-          .publicKeyCose(publicKeyCose)
-          .signatureCount(signatureCount)
-          .build()
+          backupFlags <- Gen.option(arbitraryBackupFlags.arbitrary)
+        } yield {
+          val b = RegisteredCredential
+            .builder()
+            .credentialId(credentialId)
+            .userHandle(userHandle)
+            .publicKeyCose(publicKeyCose)
+            .signatureCount(signatureCount)
+          backupFlags.foreach({
+            case ((be, bs)) =>
+              b.backupEligible(be)
+              b.backupState(bs)
+          })
+          b.build()
+        }
       )
     )
 

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

@@ -273,13 +273,16 @@ object Generators {
       )
     )
 
+  val arbitraryBackupFlags: Arbitrary[(Boolean, Boolean)] = Arbitrary(
+    arbitrary[(Boolean, Boolean)].map({ case (be, bs) => (be, be && bs) })
+  )
+
   def authenticatorDataBytes(
       extensionsGen: Gen[Option[CBORObject]],
       rpIdHashGen: Gen[ByteArray] = byteArray(32),
       upFlagGen: Gen[Boolean] = Gen.const(true),
       uvFlagGen: Gen[Boolean] = arbitrary[Boolean],
-      backupFlagsGen: Gen[(Boolean, Boolean)] =
-        arbitrary[(Boolean, Boolean)].map({ case (be, bs) => (be, be && bs) }),
+      backupFlagsGen: Gen[(Boolean, Boolean)] = arbitraryBackupFlags.arbitrary,
       signatureCountGen: Gen[ByteArray] = byteArray(4),
   ): Gen[ByteArray] =
     halfsized(