fix: added match for new key in updater

freedomofpress · Jun 17, 2021 · 59d82df · 59d82df
1 parent 2011565
commit 59d82df
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/admin/securedrop_admin/__init__.py b/admin/securedrop_admin/__init__.py
@@ -948,7 +948,9 @@ def update(args: argparse.Namespace) -> int:
         good_sig_text = ['Good signature from "SecureDrop Release Signing ' +
                          'Key"',
                          'Good signature from "SecureDrop Release Signing ' +
-                         'Key <[email protected]>"']
+                         'Key <[email protected]>"',
+                         'Good signature from "SecureDrop Release Signing ' +
+                         'Key <[email protected]>"']
         bad_sig_text = 'BAD signature'
         gpg_lines = sig_result.split('\n')
 

diff --git a/admin/tests/test_securedrop-admin.py b/admin/tests/test_securedrop-admin.py
@@ -274,6 +274,25 @@ def test_get_release_key_from_valid_keyserver(self, tmpdir, caplog):
                               b'Signing Key '
                               b'<[email protected]>"\n',
 
+                              b'gpg: Signature made Thu 20 Jul '
+                              b'2017 08:12:25 PM EDT\n'
+                              b'gpg:                using RSA key '
+                              b'2359E6538C0613E652955E6C188EDD3B7B22E6A3\n'
+                              b'gpg: Good signature from "SecureDrop Release '
+                              b'Signing Key '
+                              b'<[email protected]>"\n',
+
+                              b'gpg: Signature made Thu 20 Jul '
+                              b'2017 08:12:25 PM EDT\n'
+                              b'gpg:                using RSA key '
+                              b'2359E6538C0613E652955E6C188EDD3B7B22E6A3\n'
+                              b'gpg: Good signature from "SecureDrop Release '
+                              b'Signing Key" [unknown]\n'
+                              b'gpg:                 aka "SecureDrop Release '
+                              b'Signing Key '
+                              b'<[email protected]>" '
+                              b'[unknown]\n',
+
                               b'gpg: Signature made Thu 20 Jul '
                               b'2017 08:12:25 PM EDT\n'
                               b'gpg:                using RSA key '