This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new 6dfb9d8 Use raw_msg instead of as_bytes, as the latter has a new
archived-at appended sometimes (and we don't want that)
6dfb9d8 is described below
commit 6dfb9d83b1fa6e0ae83bc61446a27fe555751f8c
Author: Daniel Gruno <[email protected]>
AuthorDate: Tue Aug 25 18:32:33 2020 +0200
Use raw_msg instead of as_bytes, as the latter has a new archived-at
appended sometimes (and we don't want that)
---
tools/plugins/generators.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/plugins/generators.py b/tools/plugins/generators.py
index 949a3b6..344f115 100644
--- a/tools/plugins/generators.py
+++ b/tools/plugins/generators.py
@@ -151,7 +151,7 @@ def dkim(_msg, _body, lid, _attachments, raw_msg):
# Full generator: uses the entire email (including server-dependent data)
# Used by default until August 2020.
# See 'dkim' for recommended generation.
-def full(msg, _body, lid, _attachments, _raw_msg):
+def full(_msg, _body, lid, _attachments, raw_msg):
"""
Full generator: uses the entire email
(including server-dependent data)
@@ -159,15 +159,15 @@ def full(msg, _body, lid, _attachments, _raw_msg):
but different copies of the message are likely to have different headers,
thus ids
Parameters:
- msg - the parsed message
+ msg - the parsed message (not used)
_body - the parsed text content (not used)
lid - list id
_attachments - list of attachments (not used)
- _raw_msg - the original message bytes (not used)
+ raw_msg - the original message bytes
Returns: "<hash>@<lid>" where hash is sha224 of message bytes
"""
- mid = "%s@%s" % (hashlib.sha224(msg.as_bytes()).hexdigest(), lid)
+ mid = "%s@%s" % (hashlib.sha224(raw_msg).hexdigest(), lid)
return mid
