Merge branch 'master' into dyn2

lemur/plugins/lemur_acme/dyn.py

@@ -5,11 +5,10 @@ import dns.exception
 import dns.name
 import dns.query
 import dns.resolver
-from dyn.tm.errors import DynectCreateError
+from dyn.tm.errors import DynectGetError
 from dyn.tm.session import DynectSession
-from dyn.tm.zones import Node, Zone
+from dyn.tm.zones import Node, Zone, get_all_zones
 from flask import current_app
-from tld import get_tld
 
 
 def get_dynect_session():
@@ -42,28 +41,55 @@ def _has_dns_propagated(name, token):
 
 def wait_for_dns_change(change_id, account_number=None):
     fqdn, token = change_id
-    while True:
+    number_of_attempts = 10
+    for attempts in range(0, number_of_attempts):
         status = _has_dns_propagated(fqdn, token)
         current_app.logger.debug("Record status for fqdn: {}: {}".format(fqdn, status))
         if status:
             break
         time.sleep(20)
+    if not status:
+        raise Exception("Unable to query DNS token for fqdn {}.".format(fqdn))
     return
 
 
+def get_zone_name(domain):
+    zones = get_all_zones()
+
+    zone_name = ""
+
+    for z in zones:
+        if domain.endswith(z.name):
+            # Find the most specific zone possible for the domain
+            # Ex: If fqdn is a.b.c.com, there is a zone for c.com,
+            # and a zone for b.c.com, we want to use b.c.com.
+            if z.name.count(".") > zone_name.count("."):
+                zone_name = z.name
+    if not zone_name:
+        raise Exception("No Dyn zone found for domain: {}".format(domain))
+    return zone_name
+
+
 def create_txt_record(domain, token, account_number):
     get_dynect_session()
-    zone_name = get_tld('http://' + domain)
+    zone_name = get_zone_name(domain)
     zone_parts = len(zone_name.split('.'))
     node_name = '.'.join(domain.split('.')[:-zone_parts])
     fqdn = "{0}.{1}".format(node_name, zone_name)
     zone = Zone(zone_name)
     try:
+        # Delete all stale ACME TXT records
+        delete_acme_txt_records(domain)
+    except DynectGetError as e:
+        if (
+                "No such zone." in e.message or
+                "Host is not in this zone" in e.message or
+                "Host not found in this zone" in e.message
+        ):
+            current_app.logger.debug("Unable to delete ACME TXT records. They probably don't exist yet: {}".format(e))
+        else:
+            raise
     zone.add_record(node_name, record_type='TXT', txtdata="\"{}\"".format(token), ttl=5)
-    except DynectCreateError:
-        delete_txt_record(None, None, domain, token)
-        zone.add_record(node_name, record_type='TXT', txtdata="\"{}\"".format(token), ttl=5)
-    node = zone.get_node(node_name)
     zone.publish()
     current_app.logger.debug("TXT record created: {0}".format(fqdn))
     change_id = (fqdn, token)
@@ -76,7 +102,7 @@ def delete_txt_record(change_id, account_number, domain, token):
         current_app.logger.debug("delete_txt_record: No domain passed")
         return
 
-    zone_name = get_tld('http://' + domain)
+    zone_name = get_zone_name(domain)
     zone_parts = len(zone_name.split('.'))
     node_name = '.'.join(domain.split('.')[:-zone_parts])
     fqdn = "{0}.{1}".format(node_name, zone_name)
@@ -92,7 +118,35 @@ def delete_txt_record(change_id, account_number, domain, token):
     zone.publish()
 
 
+def delete_acme_txt_records(domain):
+    get_dynect_session()
+    if not domain:
+        current_app.logger.debug("delete_acme_txt_records: No domain passed")
+        return
+    acme_challenge_string = "_acme-challenge"
+    if not domain.startswith(acme_challenge_string):
+        current_app.logger.debug(
+            "delete_acme_txt_records: Domain {} doesn't start with string {}. "
+            "Cowardly refusing to delete TXT records".format(domain, acme_challenge_string))
+        return
+
+    zone_name = get_zone_name(domain)
+    zone_parts = len(zone_name.split('.'))
+    node_name = '.'.join(domain.split('.')[:-zone_parts])
+    fqdn = "{0}.{1}".format(node_name, zone_name)
+
+    zone = Zone(zone_name)
+    node = Node(zone_name, fqdn)
+
+    all_txt_records = node.get_all_records_by_type('TXT')
+    for txt_record in all_txt_records:
+        current_app.logger.debug("Deleting TXT record name: {0}".format(fqdn))
+        txt_record.delete()
+    zone.publish()
+
+
 def get_authoritative_nameserver(domain):
+    if current_app.config.get('ACME_DYN_GET_AUTHORATATIVE_NAMESERVER'):
         n = dns.name.from_text(domain)
 
         depth = 2
@@ -129,3 +183,5 @@ def get_authoritative_nameserver(domain):
             depth += 1
 
         return nameserver
+    else:
+        return "8.8.8.8"

requirements-docs.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --no-index --output-file requirements-docs.txt requirements-docs.in
 #
-acme==0.25.0
+acme==0.25.1
 alabaster==0.7.10         # via sphinx
 alembic-autogenerate-enums==0.0.2
 alembic==0.9.9
@@ -15,8 +15,8 @@ asyncpool==1.0
 babel==2.6.0              # via sphinx
 bcrypt==3.1.4
 blinker==1.4
-boto3==1.7.36
-botocore==1.10.36
+boto3==1.7.37
+botocore==1.10.37
 certifi==2018.4.16
 cffi==1.11.5
 click==6.7
@@ -84,6 +84,5 @@ sphinxcontrib-websupport==1.1.0  # via sphinx
 sqlalchemy-utils==0.33.3
 sqlalchemy==1.2.8
 tabulate==0.8.2
-tld==0.7.10
 werkzeug==0.14.1
 xmltodict==0.11.0

requirements.in

@@ -39,5 +39,4 @@ retrying
 six
 SQLAlchemy-Utils
 tabulate
-tld
 xmltodict

requirements.txt

@@ -74,6 +74,5 @@ six==1.11.0
 sqlalchemy-utils==0.33.3
 sqlalchemy==1.2.8         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
 tabulate==0.8.2
-tld==0.9
 werkzeug==0.14.1          # via flask
 xmltodict==0.11.0