myl-discovery 0.5.8__py3-none-any.whl → 0.6.0__py3-none-any.whl

{myl_discovery-0.5.8.dist-info → myl_discovery-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl-discovery
-Version: 0.5.8
+Version: 0.6.0
 Summary: email autodiscovery
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License: GNU GENERAL PUBLIC LICENSE
@@ -678,16 +678,20 @@ License: GNU GENERAL PUBLIC LICENSE
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
         
+Project-URL: homepage, https://github.com/pschmitt/myl-discovery
+Project-URL: documentation, https://github.com/pschmitt/myl-discovery/blob/head/readme.md
+Project-URL: repository, https://github.com/pschmitt/myl-discovery
+Project-URL: issues, https://github.com/pschmitt/myl-discovery/issues
 Keywords: email-discovery,autodiscover,autoconfig,smtp,imap,email,discovery
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dnspython <3.0.0,>=2.7.0
+Requires-Dist: dnspython <3.0.0,>=2.0.0
 Requires-Dist: exchangelib <6.0.0,>=5.0.0
 Requires-Dist: requests <3.0.0,>=2.0.0
 Requires-Dist: rich <14.0.0,>=13.0.0
-Requires-Dist: xmltodict <1.0.0,>=0.14.1
+Requires-Dist: xmltodict <1.0.0,>=0.13.0
 
 # 📩 myl-discovery
 
@@ -734,12 +738,14 @@ Here's an example:
   "imap": {
     "server": "imap.yourdomain.com",
     "port": 993,
-    "starttls": false
+    "starttls": false,
+    "ssl": false
   },
   "smtp": {
     "server": "smtp.yourdomain.com",
     "port": 587,
-    "starttls": true
+    "starttls": true,
+    "ssl": false
   }
 }
 ```
@@ -818,3 +824,8 @@ $ myl-discovery user01@gmail.com
 ## 📜 License
 
 myl-discovery is licensed under the [GNU General Public License v3.0](LICENSE).
+
+## 📑 Upstream docs
+
+- https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+- https://datatracker.ietf.org/doc/html/rfc6186

myl_discovery-0.6.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+myldiscovery/__init__.py,sha256=L_XVC06ZVdjhnV5up1MBnywTuGUIyjt8PUoQDUOzfAk,381
+myldiscovery/__main__.py,sha256=5BjNuyet8AY-POwoF5rGt722rHQ7tJ0Vf0UFUfzzi-I,58
+myldiscovery/discovery.py,sha256=eSvTFEwzJU6qf3PLhXxn1xZs9SJlPdAn5SJUMYpmcco,9195
+myldiscovery/main.py,sha256=BQlblFEsPx3-JSXImWc1i2SsRED2IiEWD3cEPTszwac,2034
+myl_discovery-0.6.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+myl_discovery-0.6.0.dist-info/METADATA,sha256=Nu0m2olCS_9eAMuuJ2ZyDcVDzoF8kUxAq9xi0ZWjGkc,45161
+myl_discovery-0.6.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+myl_discovery-0.6.0.dist-info/entry_points.txt,sha256=nyyAyvgvu6iO9mPEA6uVrPfd0lIrUyo9AQWeH2asEY0,52
+myl_discovery-0.6.0.dist-info/top_level.txt,sha256=v_h72JexaacqBNY6iOMD9PpGg8lnGoL-pkmUIzxdiVU,13
+myl_discovery-0.6.0.dist-info/RECORD,,

{myl_discovery-0.5.8.dist-info → myl_discovery-0.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

myldiscovery/discovery.py

@@ -75,6 +75,7 @@ def autodiscover_txt(domain):
         LOGGER.warning("Failed to resolve TXT record")
 
 
+# https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
 def parse_autoconfig(content):
     data = xmltodict.parse(content)
 
@@ -100,11 +101,13 @@ def parse_autoconfig(content):
             "server": imap.get("hostname"),
             "port": int(imap.get("port")),
             "starttls": imap.get("socketType") == "STARTTLS",
+            "ssl": imap.get("socketType") == "SSL",
         },
         "smtp": {
             "server": smtp.get("hostname"),
             "port": int(smtp.get("port")),
             "starttls": smtp.get("socketType") == "STARTTLS",
+            "ssl": smtp.get("socketType") == "SSL",
         },
     }
 
@@ -140,19 +143,41 @@ def parse_autodiscover(content):
             "server": imap.get("Server"),
             "port": int(imap.get("Port")),
             "starttls": imap.get("Encryption", "").lower() == "tls",
+            # FIXME Is that really the expected value for SSL?
+            "ssl": imap.get("Encryption", "").lower() == "ssl",
         },
         "smtp": {
             "server": smtp.get("Server"),
             "port": int(smtp.get("Port")),
             "starttls": smtp.get("Encryption", "").lower() == "tls",
+            # FIXME Is that really the expected value for SSL?
+            "ssl": smtp.get("Encryption", "").lower() == "ssl",
         },
     }
 
 
+# https://datatracker.ietf.org/doc/html/rfc6186
 def autodiscover_srv(domain):
     try:
+        # Start by looking for IMAPS and SUBMISSIONS (ie SSL)
+        imap_ssl = True
+        smtp_ssl = True
         imap = resolve_srv(f"_imaps._tcp.{domain}")
-        smtp = resolve_srv(f"_submission._tcp.{domain}")
+        smtp = resolve_srv(f"_submissions._tcp.{domain}")
+
+        if not imap:
+            LOGGER.warning("No imaps SRV found, trying imap (starttls)")
+            imap_ssl = False
+            imap = resolve_srv(f"_imap._tcp.{domain}")
+        if not smtp:
+            LOGGER.warning(
+                "No submissions SRV found, trying submission (starttls)"
+            )
+            imap_ssl = False
+            smtp = resolve_srv(f"_submission._tcp.{domain}")
+
+        imap_starttls = not imap_ssl
+        smtp_starttls = not smtp_ssl
 
         assert imap is not None
         assert smtp is not None
@@ -161,31 +186,36 @@ def autodiscover_srv(domain):
             "imap": {
                 "server": imap[0].get("hostname"),
                 "port": int(imap[0].get("port")),
-                # FIXME We might want to "smartly" guess if starttls should be
-                # enabled or not, depending on the port:
-                # 143 -> starttls
-                # 993 -> no
-                "starttls": False,
+                "starttls": imap_starttls,
+                "ssl": imap_ssl,
             },
             "smtp": {
                 "server": smtp[0].get("hostname"),
                 "port": int(smtp[0].get("port")),
-                # FIXME We might want to "smartly" guess if starttls should be
-                # enabled or not, depending on the port:
-                # 465 -> starttls
-                # 587 -> no
-                "starttls": False,
+                "starttls": smtp_starttls,
+                "ssl": smtp_ssl,
             },
         }
     except Exception as e:
         LOGGER.warning(f"Failed to resolve SRV records: {e}")
 
 
-def port_check(host, port):
+def port_check(host, port, timeout=5.0):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    result = sock.connect_ex((host, int(port)))
-    sock.close()
-    return result == 0
+    sock.settimeout(float(timeout))
+    try:
+        result = sock.connect_ex((host, port))
+        return result == 0
+    except socket.timeout:
+        LOGGER.warning(
+            f"Connection to {host}:{port} timed out after {timeout} seconds."
+        )
+        return False
+    except socket.error as e:
+        LOGGER.warning(f"Socket error occurred: {e}")
+        return False
+    finally:
+        sock.close()
 
 
 def check_email_ports(host):
@@ -212,32 +242,40 @@ def autodiscover_port_scan(server):
     portscan = check_email_ports(server)
     LOGGER.info(f"Port scan results: {portscan}")
 
-    imap_port = imap_starttls = None
+    imap_port = imap_starttls = imap_ssl = None
     if portscan.get(993):
         imap_port = 993
-        imap_starttls = False
+        imap_ssl = True
     elif portscan.get(143):
         imap_port = 143
-        imap_starttls = True
+        imap_ssl = False
 
-    smtp_port = smtp_starttls = None
+    smtp_port = smtp_starttls = smtp_ssl = None
     if portscan.get(465):
         smtp_port = 465
-        smtp_starttls = False
+        smtp_ssl = True
     elif portscan.get(587):
         smtp_port = 587
-        smtp_starttls = True
+        smtp_ssl = False
+    elif portscan.get(25):
+        smtp_port = 25
+        smtp_ssl = False
+
+    imap_starttls = not imap_ssl if imap_ssl is not None else None
+    smtp_starttls = not smtp_ssl if smtp_ssl is not None else None
 
     return {
         "imap": {
             "server": server,
             "port": imap_port,
             "starttls": imap_starttls,
+            "ssl": imap_ssl,
         },
         "smtp": {
             "server": server,
             "port": smtp_port,
             "starttls": smtp_starttls,
+            "ssl": smtp_ssl,
         },
     }
 
@@ -263,6 +301,22 @@ def autodiscover(email_addr, username=None, password=None):
     domain = email_addr.split("@")[-1]
     if not domain:
         raise ValueError(f"Invalid email address {email_addr}")
+    if domain == "gmail.com":
+        LOGGER.debug("Gmail detected, skipping autodiscover")
+        return {
+            "imap": {
+                "server": "imap.gmail.com",
+                "port": 993,
+                "starttls": False,
+                "ssl": True,
+            },
+            "smtp": {
+                "server": "smtp.gmail.com",
+                "port": 465,
+                "starttls": False,
+                "ssl": True,
+            },
+        }
 
     res = autodiscover_autoconfig(domain)
 

myldiscovery/main.py

@@ -60,7 +60,7 @@ def main():
                 table.add_row(
                     svc,
                     res[svc]["server"],
-                    str(res[svc]["port"]),
+                    str(res[svc].get("port", "N/A")),
                     "starttls" if res[svc]["starttls"] else "tls",
                 )
             console.print(table)

myl_discovery-0.5.8.dist-info/RECORD

@@ -1,10 +0,0 @@
-myldiscovery/__init__.py,sha256=L_XVC06ZVdjhnV5up1MBnywTuGUIyjt8PUoQDUOzfAk,381
-myldiscovery/__main__.py,sha256=5BjNuyet8AY-POwoF5rGt722rHQ7tJ0Vf0UFUfzzi-I,58
-myldiscovery/discovery.py,sha256=YnEJ54CdwaA6PluMSC0ba7uGhoM__-ejtPTCawa9cto,7358
-myldiscovery/main.py,sha256=wuo-kxoqsgX0r1ebrr86P4WNJJOhpemR7w5JT4F-ecw,2023
-myl_discovery-0.5.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-myl_discovery-0.5.8.dist-info/METADATA,sha256=Lj1QxtUK4jVe4rHMA02RdWgrdgUgyOExTEDIjXPh16w,44687
-myl_discovery-0.5.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-myl_discovery-0.5.8.dist-info/entry_points.txt,sha256=nyyAyvgvu6iO9mPEA6uVrPfd0lIrUyo9AQWeH2asEY0,52
-myl_discovery-0.5.8.dist-info/top_level.txt,sha256=v_h72JexaacqBNY6iOMD9PpGg8lnGoL-pkmUIzxdiVU,13
-myl_discovery-0.5.8.dist-info/RECORD,,