Figure out on which distribution we are running.

[oddments/ddns.git] / src / ddns / system.py

diff --git a/src/ddns/system.py b/src/ddns/system.py
index 59dc218868ae86467b43afc4a51d8a1d2bc23f1d..af452622ebaa9b43b6e95fbbb39e8691115a90bb 100644 (file)
--- a/src/ddns/system.py
+++ b/src/ddns/system.py
@@ -47,6 +47,10 @@ class DDNSSystem(object):
                # Connection to the core of the program.
                self.core = core
 
+               # Find out on which distribution we are running.
+               self.distro = self._get_distro_identifier()
+               logger.debug(_("Running on distribution: %s") % self.distro)
+
        @property
        def proxy(self):
                proxy = self.core.settings.get("proxy")
@@ -57,13 +61,13 @@ class DDNSSystem(object):
 
                return proxy
 
-       def guess_external_ipv6_address(self):
+       def _guess_external_ip_address(self, url, timeout=10):
                """
                        Sends a request to an external web server
                        to determine the current default IP address.
                """
                try:
-                       response = self.send_request("http://checkip6.dns.lightningwirelabs.com", timeout=10)
+                       response = self.send_request(url, timeout=timeout)
 
                # If the server could not be reached, we will return nothing.
                except DDNSNetworkError:
@@ -78,26 +82,19 @@ class DDNSSystem(object):
 
                return match.group(1)
 
-       def guess_external_ipv4_address(self):
+       def guess_external_ipv6_address(self):
                """
                        Sends a request to the internet to determine
-                       the public IP address.
-
-                       XXX does not work for IPv6.
+                       the public IPv6 address.
                """
-               try:
-                       response = self.send_request("http://checkip4.dns.lightningwirelabs.com", timeout=10)
-
-               # If the server could not be reached, we will return nothing.
-               except DDNSNetworkError:
-                       return
-
-               if response.code == 200:
-                       match = re.search(r"Your IP address is: (\d+.\d+.\d+.\d+)", response.read())
-                       if match is None:
-                               return
+               return self._guess_external_ip_address("http://checkip6.dns.lightningwirelabs.com")
 
-                       return match.group(1)
+       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")
 
        def send_request(self, url, method="GET", data=None, username=None, password=None, timeout=30):
                assert method in ("GET", "POST")
@@ -107,7 +104,10 @@ class DDNSSystem(object):
                        query_args = self._format_query_args(data)
                        data = None
 
-                       url = "%s?%s" % (url, query_args)
+                       if "?" in url:
+                               url = "%s&%s" % (url, query_args)
+                       else:
+                               url = "%s?%s" % (url, query_args)
 
                logger.debug("Sending request (%s): %s" % (method, url))
                if data:
@@ -117,7 +117,6 @@ class DDNSSystem(object):
 
                if username and password:
                        basic_auth_header = self._make_basic_auth_header(username, password)
-                       print repr(basic_auth_header)
                        req.add_header("Authorization", "Basic %s" % basic_auth_header)
 
                # Set the user agent.
@@ -233,6 +232,10 @@ class DDNSSystem(object):
                        if e.errno == -2:
                                return []
 
+                       # No record for requested family available (e.g. no AAAA)
+                       elif e.errno == -5:
+                               return []
+
                        raise
 
                # Handle responses.
@@ -258,3 +261,73 @@ class DDNSSystem(object):
                                addresses.append(address)
 
                return addresses
+
+       def _get_distro_identifier(self):
+               """
+                       Returns a unique identifier for the distribution
+                       we are running on.
+               """
+               os_release = self.__parse_os_release()
+               if os_release:
+                       return os_release
+
+               system_release = self.__parse_system_release()
+               if system_release:
+                       return system_release
+
+               # If nothing else could be found, we return
+               # just "unknown".
+               return "unknown"
+
+       def __parse_os_release(self):
+               """
+                       Tries to parse /etc/os-release and
+                       returns a unique distribution identifier
+                       if the file exists.
+               """
+               try:
+                       f = open("/etc/os-release", "r")
+               except IOError, e:
+                       # File not found
+                       if e.errno == 2:
+                               return
+
+                       raise
+
+               os_release = {}
+               with f:
+                       for line in f.readlines():
+                               m = re.match(r"^([A-Z\_]+)=(.*)$", line)
+                               if m is None:
+                                       continue
+
+                               os_release[m.group(1)] = m.group(2)
+
+               try:
+                       return "%(ID)s-%(VERSION_ID)s" % os_release
+               except KeyError:
+                       return
+
+       def __parse_system_release(self):
+               """
+                       Tries to parse /etc/system-release and
+                       returns a unique distribution identifier
+                       if the file exists.
+               """
+               try:
+                       f = open("/etc/system-release", "r")
+               except IOError, e:
+                       # File not found
+                       if e.errno == 2:
+                               return
+
+                       raise
+
+               with f:
+                       # Read first line
+                       line = f.readline()
+
+                       # Check for IPFire systems
+                       m = re.match(r"^IPFire (\d).(\d+)", line)
+                       if m:
+                               return "ipfire-%s" % m.group(1)