common/webauthn: Allow multiple URLs per app.

common/defs/webauthn/apps/binance.json

@@ -1,5 +1,5 @@
 {
   "label": "Binance",
-  "webauthn": "www.binance.com",
+  "webauthn": ["www.binance.com"],
   "use_sign_count": false
 }

common/defs/webauthn/apps/bitbucket.json

@@ -1,4 +1,4 @@
 {
   "label": "Bitbucket",
-  "u2f": "https://bitbucket.org"
+  "u2f": ["https://bitbucket.org"]
 }

common/defs/webauthn/apps/bitfinex.json

@@ -1,4 +1,4 @@
 {
   "label": "Bitfinex",
-  "u2f": "https://www.bitfinex.com"
+  "u2f": ["https://www.bitfinex.com"]
 }

common/defs/webauthn/apps/bitwarden.json

@@ -1,4 +1,4 @@
 {
   "label": "Bitwarden",
-  "u2f": "https://vault.bitwarden.com/app-id.json"
+  "u2f": ["https://vault.bitwarden.com/app-id.json"]
 }

common/defs/webauthn/apps/dashlane.json

@@ -1,4 +1,4 @@
 {
   "label": "Dashlane",
-  "u2f": "https://www.dashlane.com"
+  "u2f": ["https://www.dashlane.com"]
 }

common/defs/webauthn/apps/dropbox.json

@@ -1,5 +1,5 @@
 {
   "label": "Dropbox",
-  "u2f": "https://www.dropbox.com/u2f-app-id.json",
+  "u2f": ["https://www.dropbox.com/u2f-app-id.json"],
-  "webauthn": "www.dropbox.com"
+  "webauthn": ["www.dropbox.com"]
 }

common/defs/webauthn/apps/duo.json

@@ -1,4 +1,4 @@
 {
   "label": "Duo",
-  "u2f": "https://api-9dcf9b83.duosecurity.com"
+  "u2f": ["https://api-9dcf9b83.duosecurity.com"]
 }

common/defs/webauthn/apps/fastmail.json

@@ -1,4 +1,4 @@
 {
   "label": "FastMail",
-  "u2f": "https://www.fastmail.com"
+  "u2f": ["https://www.fastmail.com"]
 }

common/defs/webauthn/apps/fedora.json

@@ -1,4 +1,4 @@
 {
   "label": "Fedora",
-  "u2f": "https://id.fedoraproject.org/u2f-origins.json"
+  "u2f": ["https://id.fedoraproject.org/u2f-origins.json"]
 }

common/defs/webauthn/apps/gandi.json

@@ -1,4 +1,4 @@
 {
   "label": "Gandi",
-  "u2f": "https://account.gandi.net/api/u2f/trusted_facets.json"
+  "u2f": ["https://account.gandi.net/api/u2f/trusted_facets.json"]
 }

common/defs/webauthn/apps/github.json

@@ -1,6 +1,6 @@
 {
   "label": "GitHub",
-  "u2f": "https://github.com/u2f/trusted_facets",
+  "u2f": ["https://github.com/u2f/trusted_facets"],
-  "webauthn": "github.com",
+  "webauthn": ["github.com"],
   "use_sign_count": true
 }

common/defs/webauthn/apps/gitlab.json

@@ -1,4 +1,4 @@
 {
   "label": "GitLab",
-  "u2f": "https://gitlab.com"
+  "u2f": ["https://gitlab.com"]
 }

common/defs/webauthn/apps/google.json

@@ -1,5 +1,5 @@
 {
   "label": "Google",
-  "u2f": "https://www.gstatic.com/securitykey/origins.json",
+  "u2f": ["https://www.gstatic.com/securitykey/origins.json"],
-  "webauthn": "google.com"
+  "webauthn": ["google.com"]
 }

common/defs/webauthn/apps/keeper.json

@@ -1,4 +1,4 @@
 {
   "label": "Keeper",
-  "u2f": "https://keepersecurity.com"
+  "u2f": ["https://keepersecurity.com"]
 }

common/defs/webauthn/apps/lastpass.json

