ENH,BLD: wrdrd.tools.domain: sarge, structlog (#7)

Author: westurner

requirements-dev.txt

@@ -1 +1,2 @@
--e git+https://github.com/amoffat/sh#egg=sh
+-e hg+https://bitbucket.org/vinay.sajip/sarge#egg=sarge
+-e git+https://github.com/hynek/structlog#egg=structlog

requirements.txt

@@ -1,4 +1,5 @@
-sh
+sarge
+structlog
 requests
 beautifulsoup4
 URLObject

setup.py

@@ -17,7 +17,10 @@
 readme = open('README.rst').read()
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
-requires = ['sh']
+requires = [
+    'sarge',
+    'structlog',
+]
 
 setup(
     name='wrdrd',

wrdrd/tools/domain.py

@@ -9,62 +9,94 @@
 """
 import logging
 
-import sh
+import sarge
+import structlog
 
-log = logging.getLogger()
+#log = logging.getLogger()
+log = structlog.get_logger()
 
 def nslookup(domain):
     if not domain.endswith('.'):
         domain = domain + '.'
-    output = sh.nslookup(domain)
+    cmd = sarge.shell_format('nslookup {0}', domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 def whois(domain):
-    output = sh.whois(domain)
+    cmd = sarge.shell_format('whois {0}', domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def dig_all(domain):
-    output = sh.dig(domain, "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
+    cmd = sarge.shell_format(
+        "dig {0} +cmd +nocomments +question +noidentify +nostats",
+        domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def dig_ns(domain):
-    output = sh.dig(domain, "ns", "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
+    cmd = sarge.shell_format(
+        "dig {0} ns +cmd +nocomments +question +noidentify +nostats",
+        domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def dig_txt(domain):
-    output = sh.dig(domain, "txt", "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
+    cmd = sarge.shell_format(
+        "dig {0} txt +cmd +nocomments +question +noidentify +nostats",
+        domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def dig_spf(domain):
     """
     https://en.wikipedia.org/wiki/Sender_Policy_Framework
     """
-    output = sh.dig(domain, "spf", "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
+    cmd = sarge.shell_format(
+        "dig {0} spf +cmd +nocomments +question +noidentify +nostats",
+        domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def dig_mx(domain):
     """
     https://en.wikipedia.org/wiki/MX_record
     """
-    mx_output = sh.dig(domain, "mx", "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
-    return mx_output
+    cmd = sarge.shell_format(
+        "dig {0} mx +cmd +nocomments +question +noidentify +nostats",
+        domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
+    return output
 
 
 def dig_dnskey(zone):
-    output = sh.dig('+dnssec', zone, 'dnskey', "+cmd", "+nocomments", "+question", "+noidentify","+nostats")
+    cmd = sarge.shell_format(
+        "dig {0} +dnssec dnskey +cmd +nocomments +question +noidentify +nostats",
+        zone)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd)
     return output
 
 
 def check_google_mx(domain):
     """
     https://support.google.com/a/topic/2716885?hl=en&ref_topic=2426592
     """
-    output = sh.dig(domain, "mx", "+short").rstrip()
+    cmd = sarge.shell_format("dig {0} mx +short", domain)
+    log.info('cmd', cmd=cmd)
+    output = sarge.capture_both(cmd).stdout.text.rstrip()
     log.debug(output)
     result = None
     check_domain = "aspmx.l.google.com."
@@ -85,7 +117,10 @@ def check_google_spf(domain):
     """
     https://support.google.com/a/answer/178723?hl=en
     """
-    output = sh.dig(domain, "txt", "+short").rstrip()
+    cmd = sarge.shell_format("dig {0} txt +short", domain)
+    log.info('cmd', cmd=cmd)
+    proc = sarge.capture_both(cmd)
+    output = proc.stdout.text.rstrip()
     log.debug(output)
     expected = u"v=spf1 include:_spf.google.com ~all"
     if output == expected:
@@ -100,23 +135,57 @@ def domain_tools(domain):
     """
     mainfunc
     """
-    print("## whois: %r" % domain)
-    print(whois(domain))
-
-    print("## dig: %r" % domain)
-    print(dig_all(domain))
-
-    print(dig_ns(domain))
-
-    print(dig_mx(domain))
-
-    print(dig_txt(domain))
-
-    print(dig_spf(domain))
-
-    print(dig_dnskey(domain.split(".")[-1])) # TODO: actual zone
-
-    return 0
+    returncode = 0
+    proc = whois(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_all(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_ns(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_mx(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_txt(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_spf(domain)
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    proc = dig_dnskey(domain.split(".")[-1])  # TODO: actual zone
+    returncode += proc.returncode
+    print(proc.stdout.text)
+    print('-')
+    stderr = proc.stderr.text; stderr and print(stderr)
+    print('--')
+
+    return returncode
 
 
 def google_domain_tools(domain):
@@ -175,14 +244,17 @@ def main(*args):
         import unittest
         sys.exit(unittest.main())
 
-    retcode = 0
-    retcode = domain_tools(domain)
+    returncode = 0
+    returncode += domain_tools(domain)
+    print("domain_tools: %d" % returncode)
 
     if opts.google_domain_tools:
         print("## google_domain_tools: %r" % domain)
-        retcode = retcode + google_domain_tools(domain)
+        returncode += google_domain_tools(domain)
+
+    print("google_domain_tools: %d" % returncode)
 
-    return retcode
+    return returncode
 
 
 if __name__ == "__main__":