Now errors in blockip related subcommands are ignored.

[toast/tdyndns.git] / bin / tdyndns_update

diff --git a/bin/tdyndns_update b/bin/tdyndns_update
index 272a610893a063365ca0455811dbfc13843f3141..8806c8af6fe92e789d1f21c6bd3b45ad94c3ae22 100755 (executable)
--- a/bin/tdyndns_update
+++ b/bin/tdyndns_update
@@ -29,7 +29,7 @@ def forward_lookup(fqdn, ip_family):
        zonename = os.path.basename(filename)
        zone = dns.zone.from_file(filename, zonename, relativize=False)
        for name, ttl, rdata in zone.iterate_rdatas(ip_family):
-               if name[:-1] == fqdn:  # [:-1] removes trailing dot
+               if str(name)[:-1] == fqdn:  # [:-1] removes trailing dot
                        return ipaddr.IPAddress(rdata.address)
 
 
@@ -49,7 +49,7 @@ def nsupdate_add(fqdn, ttl, ip):
        """
        :param fqdn: Fully qualified domain name
        :param ip_family: A or AAAA
-       :raises an NsupdateError in case of errors."""
+       :raises an CalledProcessError in case of errors."""
        command = "update add {fqdn} {ttl} IN {ip_family} {ip}\n\n".format(fqdn=fqdn, ttl=ttl, ip_family=ipfamily_by_ip(ip), ip=ip)
        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
@@ -60,7 +60,7 @@ def nsupdate_delete(fqdn, ip_family):
        """
        :param fqdn: Fully qualified domain name
        :param ip_family: A or AAAA
-       :raises an NsupdateError in case of errors."""
+       :raises an CalledProcessError in case of errors."""
        command = "update delete {fqdn} {ip_family}\n\n".format(fqdn=fqdn, ip_family=ip_family)
        p = Popen(['nsupdate', '-l'], stdin=PIPE)
        p.communicate(command)
@@ -71,26 +71,21 @@ def nsupdate_delete(fqdn, ip_family):
 def blockip_whitelist_add(ip):
        """
        :param ip: ipv4 address
-       :raises a BlockipError in case of errors."""
+       """
        if ipfamily_by_ip(ip) == 'A':
                command = ['iptables', '-I', 'blockip', '-s', str(ip), '-j', 'ACCEPT']
-               check_call(command)
+               p = Popen(command, stderr=PIPE)
+               stdout, stderr = p.communicate()
 
 
 def blockip_whitelist_delete(ip):
        """
        :param ip: ipv4 address
-       :raises a BlockipError in case of errors."""
+       """
        if ipfamily_by_ip(ip) == 'A':
                command = ['iptables', '-D', 'blockip', '-s', str(ip), '-j', 'ACCEPT']
-               check_call(command)
-
-
-def blockip_whitelist_delete_if_unused(ip):
-       if ipfamily_by_ip(args.ip) == 'A':
-               sync_dynamic_zones()
-               if len(list(reverse_lookup(ip))) == 0:
-                       blockip_whitelist_delete(ip)
+               p = Popen(command, stderr=PIPE)
+               stdout, stderr = p.communicate()
 
 
 def main(args):
@@ -100,16 +95,22 @@ def main(args):
                                nsupdate_delete(args.fqdn, 'A')
                                nsupdate_delete(args.fqdn, 'AAAA')
                        else:
+                               ipfamily = ipfamily_by_ip(args.ip)
+                               sync_dynamic_zones()
+                               old_ip = forward_lookup(args.fqdn, ipfamily)
                                nsupdate_delete(args.fqdn, ipfamily_by_ip(args.ip))
-                               blockip_whitelist_delete_if_unused(args.ip)
+                               if old_ip is not None:
+                                       blockip_whitelist_delete(old_ip)
                else:
                        ipfamily = ipfamily_by_ip(args.ip)
+                       sync_dynamic_zones()
                        old_ip = forward_lookup(args.fqdn, ipfamily)
                        nsupdate_delete(args.fqdn, ipfamily)
-                       if old_ip is not None:
-                               blockip_whitelist_delete_if_unused(old_ip)
                        nsupdate_add(args.fqdn, args.ttl, args.ip)
-                       blockip_whitelist_add(args.ip)
+                       if old_ip != args.ip:
+                               if old_ip is not None:
+                                       blockip_whitelist_delete(old_ip)
+                               blockip_whitelist_add(args.ip)
        except CalledProcessError as e:
                sys.exit(e.returncode)