@@ -1,4 +1,4 @@
 {
   "label": "LastPass",
-  "u2f": "https://lastpass.com"
+  "u2f": ["https://lastpass.com"]
 }

common/defs/webauthn/apps/login.gov.json

@@ -1,4 +1,4 @@
 {
   "label": "login.gov",
-  "webauthn": "secure.login.gov"
+  "webauthn": ["secure.login.gov"]
 }

common/defs/webauthn/apps/microsoft.json

@@ -1,5 +1,5 @@
 {
   "label": "Microsoft",
-  "webauthn": "login.microsoft.com",
+  "webauthn": ["login.microsoft.com"],
   "use_sign_count": false
 }

common/defs/webauthn/apps/slushpool.json

@@ -1,4 +1,4 @@
 {
   "label": "Slush Pool",
-  "u2f": "https://slushpool.com/static/security/u2f.json"
+  "u2f": ["https://slushpool.com/static/security/u2f.json"]
 }

common/defs/webauthn/apps/stripe.json

@@ -1,4 +1,4 @@
 {
   "label": "Stripe",
-  "u2f": "https://dashboard.stripe.com"
+  "u2f": ["https://dashboard.stripe.com"]
 }

common/defs/webauthn/apps/u2f.bin.coffee.json

@@ -1,4 +1,4 @@
 {
   "label": "u2f.bin.coffee",
-  "u2f": "https://u2f.bin.coffee"
+  "u2f": ["https://u2f.bin.coffee"]
 }

common/defs/webauthn/apps/webauthn.bin.coffee.json

@@ -1,4 +1,4 @@
 {
   "label": "webauthn.bin.coffee",
-  "webauthn": "webauthn.bin.coffee"
+  "webauthn": ["webauthn.bin.coffee"]
 }

common/defs/webauthn/apps/webauthn.io.json

@@ -1,4 +1,4 @@
 {
   "label": "WebAuthn.io",
-  "webauthn": "webauthn.io"
+  "webauthn": ["webauthn.io"]
 }

common/defs/webauthn/apps/webauthn.me.json

@@ -1,4 +1,4 @@
 {
   "label": "WebAuthn.me",
-  "webauthn": "webauthn.me"
+  "webauthn": ["webauthn.me"]
 }

common/defs/webauthn/apps/yubico-demo.json

@@ -1,4 +1,4 @@
 {
   "label": "demo.yubico.com",
-  "webauthn": "demo.yubico.com"
+  "webauthn": ["demo.yubico.com"]
 }

common/defs/webauthn/gen.py

@@ -19,17 +19,13 @@ def gen_core(data):
     print("_knownapps = {")
     print("    # U2F")
     for d in data:
-        if "u2f" in d:
+        for url in d.get("u2f", []):
-            url, label = d["u2f"], d["label"]
+            label = d["label"]
             print('    "%s": {"label": "%s", "use_sign_count": True},' % (url, label))
     print("    # WebAuthn")
     for d in data:
-        if "webauthn" in d:
+        for origin in d.get("webauthn", []):
-            origin, label, use_sign_count = (
+            label, use_sign_count = (d["label"], d.get("use_sign_count", None))
-                d["webauthn"],
-                d["label"],
-                d.get("use_sign_count", None),
-            )
             if use_sign_count is None:
                 print('    "%s": {"label": "%s"},' % (origin, label))
             else:
@@ -42,15 +38,15 @@ def gen_core(data):
 
 def gen_mcu(data):
     for d in data:
-        if "u2f" in d:
+        for url in d.get("u2f", []):
-            url, label = d["u2f"], d["label"]
+            label = d["label"]
             h = sha256(url.encode()).digest()
             print(
                 '\t{\n\t\t// U2F: %s\n\t\t%s,\n\t\t"%s"\n\t},'
                 % (url, c_bytes(h), label)
             )
-        if "webauthn" in d:
+        for origin in d.get("webauthn", []):
-            origin, label = d["webauthn"], d["label"]
+            label = d["label"]
             h = sha256(origin.encode()).digest()
             print(
                 '\t{\n\t\t// WebAuthn: %s\n\t\t%s,\n\t\t"%s"\n\t},'