]> git.ipfire.org Git - oddments/ddns.git/blobdiff - src/ddns/system.py
Log HTTP header for status codes != 200
[oddments/ddns.git] / src / ddns / system.py
index afc5a5fbc0217deb62fb44cf42e78f2e1aeb4dcd..6b763335dca40730c4d890da3ab8718571ebae98 100644 (file)
@@ -47,6 +47,9 @@ class DDNSSystem(object):
                # Connection to the core of the program.
                self.core = core
 
+               # Address cache.
+               self.__addresses = {}
+
                # Find out on which distribution we are running.
                self.distro = self._get_distro_identifier()
                logger.debug(_("Running on distribution: %s") % self.distro)
@@ -61,11 +64,9 @@ class DDNSSystem(object):
 
                return proxy
 
-       def get_local_ipv6_address(self):
-               return # XXX TODO
-
-       def get_local_ipv4_address(self):
-               if self.distro == "ipfire-2":
+       def get_local_ip_address(self, proto):
+               # Legacy code for IPFire 2.
+               if self.distro == "ipfire-2" and proto == "ipv4":
                        try:
                                with open("/var/ipfire/red/local-ipaddress") as f:
                                        return f.readline()
@@ -77,7 +78,8 @@ class DDNSSystem(object):
 
                                raise
 
-               return # XXX TODO
+               # XXX TODO
+               raise NotImplementedError
 
        def _guess_external_ip_address(self, url, timeout=10):
                """
@@ -100,19 +102,15 @@ class DDNSSystem(object):
 
                return match.group(1)
 
-       def guess_external_ipv6_address(self):
-               """
-                       Sends a request to the internet to determine
-                       the public IPv6 address.
-               """
-               return self._guess_external_ip_address("http://checkip6.dns.lightningwirelabs.com")
+       def guess_external_ip_address(self, family, **kwargs):
+               if family == "ipv6":
+                       url = "http://checkip6.dns.lightningwirelabs.com"
+               elif family == "ipv4":
+                       url = "http://checkip4.dns.lightningwirelabs.com"
+               else:
+                       raise ValueError("unknown address family")
 
-       def guess_external_ipv4_address(self):
-               """
-                       Sends a request to the internet to determine
-                       the public IPv4 address.
-               """
-               return self._guess_external_ip_address("http://checkip4.dns.lightningwirelabs.com")
+               return self._guess_external_ip_address(url, **kwargs)
 
        def send_request(self, url, method="GET", data=None, username=None, password=None, timeout=30):
                assert method in ("GET", "POST")
@@ -168,9 +166,27 @@ class DDNSSystem(object):
                        return resp
 
                except urllib2.HTTPError, e:
+                       # Log response header.
+                       logger.debug(_("Response header (Status Code %s):") % e.code)
+                       for k, v in e.hdrs.items():
+                               logger.debug("  %s: %s" % (k, v))
+
+                       # 400 - Bad request
+                       if e.code == 400:
+                               raise DDNSRequestError(e.reason)
+
+                       # 401 - Authorization Required
+                       # 403 - Forbidden
+                       elif e.code in (401, 403):
+                               raise DDNSAuthenticationError(e.reason)
+
+                       # 500 - Internal Server Error
+                       elif e.code == 500:
+                               raise DDNSInternalServerError(e.reason)
+
                        # 503 - Service Unavailable
-                       if e.code == 503:
-                               raise DDNSServiceUnavailableError
+                       elif e.code == 503:
+                               raise DDNSServiceUnavailableError(e.reason)
 
                        # Raise all other unhandled exceptions.
                        raise
@@ -180,6 +196,8 @@ class DDNSSystem(object):
                                # Network Unreachable (e.g. no IPv6 access)
                                if e.reason.errno == 101:
                                        raise DDNSNetworkUnreachableError
+
+                               # Connection Refused
                                elif e.reason.errno == 111:
                                        raise DDNSConnectionRefusedError
 
@@ -212,6 +230,21 @@ class DDNSSystem(object):
                return authstring
 
        def get_address(self, proto):
+               """
+                       Returns the current IP address for
+                       the given IP protocol.
+               """
+               try:
+                       return self.__addresses[proto]
+
+               # IP is currently unknown and needs to be retrieved.
+               except KeyError:
+                       self.__addresses[proto] = address = \
+                               self._get_address(proto)
+
+                       return address
+
+       def _get_address(self, proto):
                assert proto in ("ipv6", "ipv4")
 
                # IPFire 2 does not support IPv6.
@@ -221,22 +254,52 @@ class DDNSSystem(object):
                # Check if the external IP address should be guessed from
                # a remote server.
                guess_ip = self.core.settings.get("guess_external_ip", "true")
+               guess_ip = guess_ip in ("true", "yes", "1")
 
-               # If the external IP address should be used, we just do
-               # that.
-               if guess_ip in ("true", "yes", "1"):
-                       if proto == "ipv6":
-                               return self.guess_external_ipv6_address()
+               # If the external IP address should be used, we just do that.
+               if guess_ip:
+                       return self.guess_external_ip_address(proto)
 
-                       elif proto == "ipv4":
-                               return self.guess_external_ipv4_address()
+               # Get the local IP address.
+               local_ip_address = self.get_local_ip_address(proto)
 
-               # Get the local IP addresses.
-               else:
-                       if proto == "ipv6":
-                               return self.get_local_ipv6_address()
-                       elif proto == "ipv4":
-                               return self.get_local_ipv4_address()
+               # If the local IP address is not usable, we must guess
+               # the correct IP address...
+               if not self._is_usable_ip_address(proto, local_ip_address):
+                       local_ip_address = self.guess_external_ip_address(proto)
+
+               return local_ip_address
+
+       def _is_usable_ip_address(self, proto, address):
+               """
+                       Returns True is the local IP address is usable
+                       for dynamic DNS (i.e. is not a RFC1918 address or similar).
+               """
+               if proto == "ipv4":
+                       # This is not the most perfect solution to match
+                       # these addresses, but instead of pulling in an entire
+                       # library to handle the IP addresses better, we match
+                       # with regular expressions instead.
+                       matches = (
+                               # RFC1918 address space
+                               r"^10\.\d+\.\d+\.\d+$",
+                               r"^192\.168\.\d+\.\d+$",
+                               r"^172\.(1[6-9]|2[0-9]|31)\.\d+\.\d+$",
+
+                               # Dual Stack Lite address space
+                               r"^100\.(6[4-9]|[7-9][0-9]|1[01][0-9]|12[0-7])\.\d+\.\d+$",
+                       )
+
+                       for match in matches:
+                               m = re.match(match, address)
+                               if m is None:
+                                       continue
+
+                               # Found a match. IP address is not usable.
+                               return False
+
+               # In all other cases, return OK.
+               return True
 
        def resolve(self, hostname, proto=None):
                addresses = []