From 6440ef204a11c64d88ced2c41cfa21c05a828a12 Mon Sep 17 00:00:00 2001
From: Kishi85 <git@eightyfive.net>
Date: Tue, 19 Mar 2019 12:07:42 +0100
Subject: [PATCH] dns.nsupdate: Fix TTL screen output and move TTL to generic
 dns module

---
 acertmgr/modes/dns/abstract.py |  1 +
 acertmgr/modes/dns/nsupdate.py | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/acertmgr/modes/dns/abstract.py b/acertmgr/modes/dns/abstract.py
index 37539e3..7a1cd05 100644
--- a/acertmgr/modes/dns/abstract.py
+++ b/acertmgr/modes/dns/abstract.py
@@ -24,6 +24,7 @@ class DNSChallengeHandler(AbstractChallengeHandler):
     def __init__(self, config):
         AbstractChallengeHandler.__init__(self, config)
         self.dns_updatedomain = config.get("dns_updatedomain")
+        self.dns_ttl = int(config.get("dns_ttl",60))
 
     def _determine_challenge_domain(self, domain):
         if self.dns_updatedomain:
diff --git a/acertmgr/modes/dns/nsupdate.py b/acertmgr/modes/dns/nsupdate.py
index cff4c5b..b30ed9f 100644
--- a/acertmgr/modes/dns/nsupdate.py
+++ b/acertmgr/modes/dns/nsupdate.py
@@ -124,7 +124,6 @@ class ChallengeHandler(DNSChallengeHandler):
             })
             self.keyalgorithm = config.get("nsupdate_keyalgorithm", DEFAULT_KEY_ALGORITHM)
         self.dns_server = config.get("nsupdate_server")
-        self.dns_ttl = int(config.get("nsupdate_ttl", "60"))
         self.dns_verify = config.get("nsupdate_verify", "true") == "true"
 
     def _determine_zone_and_nameserverip(self, domain):
@@ -142,7 +141,7 @@ class ChallengeHandler(DNSChallengeHandler):
         zone, nameserverip = self._determine_zone_and_nameserverip(domain)
         update = dns.update.Update(zone, keyring=self.keyring, keyalgorithm=self.keyalgorithm)
         update.add(domain, self.dns_ttl, dns.rdatatype.TXT, txtvalue)
-        print('Adding \'{} 60 IN TXT "{}"\' to {}'.format(domain, txtvalue, nameserverip))
+        print('Adding \'{} {} IN TXT "{}"\' to {}'.format(domain, self.dns_ttl, txtvalue, nameserverip))
         dns.query.tcp(update, nameserverip)
 
         verified = False
@@ -154,7 +153,8 @@ class ChallengeHandler(DNSChallengeHandler):
                 for answer in rrset:
                     if answer.to_text().strip('"') == txtvalue:
                         verified = True
-                        print('Verified \'{} 60 IN TXT "{}"\' on {}'.format(domain,
+                        print('Verified \'{} {} IN TXT "{}"\' on {}'.format(domain,
+                                                                            self.dns_ttl,
                                                                             txtvalue,
                                                                             nameserverip))
                         break
@@ -163,9 +163,11 @@ class ChallengeHandler(DNSChallengeHandler):
                 retry += 1
 
         if not self.dns_verify or verified:
+            # Return a valid time at twice the given TTL (to allow DNS to propagate)
             return datetime.datetime.now() + datetime.timedelta(seconds=2 * self.dns_ttl)
         else:
-            raise ValueError('Failed to verify \'{} 60 IN TXT "{}"\' on {}'.format(domain,
+            raise ValueError('Failed to verify \'{} {} IN TXT "{}"\' on {}'.format(domain,
+                                                                                   self.dns_ttl,
                                                                                    txtvalue,
                                                                                    nameserverip))