diff options
Diffstat (limited to 'src/mailman_pgp/workflows/key_confirm.py')
| -rw-r--r-- | src/mailman_pgp/workflows/key_confirm.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/mailman_pgp/workflows/key_confirm.py b/src/mailman_pgp/workflows/key_confirm.py index b8ac51e..0a38551 100644 --- a/src/mailman_pgp/workflows/key_confirm.py +++ b/src/mailman_pgp/workflows/key_confirm.py @@ -21,7 +21,6 @@ from mailman.interfaces.subscriptions import TokenOwner from public import public from mailman_pgp.database import transaction -from mailman_pgp.model.address import PGPAddress from mailman_pgp.model.list import PGPMailingList from mailman_pgp.pgp.wrapper import PGPWrapper from mailman_pgp.utils.email import copy_headers @@ -44,14 +43,13 @@ class ConfirmPubkeyMixin: self.pubkey_confirmed = pre_confirmed def _step_pubkey_confirmation(self): - pgp_address = PGPAddress.for_address(self.address) - assert pgp_address is not None + assert self.pgp_address is not None if self.pubkey_confirmed: with transaction(): - pgp_address.key_confirmed = True + self.pgp_address.key_confirmed = True else: - if not pgp_address.key_confirmed: + if not self.pgp_address.key_confirmed: self.push('send_key_confirm_request') def _step_send_key_confirm_request(self): @@ -59,17 +57,16 @@ class ConfirmPubkeyMixin: self.push('receive_key_confirmation') self.save() - pgp_address = PGPAddress.for_address(self.address) request_address = self.mlist.request_address email_address = self.address.email msg = UserNotification(email_address, request_address, 'key confirm {}'.format(self.token), CONFIRM_REQUEST.format( - pgp_address.key_fingerprint, + self.pgp_address.key_fingerprint, self.token)) pgp_list = PGPMailingList.for_list(self.mlist) wrapped = PGPWrapper(msg) - encrypted = wrapped.sign_encrypt(pgp_list.key, pgp_address.key) + encrypted = wrapped.sign_encrypt(pgp_list.key, self.pgp_address.key) msg.set_payload(encrypted.get_payload()) copy_headers(encrypted, msg, True) @@ -77,8 +74,4 @@ class ConfirmPubkeyMixin: raise StopIteration def _step_receive_key_confirmation(self): - self._restore_subscriber() self._set_token(TokenOwner.no_one) - with transaction(): - pgp_address = PGPAddress.for_address(self.address) - pgp_address.key_confirmed = True |