Merge branch 'feature/fix_build' into bugfix/46

Author: chadgates

example/urls.py

@@ -13,10 +13,10 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url, include
+from django.urls import path, include
 from django.contrib import admin
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^pyas2/', include('pyas2.urls')),
+    path("admin/", admin.site.urls),
+    path("pyas2/", include('pyas2.urls')),
 ]

pyas2/migrations/0001_initial.py

@@ -367,7 +367,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"unique_together": {("message_id", "partner")},},
+            options={
+                "unique_together": {("message_id", "partner")},
+            },
         ),
         migrations.CreateModel(
             name="Mdn",

pyas2/models.py

@@ -11,7 +11,7 @@
 from django.core.files.storage import default_storage
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from pyas2lib import (
     Mdn as As2Mdn,
@@ -531,10 +531,21 @@ class MdnManager(models.Manager):
     def create_from_as2mdn(self, as2mdn, message, status, return_url=None):
         """Create the MDN from the pyas2lib's MDN object"""
         signed = True if as2mdn.digest_alg else False
+
+        # Check for message-id in MDN.
+        if as2mdn.message_id is None:
+            message_id = as2mdn.orig_message_id
+            logger.warning(
+                f"Received MDN response without a message-id. Using original "
+                f"message-id as ID instead: {message_id}"
+            )
+        else:
+            message_id = as2mdn.message_id
+
         mdn, _ = self.update_or_create(
             message=message,
             defaults=dict(
-                mdn_id=as2mdn.message_id,
+                mdn_id=message_id,
                 status=status,
                 signed=signed,
                 return_url=return_url,

pyas2/tests/test_advanced.py

@@ -5,6 +5,7 @@
 from django.test import Client, override_settings
 from django.test import TestCase
 from pyas2lib import Message as As2Message
+from pyas2lib import Mdn as As2Mdn
 
 from pyas2 import settings
 from pyas2.models import Message
@@ -117,7 +118,7 @@ def test_post_send_command(self):
 
     @mock.patch("requests.post")
     def test_post_send_command_async(self, mock_request):
-        """ Test that the command after successful send gets executed with
+        """Test that the command after successful send gets executed with
         asynchronous MDN."""
 
         partner = Partner.objects.create(
@@ -422,6 +423,31 @@ def test_signature_error(self):
             "Failed to verify message signature" in out_message.detailed_status
         )
 
+    def test_missing_message_id(self):
+        # Create the client partner and send the command
+        partner = Partner.objects.create(
+            name="AS2 Server",
+            as2_name="as2server",
+            target_url="http://localhost:8080/pyas2/as2receive",
+            signature="sha1",
+            signature_cert=self.server_crt,
+            encryption="tripledes_192_cbc",
+            encryption_cert=self.server_crt,
+            mdn=True,
+            mdn_mode="ASYNC",
+            mdn_sign="sha1",
+        )
+        out_message = self.build_and_send(partner)
+
+        # Create MDN object without message_id
+        in_message = As2Mdn()
+        in_message.orig_message_id = out_message.message_id
+        in_message.message_id = None
+        mdn_message = Mdn.objects.create_from_as2mdn(in_message, out_message, "R")
+
+        # Check that original message id was used to store mdn_id
+        self.assertEqual(mdn_message.mdn_id, out_message.message_id)
+
     @mock.patch("requests.post")
     def build_and_send(self, partner, mock_request, smudge=False):
         # Build and send the message to server

pyas2/tests/test_basic.py

@@ -94,8 +94,8 @@ def testEndpoint(self):
         self.assertEqual(response.status_code, 200)
 
     def testNoEncryptMessageNoMdn(self):
-        """ Test Permutation 1: Sender sends un-encrypted data and does
-        NOT request a receipt. """
+        """Test Permutation 1: Sender sends un-encrypted data and does
+        NOT request a receipt."""
 
         # Create the partner with appropriate settings for this case
         partner = Partner.objects.create(
@@ -119,8 +119,8 @@ def testNoEncryptMessageNoMdn(self):
         )
 
     def testNoEncryptMessageMdn(self):
-        """ Test Permutation 2: Sender sends un-encrypted data and requests an
-        unsigned receipt. """
+        """Test Permutation 2: Sender sends un-encrypted data and requests an
+        unsigned receipt."""
 
         # Create the partner with appropriate settings for this case
         partner = Partner.objects.create(
@@ -147,8 +147,8 @@ def testNoEncryptMessageMdn(self):
         )
 
     def testNoEncryptMessageSignMdn(self):
-        """ Test Permutation 3: Sender sends un-encrypted data and requests a
-        signed receipt. """
+        """Test Permutation 3: Sender sends un-encrypted data and requests a
+        signed receipt."""
 
         # Create the partner with appropriate settings for this case
         partner = Partner.objects.create(
@@ -177,8 +177,8 @@ def testNoEncryptMessageSignMdn(self):
         )
 
     def testEncryptMessageNoMdn(self):
-        """ Test Permutation 4: Sender sends encrypted data and does NOT
-        request a receipt. """
+        """Test Permutation 4: Sender sends encrypted data and does NOT
+        request a receipt."""
 
         # Create the partner with appropriate settings for this case
         partner = Partner.objects.create(
@@ -204,8 +204,8 @@ def testEncryptMessageNoMdn(self):
         )
 
     def testEncryptMessageMdn(self):
-        """ Test Permutation 5: Sender sends encrypted data and requests an
-         unsigned receipt. """
+        """Test Permutation 5: Sender sends encrypted data and requests an
+        unsigned receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -233,8 +233,8 @@ def testEncryptMessageMdn(self):
         )
 
     def testEncryptMessageSignMdn(self):
-        """ Test Permutation 6: Sender sends encrypted data and requests
-        an signed receipt. """
+        """Test Permutation 6: Sender sends encrypted data and requests
+        an signed receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -265,8 +265,8 @@ def testEncryptMessageSignMdn(self):
         )
 
     def testSignMessageNoMdn(self):
-        """ Test Permutation 7: Sender sends signed data and does NOT request
-         a receipt. """
+        """Test Permutation 7: Sender sends signed data and does NOT request
+        a receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -291,8 +291,8 @@ def testSignMessageNoMdn(self):
         )
 
     def testSignMessageMdn(self):
-        """ Test Permutation 8: Sender sends signed data and requests an
-        unsigned receipt. """
+        """Test Permutation 8: Sender sends signed data and requests an
+        unsigned receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -320,8 +320,8 @@ def testSignMessageMdn(self):
         )
 
     def testSignMessageSignMdn(self):
-        """ Test Permutation 9: Sender sends signed data and requests a
-         signed receipt. """
+        """Test Permutation 9: Sender sends signed data and requests a
+        signed receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -351,8 +351,8 @@ def testSignMessageSignMdn(self):
         )
 
     def testEncryptSignMessageNoMdn(self):
-        """ Test Permutation 10: Sender sends encrypted and signed data and
-        does NOT request a receipt. """
+        """Test Permutation 10: Sender sends encrypted and signed data and
+        does NOT request a receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -380,8 +380,8 @@ def testEncryptSignMessageNoMdn(self):
         )
 
     def testEncryptSignMessageMdn(self):
-        """ Test Permutation 11: Sender sends encrypted and signed data and
-        requests an unsigned receipt. """
+        """Test Permutation 11: Sender sends encrypted and signed data and
+        requests an unsigned receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -412,8 +412,8 @@ def testEncryptSignMessageMdn(self):
         )
 
     def testEncryptSignMessageSignMdn(self):
