Disroot
/
gpg-lacre
9
15
Fork 4
Code Issues 29 Pull Requests 1 Releases 2 Wiki Activity

Fix key-removal condition, improve logging

This commit is contained in:
Piotr F. Mieszkowski 2024-01-04 19:45:25 +01:00
parent 07539a97d3
commit 8f8f081d28
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lacre/repositories.py
View File

@ -166,15 +166,15 @@ class KeyConfirmationQueue:
def delete_keys(self, row_id, /, email=None):
"""Remove key from the database."""
if email is not None:
LOG.debug('Deleting key: %s, %s', row_id, email)
delq = delete(self._keys).where(and_(self._keys.c.email == email, self._keys.c.id != row_id))
LOG.debug('Deleting key: id=%s, email=%s', row_id, email)
delq = delete(self._keys).where(and_(self._keys.c.email == email, self._keys.c.id == row_id))
else:
LOG.debug('Deleting key: %s', row_id)
delq = delete(self._keys).where(self._keys.c.id != row_id)
LOG.debug('Deleting key: id=%s', row_id)
delq = delete(self._keys).where(self._keys.c.id == row_id)
with self._engine.connect() as conn:
LOG.debug('Deleting public keys associated with confirmed email: %s', delq)
conn.execute(delq)
return conn.execute(delq)
def delete_key_by_email(self, email):
"""Remove keys linked to the given email from the database."""

4
webgate-cron.py
View File

@ -96,8 +96,12 @@ try:
LOG.info('Cleaning up after a round of key confirmation')
stat2_result_set = key_queue.fetch_keys_to_delete()
for email, row_id in stat2_result_set:
LOG.debug('Removing key from keyring: %s', email)
GnuPG.delete_key(key_dir, email)
LOG.debug('Removing key from identity store: %s', row_id)
key_queue.delete_keys(row_id)
LOG.info('Deleted key for <%s>', email)
except:
LOG.exception('Unexpected issue during key confirmation')