added logging of mails sent unencrypted (in database)

posttls/config/settings/base.py

@@ -75,7 +75,7 @@ AUTH_USER_MODEL = 'core.User'
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Berlin'
 
 USE_I18N = True
 

posttls/core/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 
-from .models import User, TLSNotification
+from .models import User, TLSNotification, TLSLogEntry
 
 
 # Custom User Model
@@ -16,5 +16,10 @@ class TLSNotificationAdmin(admin.ModelAdmin):
     list_display = ('queue_id', 'notification')
 
 
+class TLSLogEntryAdmin(admin.ModelAdmin):
+    list_display = ('queue_id', 'sender', 'recipients', 'action', 'date')
+
+
 admin.site.register(TLSNotification, TLSNotificationAdmin)
+admin.site.register(TLSLogEntry, TLSLogEntryAdmin)
 

posttls/core/migrations/0003_auto_20160228_1436.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-28 14:36
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_tlsnotification'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TLSLogEntry',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('queue_id', models.CharField(max_length=20, verbose_name='Queue ID')),
+                ('sender', models.CharField(max_length=55, verbose_name='Sender')),
+                ('action', models.CharField(max_length=100, verbose_name='Action')),
+                ('date', models.DateTimeField(verbose_name='Date')),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
+        ),
+    ]

posttls/core/migrations/0004_auto_20160228_1600.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-28 15:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0003_auto_20160228_1436'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tlslogentry',
+            name='recipients',
+            field=models.CharField(default='', max_length=255, verbose_name='Recipients'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='tlslogentry',
+            name='sender',
+            field=models.CharField(max_length=255, verbose_name='Sender'),
+        ),
+    ]

posttls/core/migrations/0005_auto_20160228_1615.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-28 15:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0004_auto_20160228_1600'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tlslogentry',
+            name='recipients',
+            field=models.CharField(max_length=255, null=True, verbose_name='Recipients'),
+        ),
+    ]

posttls/core/models.py

@@ -18,5 +18,18 @@ class TLSNotification(models.Model):
     queue_id = models.CharField('Queue ID', max_length=20)
     notification = models.DateTimeField('Notification')  # Time of the last notification
 
+    def __str__(self):
+        return self.queue_id
+
+
+class TLSLogEntry(models.Model):
+    """Log entries for handled mails (forwarded/deleted)"""
+
+    queue_id = models.CharField('Queue ID', max_length=20)
+    sender = models.CharField('Sender', max_length=255)
+    recipients = models.CharField('Recipients', max_length=255, null=True)
+    action = models.CharField('Action', max_length=100)
+    date = models.DateTimeField('Date')
+
     def __str__(self):
         return self.queue_id

posttls/core/views.py

@@ -2,8 +2,9 @@ import subprocess
 import re
 
 from django.shortcuts import render
+from django.utils import timezone
 
-from core.models import TLSNotification
+from core.models import TLSNotification, TLSLogEntry
 
 
 def mailaction(request):
@@ -69,7 +70,7 @@ def mailaction(request):
         # - the recipients: we do want to send the mail not to all recipients mentioned
         #                   in the header. The mail was already sent to most of the
         #                   recipients. We just want so send the mail to those recipients
-        #                   who did not already get the email since there were errors why
+        #                   who did not already get the email since there were errors so
         #                   the mail was not delivered. These are the recipient lines in
         #                   the envelope!
 
@@ -139,6 +140,14 @@ def mailaction(request):
                              stderr=subprocess.STDOUT)
         output += str(p.stdout.read(), "utf-8")
 
+        # Create log entry in database
+        q = TLSLogEntry(queue_id=queue_id,
+                        sender=envelope_sender,
+                        action=action,
+                        recipients=recipients,
+                        date=timezone.now())
+        q.save()
+
     ######################################################
     # DELETE MAIL
     elif action == "delete":