aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/rules/signature.py
diff options
context:
space:
mode:
authorJ08nY2017-08-21 17:20:29 +0200
committerJ08nY2017-08-21 17:20:29 +0200
commitc74e96f813542d94592bf80c24afdec5d6988b2a (patch)
treee4d8374afd9fcd985a12de636771a9e4203ab96d /src/mailman_pgp/rules/signature.py
parent54ad58f448f23cd26bbfad6abcfe5e4ca9b686ee (diff)
downloadmailman-pgp-c74e96f813542d94592bf80c24afdec5d6988b2a.tar.gz
mailman-pgp-c74e96f813542d94592bf80c24afdec5d6988b2a.tar.zst
mailman-pgp-c74e96f813542d94592bf80c24afdec5d6988b2a.zip
Diffstat (limited to 'src/mailman_pgp/rules/signature.py')
-rw-r--r--src/mailman_pgp/rules/signature.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mailman_pgp/rules/signature.py b/src/mailman_pgp/rules/signature.py
index 998e9c3..b7d4b5c 100644
--- a/src/mailman_pgp/rules/signature.py
+++ b/src/mailman_pgp/rules/signature.py
@@ -35,7 +35,7 @@ from mailman_pgp.model.sighash import PGPSigHash
from mailman_pgp.pgp.wrapper import PGPWrapper
from mailman_pgp.utils.email import get_email
from mailman_pgp.utils.moderation import record_action
-from mailman_pgp.utils.pgp import hashes, verifies
+from mailman_pgp.utils.pgp import hashes, verifies, expired
@public
@@ -96,6 +96,15 @@ class Signature:
return True
verifications = list(wrapped.verify(key))
+ # verifications is a list of SignatureVerification, only contains
+ # sigs that appear to be by the pgp_address.key
+
+ if expired(verifications):
+ action = pgp_list.expired_sig_action
+ if action != Action.defer:
+ record_action(msg, msgdata, action, email,
+ 'Signature is expired.')
+ return True
# Take the `invalid_sig_action` if the verification failed.
if not verifies(verifications):