Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport] #5998 fix: added match for new key in updater #6001

Merged
merged 1 commit into from
Jun 17, 2021
Merged

[backport] #5998 fix: added match for new key in updater #6001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion admin/securedrop_admin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
19 changes: 19 additions & 0 deletions admin/tests/test_securedrop-admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down