From 7fe15ea9cf81a1d29485c6d64e2dc68645ad6eef Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Fri, 15 Oct 2021 14:22:50 +0200
Subject: [PATCH] added dmarc record for report domain

---
 core/admin/mailu/models.py                        |  7 +++++++
 core/admin/mailu/ui/templates/domain/details.html | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 01711a60..561a4ab6 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -243,6 +243,13 @@ class Domain(Base):
             ruf = f' ruf=mailto:{ruf}@{domain};' if ruf else ''
             return f'_dmarc.{self.name}. 600 IN TXT "v=DMARC1; p=reject;{rua}{ruf} adkim=s; aspf=s"'
 
+    @cached_property
+    def dns_dmarc_report(self):
+        """ return DMARC report record for mailu server """
+        if self.dkim_key:
+            domain = app.config['DOMAIN']
+            return f'{self.name}._report._dmarc.{domain}. 600 IN TXT "v=DMARC1"'
+
     @cached_property
     def dns_autoconfig(self):
         """ return list of auto configuration records (RFC6186) """
diff --git a/core/admin/mailu/ui/templates/domain/details.html b/core/admin/mailu/ui/templates/domain/details.html
index b90ea3de..a30b9357 100644
--- a/core/admin/mailu/ui/templates/domain/details.html
+++ b/core/admin/mailu/ui/templates/domain/details.html
@@ -46,7 +46,10 @@
 </tr>
 <tr>
   <th>{% trans %}DNS DMARC entry{% endtrans %}</th>
-  <td>{{ macros.clip("dns_dmark") }}<pre id="dns_dmark" class="pre-config border bg-light">{{ domain.dns_dmarc }}</pre></td>
+  <td>
+    {{ macros.clip("dns_dmarc") }}<pre id="dns_dmarc" class="pre-config border bg-light">{{ domain.dns_dmarc }}</pre>
+    {{ macros.clip("dns_dmarc_report") }}<pre id="dns_dmarc_report" class="pre-config border bg-light">{{ domain.dns_dmarc_report }}</pre>
+  </td>
 </tr>
 {%- endif %}
 {%- set tlsa_record=domain.dns_tlsa %}
@@ -58,12 +61,11 @@
 {%- endif %}
 <tr>
   <th>{% trans %}DNS client auto-configuration (RFC6186) entries{% endtrans %}</th>
-  <td>
-    {{ macros.clip("dns_autoconfig") }}<pre id="dns_autoconfig" class="pre-config border bg-light">
+  <td>{{ macros.clip("dns_autoconfig") }}<pre id="dns_autoconfig" class="pre-config border bg-light">
 {%- for line in domain.dns_autoconfig %}
 {{ line }}
 {%- endfor -%}
-    </pre></td>
+  </pre></td>
 </tr>
 {%- endcall %}
 {%- endblock %}