myl-discovery 0.1.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

{myl_discovery-0.1.0.dist-info → myl_discovery-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl-discovery
-Version: 0.1.0
+Version: 0.3.0
 Summary: email autodiscovery
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License: GNU GENERAL PUBLIC LICENSE
@@ -685,6 +685,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dnspython
 Requires-Dist: requests
+Requires-Dist: rich
 Requires-Dist: xmltodict
 
 # myl-discovery
@@ -697,12 +698,13 @@ Email autoconfig library
 pip install myl-discovery
 ```
 
-## Usage:
+## Usage
 
 ```python
 from myldiscovery import autodiscover
 autodiscover("me@example.com")
-# {'server': 'mail.example.com', 'port': 143, 'starttls': True}
+# {'imap': {'server': 'mail.example.com', 'port': 993, 'starttls': False},
+#  'smtp': {'server': 'mail.example.com', 'port': 587, 'starttls': False}}
 ```
 
 

myl_discovery-0.3.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+myldiscovery/__init__.py,sha256=zzTVte4vTiupxCcjgQBkifnFjkNnZX_Sf4Ys2C5ufZQ,95
+myldiscovery/__main__.py,sha256=fr-CFAsvUaq-F1nICslExsfLggcTfrfCuU_MUBrHZdQ,58
+myldiscovery/discovery.py,sha256=LGCExQPRldvsQ3WtI8IYTGjVa7ez807caV9SMwgcctU,2951
+myldiscovery/main.py,sha256=sdh2FeE54uVYiUA8QVK-ocdK0-g5v9gGw9F4NVD4tyk,1732
+myl_discovery-0.3.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+myl_discovery-0.3.0.dist-info/METADATA,sha256=httmQt7oKBH8xdZPjwzge8iAwglmK9GOHkpnNk41sp4,41317
+myl_discovery-0.3.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+myl_discovery-0.3.0.dist-info/entry_points.txt,sha256=nyyAyvgvu6iO9mPEA6uVrPfd0lIrUyo9AQWeH2asEY0,52
+myl_discovery-0.3.0.dist-info/top_level.txt,sha256=v_h72JexaacqBNY6iOMD9PpGg8lnGoL-pkmUIzxdiVU,13
+myl_discovery-0.3.0.dist-info/RECORD,,

myl_discovery-0.3.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+myl-discovery = myldiscovery:main

myldiscovery/__init__.py

@@ -1,85 +1,4 @@
-import logging
-import re
+from .discovery import autodiscover
+from .main import main
 
-import dns.resolver
-import requests
-import xmltodict
-
-LOGGER = logging.getLogger(__name__)
-
-
-def resolve_txt(domain, criteria="^mailconf="):
-    regex = re.compile(criteria)
-    answers = dns.resolver.resolve(domain, "TXT")
-    for rdata in answers:
-        for txt_string in rdata.strings:
-            txt_record = txt_string.decode("utf-8")
-            if re.search(regex, txt_record):
-                return txt_record
-
-
-def resolve_srv(domain):
-    answers = dns.resolver.resolve(domain, "SRV")
-    data = []
-    for rdata in answers:
-        entry = {
-            "hostname": ".".join(
-                [
-                    x.decode("utf-8")
-                    for x in rdata.target.labels
-                    if x.decode("utf-8") != ""
-                ]
-            ),
-            "port": rdata.port,
-        }
-        data.append(entry)
-
-    return data
-
-
-def autodiscover_txt(domain):
-    res = resolve_txt(domain, criteria="^mailconf=")
-    if not res:
-        return
-    return res.split("=")[1]
-
-
-def autodiscover(email_addr):
-    domain = email_addr.split("@")[-1]
-    if not domain:
-        raise ValueError(f"Invalid email address {email_addr}")
-
-    autoconfig = autodiscover_txt(domain)
-
-    if not autoconfig:
-        srv = resolve_srv(f"_imaps._tcp.{domain}")
-        return {
-            "server": srv[0].get("hostname"),
-            "port": int(srv[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,
-        }
-
-    res = requests.get(autoconfig)
-    res.raise_for_status()
-
-    data = xmltodict.parse(res.text)
-    imap = (
-        data.get("clientConfig", {})
-        .get("emailProvider", {})
-        .get("incomingServer")
-    )
-    # smtp = (
-    #     data.get("clientConfig", {})
-    #     .get("emailProvider", {})
-    #     .get("outgoingServer")
-    # )
-
-    assert imap is not None
-
-    return {
-        "server": imap.get("hostname"),
-        "port": int(imap.get("port")),
-        "starttls": imap.get("socketType") == "STARTTLS",
-    }
+__all__ = ["main", "autodiscover"]

myldiscovery/__main__.py

@@ -0,0 +1,4 @@
+from . import main
+
+if __name__ == '__main__':
+    main()

myldiscovery/discovery.py

@@ -0,0 +1,108 @@
+import logging
+import re
+
+import dns.resolver
+import requests
+import xmltodict
+
+LOGGER = logging.getLogger(__name__)
+
+
+def resolve_txt(domain, criteria="^mailconf="):
+    regex = re.compile(criteria)
+    answers = dns.resolver.resolve(domain, "TXT")
+    for rdata in answers:
+        for txt_string in rdata.strings:
+            txt_record = txt_string.decode("utf-8")
+            if re.search(regex, txt_record):
+                return txt_record
+
+
+def resolve_srv(domain):
+    answers = dns.resolver.resolve(domain, "SRV")
+    data = []
+    for rdata in answers:
+        entry = {
+            "hostname": ".".join(
+                [
+                    x.decode("utf-8")
+                    for x in rdata.target.labels
+                    if x.decode("utf-8") != ""
+                ]
+            ),
+            "port": rdata.port,
+        }
+        data.append(entry)
+
+    return data
+
+
+def autodiscover_txt(domain):
+    res = resolve_txt(domain, criteria="^mailconf=")
+    if not res:
+        return
+    return res.split("=")[1]
+
+
+def autodiscover(email_addr, srv_only=False):
+    domain = email_addr.split("@")[-1]
+    if not domain:
+        raise ValueError(f"Invalid email address {email_addr}")
+
+    autoconfig = autodiscover_txt(domain) if not srv_only else None
+
+    if not autoconfig:
+        imap = resolve_srv(f"_imaps._tcp.{domain}")
+        smtp = resolve_srv(f"_submission._tcp.{domain}")
+
+        return {
+            "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,
+            },
+            "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,
+            },
+        }
+
+    res = requests.get(autoconfig)
+    res.raise_for_status()
+
+    data = xmltodict.parse(res.text)
+    imap = (
+        data.get("clientConfig", {})
+        .get("emailProvider", {})
+        .get("incomingServer")
+    )
+    smtp = (
+        data.get("clientConfig", {})
+        .get("emailProvider", {})
+        .get("outgoingServer")
+    )
+
+    assert imap is not None
+    assert smtp is not None
+
+    return {
+        "imap": {
+            "server": imap.get("hostname"),
+            "port": int(imap.get("port")),
+            "starttls": imap.get("socketType") == "STARTTLS",
+        },
+        "smtp": {
+            "server": smtp.get("hostname"),
+            "port": int(smtp.get("port")),
+            "starttls": smtp.get("socketType") == "STARTTLS",
+        },
+    }

myldiscovery/main.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+import argparse
+import logging
+
+from rich import print_json
+from rich.console import Console
+from rich.logging import RichHandler
+from rich.table import Table
+
+from myldiscovery import autodiscover
+
+LOGGER = logging.getLogger(__name__)
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-j", "--json", action="store_true", default=False)
+    parser.add_argument("-d", "--debug", action="store_true", default=False)
+    parser.add_argument("EMAIL")
+    return parser.parse_args()
+
+
+def main():
+    console = Console()
+    args = parse_args()
+
+    logging.basicConfig(
+        handlers=[RichHandler(console=console, show_time=False)],
+        level=logging.DEBUG if args.debug else logging.INFO,
+    )
+    LOGGER.debug(args)
+
+    try:
+        res = autodiscover(args.EMAIL)
+        if args.json:
+            print_json(data=res)
+        else:
+            table = Table(
+                expand=True,
+                show_header=True,
+                header_style="bold",
+                show_lines=False,
+                box=None,
+            )
+            table.add_column("Service", style="red")
+            table.add_column("Host", style="blue")
+            table.add_column("Port", style="green")
+            table.add_column("TLS", style="yellow")
+            for svc in ["imap", "smtp"]:
+                table.add_row(
+                    svc,
+                    res[svc]["server"],
+                    str(res[svc]["port"]),
+                    "starttls" if res[svc]["starttls"] else "tls",
+                )
+            console.print(table)
+    except Exception:
+        console.print_exception(show_locals=True)
+
+
+if __name__ == "__main__":
+    main()

myl_discovery-0.1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-myldiscovery/__init__.py,sha256=xalUlWBnrOfGhkQL6ipCF2qJrTPF1yjkKpD4pibkMrk,2149
-myl_discovery-0.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-myl_discovery-0.1.0.dist-info/METADATA,sha256=8U3XgyA-Mudg3Y3lxnlh1JkdbB3MKEi3IEzNzWT1-lA,41212
-myl_discovery-0.1.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-myl_discovery-0.1.0.dist-info/top_level.txt,sha256=v_h72JexaacqBNY6iOMD9PpGg8lnGoL-pkmUIzxdiVU,13
-myl_discovery-0.1.0.dist-info/RECORD,,