0.1.7: Account for key (in-) equality quirks from GnuPG

This commit is contained in:
s3lph 2022-08-20 12:15:06 +02:00
parent fbe8300a6e
commit 00d49c1451
3 changed files with 38 additions and 1 deletions

View file

@ -1,5 +1,19 @@
# MultiSchleuder Changelog # MultiSchleuder Changelog
<!-- BEGIN RELEASE v0.1.7 -->
## Version 0.1.7
Bugfix Release
### Changes
<!-- BEGIN CHANGES 0.1.7 -->
- Remove and re-import keys whose expiry date has been changed
- Don't report keys as changed if they appear to differ, but are treated as identical by GnuPG.
<!-- END CHANGES 0.1.7 -->
<!-- END RELEASE v0.1.7 -->
<!-- BEGIN RELEASE v0.1.6 --> <!-- BEGIN RELEASE v0.1.6 -->
## Version 0.1.6 ## Version 0.1.6

View file

@ -1,2 +1,2 @@
__version__ = '0.1.6' __version__ = '0.1.7'

View file

@ -63,8 +63,14 @@ class MultiList:
to_unsubscribe = current_subs.difference(intended_subs) to_unsubscribe = current_subs.difference(intended_subs)
to_remove = current_keys.difference(intended_keys) to_remove = current_keys.difference(intended_keys)
to_add = intended_keys.difference(current_keys) to_add = intended_keys.difference(current_keys)
# Already present keys that are being updated have to be removed and re-imported for convergence
to_pre_remove = {k for k in to_add if k.fingerprint in {o.fingerprint for o in to_remove}}
to_remove = {k for k in to_remove if k.fingerprint not in {o.fingerprint for o in to_pre_remove}}
to_update = {s for s in intended_subs if s in current_subs and s.key in to_add} to_update = {s for s in intended_subs if s in current_subs and s.key in to_add}
# Perform the actual list modifications in an order which avoids race conditions # Perform the actual list modifications in an order which avoids race conditions
for key in to_pre_remove:
self._api.delete_key(key, target_list)
logging.info(f'Pre-removed key: {key}')
for key in to_add: for key in to_add:
self._api.post_key(key, target_list) self._api.post_key(key, target_list)
logging.info(f'Added key: {key}') logging.info(f'Added key: {key}')
@ -81,6 +87,23 @@ class MultiList:
self._api.delete_key(key, target_list) self._api.delete_key(key, target_list)
logging.info(f'Removed key: {key}') logging.info(f'Removed key: {key}')
# Workaround for quirky gpg behaviour where some key signatures are exported from a sublist, but dropped on
# import into the target list, leading to a situation where the same key is imported over and over again.
new_subs = set()
# Get the new list of subscribers
for s in self._api.get_subscribers(target_list):
if s.email in self._unmanaged or s.email == self._target:
continue
if s.key is None or s.key.fingerprint == target_list.fingerprint:
continue
new_subs.add(s)
# Compare the key blobs to the ones present before this run
unchanged_subs = {s for s in new_subs if s.key.blob in {o.key.blob for o in current_subs if o.key is not None}}
# Remove the unchanged keys from the changesets so that they are not included in the admin report
to_subscribe = {s for s in to_subscribe if s not in unchanged_subs}
to_update = {s for s in to_update if s not in unchanged_subs}
to_add = {k for k in to_add if k.fingerprint not in {s.key.fingerprint for s in unchanged_subs}}
if len(to_add) + len(to_subscribe) + len(to_unsubscribe) + len(to_remove) == 0: if len(to_add) + len(to_subscribe) + len(to_unsubscribe) + len(to_remove) == 0:
logging.info(f'No changes for {self._target}') logging.info(f'No changes for {self._target}')
else: else: