use subfolders in message store and password widget for key_pass

Author: abhishekram

pyas2/forms.py

@@ -99,6 +99,9 @@ def save(self, commit=True):
     class Meta:
         model = PrivateKey
         fields = ['key_file', 'key_pass']
+        widgets = {
+            'key_pass': forms.PasswordInput(),
+        }
 
 
 class PublicCertificateForm(forms.ModelForm):

pyas2/models.py

@@ -5,6 +5,7 @@
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.utils import timezone
 from django.utils.translation import ugettext as _
 from email.parser import HeaderParser
 from pyas2lib import Mdn as As2Mdn
@@ -277,10 +278,13 @@ def create_from_as2message(self, as2message, payload, direction, status,
 
 
 def get_message_store(instance, filename):
+    current_date = timezone.now().strftime('%Y%m%d')
     if instance.direction == 'OUT':
-        target_dir = os.path.join('messages', '__store', 'payload', 'sent')
+        target_dir = os.path.join(
+            'messages', '__store', 'payload', 'sent', current_date)
     else:
-        target_dir = os.path.join('messages', '__store', 'payload', 'received')
+        target_dir = os.path.join(
+            'messages', '__store', 'payload', 'received', current_date)
     return '{0}/{1}'.format(target_dir, filename)
 
 
@@ -448,10 +452,13 @@ def create_from_as2mdn(self, as2mdn, message, status, return_url=None):
 
 
 def get_mdn_store(instance, filename):
+    current_date = timezone.now().strftime('%Y%m%d')
     if instance.status == 'S':
-        target_dir = os.path.join('messages', '__store', 'mdn', 'sent')
+        target_dir = os.path.join(
+            'messages', '__store', 'mdn', 'sent', current_date)
     else:
-        target_dir = os.path.join('messages', '__store', 'mdn', 'received')
+        target_dir = os.path.join(
+            'messages', '__store', 'mdn', 'received', current_date)
 
     return '{0}/{1}'.format(target_dir, filename)
 

pyas2/tests/test_advanced.py

@@ -7,6 +7,7 @@
 
 from pyas2 import settings
 from pyas2.models import Message
+from pyas2.models import Mdn
 from pyas2.models import Organization
 from pyas2.models import Partner
 from pyas2.models import PrivateKey
@@ -85,6 +86,12 @@ def tearDown(self):
             file_path = os.path.join(inbox, the_file)
             if os.path.isfile(file_path):
                 os.unlink(file_path)
+        for message in Message.objects.all():
+            message.headers.delete()
+            message.payload.delete()
+        for mdn in Mdn.objects.all():
+            mdn.headers.delete()
+            mdn.payload.delete()
 
     def test_post_send_command(self):
         """ Test that the command after successful send gets executed."""

pyas2/tests/test_basic.py

@@ -83,6 +83,13 @@ def tearDown(self):
             if os.path.isfile(file_path):
                 os.unlink(file_path)
 
+        for message in Message.objects.all():
+            message.headers.delete()
+            message.payload.delete()
+        for mdn in Mdn.objects.all():
+            mdn.headers.delete()
+            mdn.payload.delete()
+
     def testEndpoint(self):
         """ Test if the as2 reveive endpoint is active """