Make sure source fingerprint is updated on sync #1092
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rmol
requested review from
sssoleileraaa,
kushaldas and
redshiftzero
as code owners
kushaldas
previously approved these changes
May 13, 2020
| @@ -170,6 +170,7 @@ def update_sources( | |||
| lazy_setattr(local_source, "is_starred", source.is_starred) | |||
| lazy_setattr(local_source, "last_updated", parse(source.last_updated)) | |||
| lazy_setattr(local_source, "public_key", source.key['public']) | |||
| lazy_setattr(local_source, "fingerprint", source.key['fingerprint']) | |||
There was a problem hiding this comment.
this change makes sense and I see why this fixes #1091 because the issue was that new sources don't always come with a key and fingerprint, so we need to make sure we update the key and fingerprint every sync. I have to verify this, but my guess is that the server still creates sources during a "source surge" without new keys, and instead of waiting until the keys are generated, the server tells the client about the new sources ahead of time.
sssoleileraaa
suggested changes
May 13, 2020
|
Test added. |
It was missing from the list of attributes updated on existing sources, so a source which had no key when first synced would never be completed, even once the keypair were generated on the server, and journalists would never be able to reply to them.
Add a test to check that ReplyBoxWidget will be disabled when constructed for a source that doesn't yet have a key pair, then enabled when the source's key arrives via sync.
rmol
force-pushed
the
1091-source-fingerprint-update-fail
branch
from
424dd12 to
54d5118
Compare
|
Looks good, if you add one more assertion to your test then you'll have added a regression check: diff --git a/tests/gui/test_widgets.py b/tests/gui/test_widgets.py
index f3884ff..abf50f2 100644
--- a/tests/gui/test_widgets.py
+++ b/tests/gui/test_widgets.py
@@ -4211,6 +4211,7 @@ def test_ReplyBoxWidget_enable_after_source_gets_key(mocker, session, session_ma
rbw._on_synced("synced")
# ... and the widget should be enabled
+ assert rbw.source.fingerprint
assert rbw.source.public_key
assert rbw.replybox.isEnabled()
assert rbw.text_edit.isEnabled()
This currently fails on master |
|
Yep, thanks. Both are also checked in |
sssoleileraaa
approved these changes
May 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
It was missing from the list of attributes updated on existing sources during sync, so a source which had no key when first synced would never be completed, even once the keypair were generated on the server, and journalists would never be able to reply to them.
Fixes #1091.
Test Plan
Tough to test manually, as the failure is dependent on a new source being synced before having its keypair generated.
Checklist
If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:
If these changes add or remove files other than client code, the AppArmor profile may need to be updated. Please check as applicable:
If these changes modify the database schema, you should include a database migration. Please check as applicable:
masterand confirmed that the migration applies cleanlymasterand would like the reviewer to do so