Auto-replace double question marks in request url.

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

diff --git a/src/ddns/system.py b/src/ddns/system.py
index a071e489f1e5850367e150eb52135a8002770ef3..baa80a1d047d85d1470f1dd10e375ab8069ad82c 100644 (file)
--- a/src/ddns/system.py
+++ b/src/ddns/system.py
@@ -26,6 +26,7 @@ import urllib
 import urllib2
 
 from __version__ import CLIENT_VERSION
+from .errors import *
 from i18n import _
 
 # Initialize the logger.
@@ -56,12 +57,17 @@ 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.
                """
-               response = self.send_request("http://checkip6.dns.lightningwirelabs.com")
+               try:
+                       response = self.send_request(url, timeout=timeout)
+
+               # If the server could not be reached, we will return nothing.
+               except DDNSNetworkError:
+                       return
 
                if not response.code == 200:
                        return
@@ -72,21 +78,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.
                """
-               response = self.send_request("http://checkip4.dns.lightningwirelabs.com")
-
-               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")
@@ -96,7 +100,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:
@@ -129,7 +136,7 @@ class DDNSSystem(object):
                        logger.debug("  %s: %s" % (k, v))
 
                try:
-                       resp = urllib2.urlopen(req)
+                       resp = urllib2.urlopen(req, timeout=timeout)
 
                        # Log response header.
                        logger.debug(_("Response header:"))
@@ -139,9 +146,30 @@ class DDNSSystem(object):
                        # Return the entire response object.
                        return resp
 
+               except urllib2.HTTPError, e:
+                       # 503 - Service Unavailable
+                       if e.code == 503:
+                               raise DDNSServiceUnavailableError
+
+                       # Raise all other unhandled exceptions.
+                       raise
+
                except urllib2.URLError, e:
+                       if e.reason:
+                               # Network Unreachable (e.g. no IPv6 access)
+                               if e.reason.errno == 101:
+                                       raise DDNSNetworkUnreachableError
+                               elif e.reason.errno == 111:
+                                       raise DDNSConnectionRefusedError
+
+                       # Raise all other unhandled exceptions.
                        raise
 
+               except socket.timeout, e:
+                       logger.debug(_("Connection timeout"))
+
+                       raise DDNSConnectionTimeoutError
+
        def _format_query_args(self, data):
                args = []
 
@@ -194,7 +222,14 @@ class DDNSSystem(object):
                        raise ValueError("Protocol not supported: %s" % proto)
 
                # Resolve the host address.
-               response = socket.getaddrinfo(hostname, None, family)
+               try:
+                       response = socket.getaddrinfo(hostname, None, family)
+               except socket.gaierror, e:
+                       # Name or service not known
+                       if e.errno == -2:
+                               return []
+
+                       raise
 
                # Handle responses.
                for family, socktype, proto, canonname, sockaddr in response: