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

diff --combined src/ddns/providers.py
index c831b440256ca4c6189abcc341c7d2d34e83c49a,7dca932a5450bae8761b1ac0c6795f4fc4da02a5..9eea16de606641580f6484b7f61d94dbbe90d324
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -115,13 -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)
@@@ -265,6 -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"),
@@@ -321,15 -315,20 +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()
@@@ -356,45 -355,6 +361,45 @@@
                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",
@@@ -407,6 -367,13 +412,6 @@@
        # 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,
@@@ -458,7 -425,7 +463,7 @@@
                raise DDNSUpdateError
  
  
- class DDNSProviderNOIP(DDNSProvider):
+ class DDNSProviderNOIP(DDNSProviderDynDNS):
        INFO = {
                "handle"    : "no-ip.com",
                "name"      : "No-IP",
@@@ -470,39 -437,15 +475,15 @@@
        # 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,45 -470,3 +508,45 @@@
                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)
 +              }