myl-discovery 0.2.0__tar.gz → 0.3.1__tar.gz

{myl-discovery-0.2.0 → myl-discovery-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl-discovery
-Version: 0.2.0
+Version: 0.3.1
 Summary: email autodiscovery
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE

{myl-discovery-0.2.0 → myl-discovery-0.3.1}/myl_discovery.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl-discovery
-Version: 0.2.0
+Version: 0.3.1
 Summary: email autodiscovery
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE

{myl-discovery-0.2.0 → myl-discovery-0.3.1}/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.1/myl_discovery.egg-info/entry_points.txt

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

{myl-discovery-0.2.0 → myl-discovery-0.3.1}/myl_discovery.egg-info/requires.txt

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

myl-discovery-0.3.1/myldiscovery/__init__.py

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

myl-discovery-0.3.1/myldiscovery/__main__.py

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

myl-discovery-0.2.0/myldiscovery/__init__.py → myl-discovery-0.3.1/myldiscovery/discovery.py

@@ -1,5 +1,7 @@
 import logging
+import os
 import re
+import shutil
 
 import dns.resolver
 import requests
@@ -8,9 +10,33 @@ import xmltodict
 LOGGER = logging.getLogger(__name__)
 
 
+def is_termux():
+    if os.getenv("TERMUX_VERSION"):
+        return True
+
+    return shutil.which("termux-info") is not None
+
+
+def resolve(*args, **kwargs):
+    termux = is_termux()
+    dns.resolver.default_resolver = dns.resolver.Resolver(
+        # Do not attempt to read /etc/resolv.conf on Termux
+        configure=not termux
+    )
+    if termux:
+        # Default to Google DNS on Termux
+        dns.resolver.default_resolver.nameservers = [
+            "8.8.8.8",
+            "2001:4860:4860::8888",
+            "8.8.4.4",
+            "2001:4860:4860::8844",
+        ]
+    return dns.resolver.resolve(*args, **kwargs)
+
+
 def resolve_txt(domain, criteria="^mailconf="):
     regex = re.compile(criteria)
-    answers = dns.resolver.resolve(domain, "TXT")
+    answers = resolve(domain, "TXT")
     for rdata in answers:
         for txt_string in rdata.strings:
             txt_record = txt_string.decode("utf-8")
@@ -19,7 +45,7 @@ def resolve_txt(domain, criteria="^mailconf="):
 
 
 def resolve_srv(domain):
-    answers = dns.resolver.resolve(domain, "SRV")
+    answers = resolve(domain, "SRV")
     data = []
     for rdata in answers:
         entry = {
@@ -73,7 +99,7 @@ def autodiscover(email_addr, srv_only=False):
                 # 465 -> starttls
                 # 587 -> no
                 "starttls": False,
-            }
+            },
         }
 
     res = requests.get(autoconfig)

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

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