client: new root sigs only counted once per keyid

When verifying newly downloaded root metadata with the keys listed in the
root metadata being verified, multiple signatures with the same keyid
should not be counted towards the threshold. A keyid should only count
once towards the threshold.

This fixes the _verify_root_self_signed() method introduced in PR #1101 to
ensure that keyids are only counted once when verifying a threshold of new
root signatures.

Signed-off-by: Joshua Lock <[email protected]>

Author: joshuagl

tuf/client/updater.py

@@ -1385,7 +1385,7 @@ def _verify_root_self_signed(self, signable):
     signatures = signable['signatures']
     signed = securesystemslib.formats.encode_canonical(
         signable['signed']).encode('utf-8')
-    validated = 0
+    verified_sig_keyids = []
 
     for signature in signatures:
       keyid = signature['keyid']
@@ -1403,9 +1403,12 @@ def _verify_root_self_signed(self, signable):
       valid_sig = securesystemslib.keys.verify_signature(key, signature, signed)
 
       if valid_sig:
-        validated = validated + 1
+        verified_sig_keyids.append(keyid)
 
-    if validated >= threshold:
+    # A signature with a given keyid should only count towards the threshold
+    # once. Convert the list of keyids into a set, in order to uniquify them
+    # and therefore count each keyid only once towards the threshold.
+    if len(set(verified_sig_keyids)) >= threshold:
       return True
     return False