From 2b62a6327ab8300c3e271c4c5418164909b3b4a1 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Thu, 10 Mar 2022 11:49:30 +0100
Subject: [PATCH] Do explicit TLS where possible

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

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 88223cf7..dad6986c 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -255,16 +255,27 @@ class Domain(Base):
         """ return list of auto configuration records (RFC6186) """
         hostname = app.config['HOSTNAME']
         protocols = [
-            ('submission', 587),
-            ('imap', 143),
-            ('pop3', 110),
             ('autodiscover', 443),
         ]
         if app.config['TLS_FLAVOR'] != 'notls':
             protocols.extend([
+                ('submission', 0),
+                ('submissions', 465),
+                ('imap', 0),
+                ('pop3', 0),
                 ('imaps', 993),
                 ('pop3s', 995),
             ])
+        else:
+            protocols.extend([
+                ('submission', 587),
+                ('submissions', 0),
+                ('imap', 143),
+                ('pop3', 110),
+                ('imaps', 0),
+                ('pop3s', 0),
+            ])
+
         return list([
             f'_{proto}._tcp.{self.name}. 600 IN SRV 1 1 {port} {hostname}.'
             for proto, port
diff --git a/core/admin/mailu/ui/templates/domain/details.html b/core/admin/mailu/ui/templates/domain/details.html
index a30b9357..28f3f570 100644
--- a/core/admin/mailu/ui/templates/domain/details.html
+++ b/core/admin/mailu/ui/templates/domain/details.html
@@ -60,7 +60,7 @@
 </tr>
 {%- endif %}
 <tr>
-  <th>{% trans %}DNS client auto-configuration (RFC6186) entries{% endtrans %}</th>
+  <th>{% trans %}DNS client auto-configuration entries{% endtrans %}</th>
   <td>{{ macros.clip("dns_autoconfig") }}<pre id="dns_autoconfig" class="pre-config border bg-light">
 {%- for line in domain.dns_autoconfig %}
 {{ line }}