aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/rules/signature.py
diff options
context:
space:
mode:
authorJ08nY2017-06-27 21:29:37 +0200
committerJ08nY2017-06-27 21:29:37 +0200
commit5598bee159a8a8c2de2ea926ff11de029e0e4e1c (patch)
tree5942774e03cc2c144b4dabfee2339b9bac104344 /src/mailman_pgp/rules/signature.py
parent39944faaa390f26ecb3f4bd77da86dbe580dc43a (diff)
downloadmailman-pgp-5598bee159a8a8c2de2ea926ff11de029e0e4e1c.tar.gz
mailman-pgp-5598bee159a8a8c2de2ea926ff11de029e0e4e1c.tar.zst
mailman-pgp-5598bee159a8a8c2de2ea926ff11de029e0e4e1c.zip
Diffstat (limited to 'src/mailman_pgp/rules/signature.py')
-rw-r--r--src/mailman_pgp/rules/signature.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mailman_pgp/rules/signature.py b/src/mailman_pgp/rules/signature.py
index 126ac84..7ddc947 100644
--- a/src/mailman_pgp/rules/signature.py
+++ b/src/mailman_pgp/rules/signature.py
@@ -55,9 +55,9 @@ class Signature:
def check(self, mlist, msg, msgdata):
"""See `IRule`."""
# Find the `PGPMailingList` this is for.
- enc_list = query(PGPMailingList).filter_by(
+ pgp_list = query(PGPMailingList).filter_by(
list_id=mlist.list_id).first()
- if enc_list is None:
+ if pgp_list is None:
raise ValueError('PGP enabled mailing list not found.')
# Wrap the message to work with it.
@@ -65,7 +65,7 @@ class Signature:
# Take unsigned_msg_action if unsigned.
if not wrapped.is_signed():
- action = enc_list.unsigned_msg_action
+ action = pgp_list.unsigned_msg_action
if action != Action.defer:
record_action(msg, msgdata, action, msg.sender,
'The message is unsigned.')
@@ -73,7 +73,7 @@ class Signature:
# Take `inline_pgp_action` if inline signed.
if wrapped.inline.is_signed():
- action = enc_list.inline_pgp_action
+ action = pgp_list.inline_pgp_action
if action != Action.defer:
record_action(msg, msgdata, action, msg.sender,
'Inline PGP is not allowed.')
@@ -83,19 +83,19 @@ class Signature:
user_manager = getUtility(IUserManager)
sender = msg.sender
address = user_manager.get_address(sender)
- enc_address = PGPAddress.query().filter_by(
+ pgp_address = PGPAddress.query().filter_by(
email=address.email).first()
- if enc_address is None:
+ if pgp_address is None:
raise ValueError('PGP enabled address not found.')
# See if we have a key.
- key = enc_address.key
+ key = pgp_address.key
if key is None:
raise ValueError('No key?')
# Take the `invalid_sig_action` if the verification failed.
if not wrapped.verifies(key):
- action = enc_list.invalid_sig_action
+ action = pgp_list.invalid_sig_action
if action != Action.defer:
record_action(msg, msgdata, action, msg.sender,
'Signature did not verify.')