Merge pull request #82 from dontcallmedom/msgid

Add msgid systematically

Author: dontcallmedom

.github/workflows/test.yml

@@ -13,12 +13,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
       - name: test WebHook
         run: python test_webhook.py
       - name: test Digest
-        run: python test_digest.py
+        run: python test_digest.py

index.py

@@ -16,7 +16,7 @@
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
-from email.utils import formataddr
+from email.utils import formataddr, make_msgid
 from email.generator import Generator
 import email.charset
 from io import StringIO
@@ -756,8 +756,10 @@ def sendMail(
     msg["From"] = formataddr((from_name, from_addr))
     msg["To"] = ",".join(to_addr)
     msg["Subject"] = Header(subject)
-    if msgid:
-        msg["Message-ID"] = msgid
+    if not msgid:
+        msgid = make_msgid()
+    msg["Message-ID"] = msgid
+
     if inreplyto:
         msg["In-Reply-To"] = inreplyto
 

test_digest.py

@@ -14,6 +14,7 @@
 
 config = {
     "SMTP_HOST": "localhost",
+    "SMTP_PORT": "8080",
     "EMAIL_FROM": "test@localhost",
     "TEMPLATES_DIR": "tests/templates",
     "DIGEST_SENDER":"W3C Webmaster via GitHub API",

test_server.py

@@ -8,6 +8,7 @@
 
 config = {
     "SMTP_HOST": "localhost",
+    "SMTP_PORT": "8080",
     "EMAIL_FROM": "test@localhost",
     "TEMPLATES_DIR": "tests/templates",
     "GH_OAUTH_TOKEN": "foo",

test_webhook.py

@@ -1,5 +1,6 @@
 from mock import patch, call
 import email
+import email.utils
 import unittest
 import smtplib
 import json
@@ -42,8 +43,9 @@ def test_ip_check_403(self):
         )
         assert rv.status_code == 403
 
+    @patch("index.make_msgid", return_value="<test@example.com>")
     @patch("smtplib.SMTP", autospec=True)
-    def test_w3c_tr_published(self, mock_smtp):
+    def test_w3c_tr_published(self, mock_smtp, mock_make_msgid):
         data = self.read_file("tests/trpublished-notif.json")
         rv = requests.post(
             "http://localhost:8000/",

tests/trpublished-notif.msg

@@ -4,5 +4,6 @@ Content-Type: text/plain; charset="utf-8"; format="flowed"
 From: W3C Webmaster via W3C API <test@localhost>
 To: dom@localhost
 Subject: "SHACL Use Cases and Requirements" published as a Working Draft
+Message-ID: <test@example.com>
 
 "SHACL Use Cases and Requirements" has just been published as a W3C Working Draft dated 2016-01-22 at http://www.w3.org/TR/2016/WD-shacl-ucr-20160122/.