Merge remote-tracking branch 'stevee/spdns.org'

diff --git a/ddns.conf.sample b/ddns.conf.sample
index f9058e6f7faaf7f3c45d9983f714c38bec7fc083..3704b6e3e5fc56641bd62ee0eae2c5e47370213c 100644 (file)
--- a/ddns.conf.sample
+++ b/ddns.conf.sample
@@ -34,6 +34,11 @@
 # username = user
 # password = pass
 
+# [test.freedns.afraid.org]
+# provider = freedns.afraid.org
+# token = token
+# proto = ipv4 OR ipv6
+
 # [test.no-ip.org]
 # provider = no-ip.com
 # username = user

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index d8b2b107770c83430672c82d1aedfc6a3f7fa441..ddc995e97609df89c9cb2a4344585b5cffa5025e 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -95,6 +95,7 @@ class DDNSCore(object):
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
                        DDNSProviderDynDNS,
+                       DDNSProviderFreeDNSAfraidOrg,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderSelfhost,

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 68305c768075cd4e1bf41a90a89e04f51171c5da..3422cd074cd45f501f7d72aa3ab776cd84df1f1e 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -115,6 +115,13 @@ class DDNSProvider(object):
        def protocols(self):
                return self.INFO.get("protocols")
 
+       @property
+       def token(self):
+               """
+                       Fast access to the token.
+               """
+               return self.get("token")
+
        def __call__(self, force=False):
                if force:
                        logger.info(_("Updating %s forced") % self.hostname)
@@ -258,7 +265,6 @@ class DDNSProviderDtDNS(DDNSProvider):
        # http://www.dtdns.com/dtsite/updatespec
        url = "https://www.dtdns.com/api/autodns.cfm"
 
-
        def update(self):
                data = {
                        "ip" : self.get_address("ipv4"),
@@ -350,6 +356,45 @@ class DDNSProviderDynDNS(DDNSProvider):
                raise DDNSUpdateError
 
 
+class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
+       INFO = {
+               "handle"    : "freedns.afraid.org",
+               "name"      : "freedns.afraid.org",
+               "website"   : "http://freedns.afraid.org/",
+               "protocols" : ["ipv6", "ipv4",]
+               }
+
+       # No information about the request or response could be found on the vendor
+       # page. All used values have been collected by testing.
+       url = "https://freedns.afraid.org/dynamic/update.php"
+
+       @property
+       def proto(self):
+               return self.get("proto")
+
+       def update(self):
+               address = self.get_address(self.proto)
+
+               data = {
+                       "address" : address,
+               }
+
+               # Add auth token to the update url.
+               url = "%s?%s" % (self.url, self.token)
+
+               # Send update to the server.
+               response = self.send_request(url, data=data)
+
+               if output.startswith("Updated") or "has not changed" in output:
+                       return
+
+               # Handle error codes.
+               if output == "ERROR: Unable to locate this record":
+                       raise DDNSAuthenticationError
+               elif "is an invalid IP address" in output:
+                       raise DDNSRequestError(_("Invalid IP address has been sent."))
+
+
 class DDNSProviderLightningWireLabs(DDNSProvider):
        INFO = {
                "handle"    : "dns.lightningwirelabs.com",
@@ -362,13 +407,6 @@ class DDNSProviderLightningWireLabs(DDNSProvider):
        # https://dns.lightningwirelabs.com/knowledge-base/api/ddns
        url = "https://dns.lightningwirelabs.com/update"
 
-       @property
-       def token(self):
-               """
-                       Fast access to the token.
-               """
-               return self.get("token")
-
        def update(self):
                data =  {
                        "hostname" : self.hostname,

diff --git a/src/ddns/system.py b/src/ddns/system.py
index 08df26593a1f7d8db11c1a0e419ec693139fcde3..baa80a1d047d85d1470f1dd10e375ab8069ad82c 100644 (file)
--- a/src/ddns/system.py
+++ b/src/ddns/system.py
@@ -100,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: