override apple socket type

Cosium · Feb 26, 2024 · 73403d1 · 73403d1
1 parent 758af5f
commit 73403d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -43,3 +43,4 @@
 * Add mozilla placeholders expansion support in CalDAV/CardDAV outlook autoconfig URLs.
 * Add CalDAV/CardDAV support for apple mobileconfig.
 * Updated README.md
+* Override apple socket type, as for iOS mail.app, STARTTLS == SSL
diff --git a/automx2/__init__.py b/automx2/__init__.py
@@ -19,7 +19,7 @@
 import logging
 
 IDENTIFIER = 'automx2'  # Do not change this!
-VERSION = '2024.1'
+VERSION = '2024.1.1'
 
 PLACEHOLDER_ADDRESS = r'%EMAILADDRESS%'
 PLACEHOLDER_DOMAIN = r'%EMAILDOMAIN%'

diff --git a/automx2/generators/apple.py b/automx2/generators/apple.py
@@ -186,6 +186,8 @@ def _preferred_server(servers: List[Server], type_: str) -> Server:
             elif (server.socket_type not in encrypted) and (s.socket_type in encrypted):
                 # Server uses one of the preferred socket types while the candidate does not.
                 server = s
+    if server.socket_type == "STARTTLS":
+        server.socket_type = "SSL"
     return server