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 59dc218868ae86467b43afc4a51d8a1d2bc23f1d..baa80a1d047d85d1470f1dd10e375ab8069ad82c 100644 (file)
--- a/src/ddns/system.py
+++ b/src/ddns/system.py
@@ -57,13 +57,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 +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.
                """
-               try:
-                       response = self.send_request("http://checkip4.dns.lightningwirelabs.com", timeout=10)
+               return self._guess_external_ip_address("http://checkip6.dns.lightningwirelabs.com")
 
-               # 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 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 +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: