From be7736d350e57d0f0630fe957a30bc0c90a8daa0 Mon Sep 17 00:00:00 2001
From: csine-nflx <csine@netflix.com>
Date: Fri, 31 Jan 2020 13:16:37 -0800
Subject: [PATCH] adding dns tests and assorted exception handling

---
 lemur/acme_providers/cli.py          |  8 ++++----
 lemur/dns_providers/util.py          |  6 +-----
 lemur/plugins/lemur_acme/powerdns.py | 14 +++++++-------
 lemur/tests/test_dns_providers.py    | 13 +++++++++++++
 4 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 lemur/tests/test_dns_providers.py

diff --git a/lemur/acme_providers/cli.py b/lemur/acme_providers/cli.py
index fcf426fa..a7510d36 100644
--- a/lemur/acme_providers/cli.py
+++ b/lemur/acme_providers/cli.py
@@ -10,7 +10,7 @@ from lemur.constants import SUCCESS_METRIC_STATUS
 from lemur.plugins.lemur_acme.plugin import AcmeHandler
 
 manager = Manager(
-    usage="This provides ability to test ACME issuance"
+    usage="Handles all ACME related tasks"
 )
 
 
@@ -30,7 +30,7 @@ manager = Manager(
 )
 def dnstest(domain, token):
     """
-    Attempts to create, verify, and delete DNS TXT records with an autodetected provider.
+    Create, verify, and delete DNS TXT records using an autodetected provider.
     """
     print("[+] Starting ACME Tests.")
     change_id = (domain, token)
@@ -53,7 +53,7 @@ def dnstest(domain, token):
         change_id = dns_provider_plugin.create_txt_record(domain, token, account_number)
 
     print("[+] Verifying TXT Record has propagated to DNS.")
-    print("[+] Waiting 60 second before continuing...")
+    print("[+] This step could take a while...")
     time.sleep(10)
 
     # Verify TXT Records
@@ -64,7 +64,7 @@ def dnstest(domain, token):
 
         try:
             dns_provider_plugin.wait_for_dns_change(change_id, account_number)
-            print(f"[+] Verfied TXT Record in `{dns_provider.name}` provider")
+            print(f"[+] Verified TXT Record in `{dns_provider.name}` provider")
         except Exception:
             metrics.send("complete_dns_challenge_error", "counter", 1)
             sentry.captureException()
diff --git a/lemur/dns_providers/util.py b/lemur/dns_providers/util.py
index 6534f6eb..9154cb92 100644
--- a/lemur/dns_providers/util.py
+++ b/lemur/dns_providers/util.py
@@ -6,8 +6,7 @@ import dns.query
 import dns.resolver
 import re
 
-from flask import current_app
-from lemur.extensions import metrics, sentry
+from lemur.extensions import metrics
 
 
 class DNSError(Exception):
@@ -86,9 +85,6 @@ def get_authoritative_nameserver(domain):
 
 def get_dns_records(domain, rdtype, nameserver):
     """Retrieves the DNS records matching the name and type and returns a list of records"""
-    # if not nameserver:
-    #     nameserver = get_authoritative_nameserver(domain)[0]
-
     records = []
     try:
         dns_resolver = dns.resolver.Resolver()
diff --git a/lemur/plugins/lemur_acme/powerdns.py b/lemur/plugins/lemur_acme/powerdns.py
index 1efe0752..e30d7ca6 100644
--- a/lemur/plugins/lemur_acme/powerdns.py
+++ b/lemur/plugins/lemur_acme/powerdns.py
@@ -67,20 +67,20 @@ def get_zones(account_number):
             "message": "Retrieved Zones Successfully"
         }
         current_app.logger.debug(log_data)
+        for record in records:
+            zone = Zone(record)
+            if zone.kind == 'Master':
+                zones.append(zone.name)
+        return zones
+
     except Exception as e:
-        records = _get(path)
         function = sys._getframe().f_code.co_name
         log_data = {
             "function": function,
             "message": "Failed to Retrieve Zone Data"
         }
         current_app.logger.debug(log_data)
-
-    for record in records:
-        zone = Zone(record)
-        if zone.kind == 'Master':
-            zones.append(zone.name)
-    return zones
+        raise
 
 
 def create_txt_record(domain, token, account_number):
diff --git a/lemur/tests/test_dns_providers.py b/lemur/tests/test_dns_providers.py
new file mode 100644
index 00000000..42a86cca
--- /dev/null
+++ b/lemur/tests/test_dns_providers.py
@@ -0,0 +1,13 @@
+import unittest
+from mock import Mock, patch
+from lemur.dns_providers import util as dnsutil
+
+
+class TestDNSProvider(unittest.TestCase):
+    def test_is_valid_domain(self):
+        self.assertTrue(dnsutil.is_valid_domain("example.com"))
+        self.assertTrue(dnsutil.is_valid_domain("foo.bar.org"))
+        self.assertTrue(dnsutil.is_valid_domain("_acme-chall.example.com"))
+        self.assertFalse(dnsutil.is_valid_domain("e/xample.com"))
+        self.assertFalse(dnsutil.is_valid_domain("exam\ple.com"))
+        self.assertFalse(dnsutil.is_valid_domain("*.example.com"))