myl-discovery 0.1.0__tar.gz → 0.3.0__tar.gz

{myl-discovery-0.1.0 → myl-discovery-0.3.0}/PKG-INFO

@@ -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
@@ -694,12 +694,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.1.0 → myl-discovery-0.3.0}/README.md

@@ -8,12 +8,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.1.0 → myl-discovery-0.3.0}/myl_discovery.egg-info/PKG-INFO

@@ -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
@@ -694,12 +694,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.1.0 → myl-discovery-0.3.0}/myl_discovery.egg-info/SOURCES.txt

@@ -8,6 +8,10 @@ pyproject.toml
 myl_discovery.egg-info/PKG-INFO
 myl_discovery.egg-info/SOURCES.txt
 myl_discovery.egg-info/dependency_links.txt
+myl_discovery.egg-info/entry_points.txt
 myl_discovery.egg-info/requires.txt
 myl_discovery.egg-info/top_level.txt
-myldiscovery/__init__.py
+myldiscovery/__init__.py
+myldiscovery/__main__.py
+myldiscovery/discovery.py
+myldiscovery/main.py

myl-discovery-0.3.0/myl_discovery.egg-info/entry_points.txt

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

{myl-discovery-0.1.0 → myl-discovery-0.3.0}/myl_discovery.egg-info/requires.txt

@@ -1,3 +1,4 @@
 dnspython
 requests
+rich
 xmltodict

myl-discovery-0.3.0/myldiscovery/__init__.py

@@ -0,0 +1,4 @@
+from .discovery import autodiscover
+from .main import main
+
+__all__ = ["main", "autodiscover"]

myl-discovery-0.3.0/myldiscovery/__main__.py

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

myl-discovery-0.1.0/myldiscovery/__init__.py → myl-discovery-0.3.0/myldiscovery/discovery.py

@@ -44,21 +44,36 @@ def autodiscover_txt(domain):
     return res.split("=")[1]
 
 
-def autodiscover(email_addr):
+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)
+    autoconfig = autodiscover_txt(domain) if not srv_only else None
 
     if not autoconfig:
-        srv = resolve_srv(f"_imaps._tcp.{domain}")
+        imap = resolve_srv(f"_imaps._tcp.{domain}")
+        smtp = resolve_srv(f"_submission._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,
+            "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)
@@ -70,16 +85,24 @@ def autodiscover(email_addr):
         .get("emailProvider", {})
         .get("incomingServer")
     )
-    # smtp = (
-    #     data.get("clientConfig", {})
-    #     .get("emailProvider", {})
-    #     .get("outgoingServer")
-    # )
+    smtp = (
+        data.get("clientConfig", {})
+        .get("emailProvider", {})
+        .get("outgoingServer")
+    )
 
     assert imap is not None
+    assert smtp is not None
 
     return {
-        "server": imap.get("hostname"),
-        "port": int(imap.get("port")),
-        "starttls": imap.get("socketType") == "STARTTLS",
+        "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",
+        },
     }

myl-discovery-0.3.0/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 → myl-discovery-0.3.0}/pyproject.toml

@@ -18,9 +18,13 @@ classifiers = [
 dependencies = [
   "dnspython",
   "requests",
+  "rich",
   "xmltodict"
 ]
-version = "0.1.0"
+version = "0.3.0"
+
+[project.scripts]
+myl-discovery = "myldiscovery:main"
 
 [tool.black]
 line-length = 79