-        """ Test Permutation 12: Sender sends encrypted and signed data and
-        requests a signed receipt. """
+        """Test Permutation 12: Sender sends encrypted and signed data and
+        requests a signed receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -446,8 +446,8 @@ def testEncryptSignMessageSignMdn(self):
         )
 
     def testCompressEncryptSignMessageSignMdn(self):
-        """ Test Permutation 13: Sender sends compressed, encrypted and signed
-         data and requests an signed receipt. """
+        """Test Permutation 13: Sender sends compressed, encrypted and signed
+        data and requests an signed receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -483,8 +483,8 @@ def testCompressEncryptSignMessageSignMdn(self):
 
     @mock.patch("requests.post")
     def testEncryptSignMessageAsyncSignMdn(self, mock_request):
-        """ Test Permutation 14: Sender sends encrypted and signed data and
-        requests an Asynchronous signed receipt. """
+        """Test Permutation 14: Sender sends encrypted and signed data and
+        requests an Asynchronous signed receipt."""
 
         partner = Partner.objects.create(
             name="AS2 Server",
@@ -593,8 +593,13 @@ def __call__(self, *args, **kwargs):
         req_response = Response()
         req_response._content = response.content
 
-        for h_key, h_value in response._headers.values():
-            req_response.headers[h_key] = h_value
+        # Django 3.2 stores headers in headers instead of _headers
+        if hasattr(response, "_headers"):
+            for h_key, h_value in response._headers.values():
+                req_response.headers[h_key] = h_value
+        else:
+            for h_key, h_value in response.headers._store.values():
+                req_response.headers[h_key] = h_value
 
         req_response.status_code = response.status_code
         return req_response

pyas2/tests/test_views.py

@@ -24,7 +24,9 @@ def setUp(self):
 
         with open(os.path.join(TEST_DIR, "testmessage.edi"), "rb") as fp:
             self.message = Message.objects.create(
-                message_id="some-message-id", direction="IN", status="S",
+                message_id="some-message-id",
+                direction="IN",
+                status="S",
             )
             self.message.payload.save("testmessage.edi", fp)
             self.mdn = Mdn.objects.create(

pyas2/urls.py

@@ -1,16 +1,16 @@
-from django.conf.urls import url
+from django.urls import path
 from django.contrib.auth.decorators import login_required
 
 from pyas2 import views
 
 
 urlpatterns = [
-    url(r"^as2receive/", views.ReceiveAs2Message.as_view(), name="as2-receive"),
+    path("as2receive/", views.ReceiveAs2Message.as_view(), name="as2-receive"),
     # Add the url again without slash for backwards compatibility
-    url(r"^as2receive", views.ReceiveAs2Message.as_view(), name="as2-receive"),
-    url(r"^as2send/", login_required(views.SendAs2Message.as_view()), name="as2-send"),
-    url(
-        r"^download/(?P<obj_type>.+)/(?P<obj_id>.+)/",
+    path("as2receive", views.ReceiveAs2Message.as_view(), name="as2-receive"),
+    path("as2send/", login_required(views.SendAs2Message.as_view()), name="as2-send"),
+    path(
+        "download/<str:obj_type>/<str:obj_id>/",
         login_required(views.DownloadFile.as_view()),
         name="download-file",
     ),

pyas2/utils.py

@@ -7,8 +7,8 @@
 
 
 def run_post_send(message):
-    """ Execute command after successful send, can be used to notify
-    successful sends """
+    """Execute command after successful send, can be used to notify
+    successful sends"""
 
     command = message.partner.cmd_send
     if command:
@@ -28,7 +28,7 @@ def run_post_send(message):
 
 
 def run_post_receive(message, full_filename):
-    """ Execute command after successful receive, can be used to call the
+    """Execute command after successful receive, can be used to call the
     edi program for further processing"""
 
     command = message.partner.cmd_receive

pyas2/views.py

@@ -32,14 +32,14 @@
 @method_decorator(csrf_exempt, name="dispatch")
 class ReceiveAs2Message(View):
     """
-       Class receives AS2 requests from partners.
-       Checks whether its an AS2 message or an MDN and acts accordingly.
+    Class receives AS2 requests from partners.
+    Checks whether its an AS2 message or an MDN and acts accordingly.
     """
 
     @staticmethod
     def find_message(message_id, partner_id):
-        """ Find the message using the message_id  and return its
-         pyas2 version"""
+        """Find the message using the message_id  and return its
+        pyas2 version"""
         message = Message.objects.filter(
             message_id=message_id, partner_id=partner_id.strip()
         ).first()

requirements/base.txt

@@ -1,3 +1,3 @@
-pyas2lib==1.3.1
+pyas2lib==1.3.3
 requests
-django>=2.1.9
+django>=2.2.18