Merge remote-tracking branch 'stevee/no-ip'

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

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 919642fb0022d4dedb90458d0022835f44e1f198..9eea16de606641580f6484b7f61d94dbbe90d324 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -321,15 +321,20 @@ class DDNSProviderDynDNS(DDNSProvider):
        # http://dyn.com/support/developers/api/return-codes/
        url = "https://members.dyndns.org/nic/update"
 
-       def update(self):
+       def _prepare_request_data(self):
                data = {
                        "hostname" : self.hostname,
                        "myip"     : self.get_address("ipv4"),
                }
 
+               return data
+
+       def update(self):
+               data = self._prepare_request_data()
+
                # Send update to the server.
-               response = self.send_request(self.url, username=self.username, password=self.password,
-                       data=data)
+               response = self.send_request(self.url, data=data,
+                       username=self.username, password=self.password)
 
                # Get the full response message.
                output = response.read()
@@ -458,7 +463,7 @@ class DDNSProviderLightningWireLabs(DDNSProvider):
                raise DDNSUpdateError
 
 
-class DDNSProviderNOIP(DDNSProvider):
+class DDNSProviderNOIP(DDNSProviderDynDNS):
        INFO = {
                "handle"    : "no-ip.com",
                "name"      : "No-IP",
@@ -470,39 +475,15 @@ class DDNSProviderNOIP(DDNSProvider):
        # here: http://www.no-ip.com/integrate/request and
        # here: http://www.no-ip.com/integrate/response
 
-       url = "http://%(username)s:%(password)s@dynupdate.no-ip.com/nic/update"
-
-       def update(self):
-               url = self.url % {
-                       "username" : self.username,
-                       "password" : self.password,
-               }
+       url = "http://dynupdate.no-ip.com/nic/update"
 
+       def _prepare_request_data(self):
                data = {
                        "hostname" : self.hostname,
                        "address"  : self.get_address("ipv4"),
                }
 
-               # Send update to the server.
-               response = self.send_request(url, data=data)
-
-               # Get the full response message.
-               output = response.read()
-
-               # Handle success messages.
-               if output.startswith("good") or output.startswith("nochg"):
-                       return
-
-               # Handle error codes.
-               if output == "badauth":
-                       raise DDNSAuthenticationError
-               elif output == "aduse":
-                       raise DDNSAbuseError
-               elif output == "911":
-                       raise DDNSInternalServerError
-
-               # If we got here, some other update error happened.
-               raise DDNSUpdateError
+               return data
 
 
 class DDNSProviderSelfhost(DDNSProvider):
@@ -527,3 +508,45 @@ class DDNSProviderSelfhost(DDNSProvider):
                match = re.search("status=20(0|4)", response.read())
                if not match:
                        raise DDNSUpdateError
+
+
+class DDNSProviderSPDNS(DDNSProviderDynDNS):
+       INFO = {
+               "handle"    : "spdns.org",
+               "name"      : "SPDNS",
+               "website"   : "http://spdns.org/",
+               "protocols" : ["ipv4",]
+       }
+
+       # Detailed information about request and response codes are provided
+       # by the vendor. They are using almost the same mechanism and status
+       # codes as dyndns.org so we can inherit all those stuff.
+       #
+       # http://wiki.securepoint.de/index.php/SPDNS_FAQ
+       # http://wiki.securepoint.de/index.php/SPDNS_Update-Tokens
+
+       url = "https://update.spdns.de/nic/update"
+
+
+class DDNSProviderVariomedia(DDNSProviderDynDNS):
+       INFO = {
+               "handle"   : "variomedia.de",
+               "name"     : "Variomedia",
+               "website"  : "http://www.variomedia.de/",
+               "protocols" : ["ipv6", "ipv4",]
+       }
+
+       # Detailed information about the request can be found here
+       # https://dyndns.variomedia.de/
+
+       url = "https://dyndns.variomedia.de/nic/update"
+
+       @property
+       def proto(self):
+               return self.get("proto")
+
+       def _prepare_request_data(self):
+               data = {
+                       "hostname" : self.hostname,
+                       "myip"     : self.get_address(self.proto)
+               }