Merge remote-tracking branch 'stevee/regfish'

diff --combined ddns.conf.sample
index 654d077d9a7fd8f3a0418c56ff515a7bc49c949f,610afa7905de48ff27c7f7a9c4dc948ed09dc108..1665cb951ecd313686a5021369c63589523ddf0e
--- 1/ddns.conf.sample
--- 2/ddns.conf.sample
+++ b/ddns.conf.sample
@@@ -34,11 -34,6 +34,11 @@@
  # username = user
  # password = pass
  
 +# [test.easydns.com]
 +# provider = easydns.com
 +# username = user
 +# password = pass
 +
  # [test.freedns.afraid.org]
  # provider = freedns.afraid.org
  # token = token
@@@ -54,6 -49,14 +54,14 @@@
  # username = user
  # password = pass
  
+ # [test.regfish.com]
+ # provider = regfish.com
+ 
+ # Only use one of these two auth options.
+ # token = token
+ # username = user
+ # password = pass
+ 
  # [test.selfhost.de]
  # provider = selfhost.de
  # username = user

diff --combined src/ddns/__init__.py
index 04e68539afb7182863dfeb6e43c44bb6faf2b40b,be81fc2db7852385f5f31908aa85b32b0999149e..df85bf7e73133f5c360812259006fc3379260a0c
--- 1/src/ddns/__init__.py
--- 2/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -95,11 -95,11 +95,12 @@@ class DDNSCore(object)
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
                        DDNSProviderDynDNS,
 +                      DDNSProviderEasyDNS,
                        DDNSProviderFreeDNSAfraidOrg,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderOVH,
+                       DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
                        DDNSProviderVariomedia,

diff --combined src/ddns/providers.py
index 2bf177435822eb4d1c2e81b27ac0dbe3ec2fceaf,4e3d6b05cbfd9b658ae1d5817ccaa3530afd35d6..f79890dedaef46bff54f47ed1247f6970fc41b53
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -361,21 -361,6 +361,21 @@@ class DDNSProviderDynDNS(DDNSProvider)
                raise DDNSUpdateError
  
  
 +class DDNSProviderEasyDNS(DDNSProviderDynDNS):
 +      INFO = {
 +              "handle"    : "easydns.com",
 +              "name"      : "EasyDNS",
 +              "website"   : "http://www.easydns.com/",
 +              "protocols" : ["ipv4",]
 +      }
 +
 +      # There is only some basic documentation provided by the vendor,
 +      # also searching the web gain very poor results.
 +      # http://mediawiki.easydns.com/index.php/Dynamic_DNS
 +
 +      url = "http://api.cp.easydns.com/dyn/tomato.php"
 +
 +
  class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
        INFO = {
                "handle"    : "freedns.afraid.org",
@@@ -525,6 -510,80 +525,80 @@@ class DDNSProviderOVH(DDNSProviderDynDN
                }
  
  
+ class DDNSProviderRegfish(DDNSProvider):
+       INFO = {
+               "handle"    : "regfish.com",
+               "name"      : "Regfish GmbH",
+               "website"   : "http://www.regfish.com/",
+               "protocols" : ["ipv6", "ipv4",]
+       }
+ 
+       # A full documentation to the providers api can be found here
+       # but is only available in german.
+       # https://www.regfish.de/domains/dyndns/dokumentation
+ 
+       url = "https://dyndns.regfish.de/"
+ 
+       def update(self):
+               data = {
+                       "fqdn" : self.hostname,
+               }
+ 
+               # Check if we update an IPv6 address.
+               address6 = self.get_address("ipv6")
+               if address6:
+                       data["ipv6"] = address6
+ 
+               # Check if we update an IPv4 address.
+               address4 = self.get_address("ipv4")
+               if address4:
+                       data["ipv4"] = address4
+ 
+               # Raise an error if none address is given.
+               if not data.has_key("ipv6") and not data.has_key("ipv4"):
+                       raise DDNSConfigurationError
+ 
+               # Check if a token has been set.
+               if self.token:
+                       data["token"] = self.token
+ 
+               # Raise an error if no token and no useranem and password
+               # are given.
+               elif not self.username and not self.password:
+                       raise DDNSConfigurationError(_("No Auth details specified."))
+ 
+               # HTTP Basic Auth is only allowed if no token is used.
+               if self.token:
+                       # Send update to the server.
+                       response = self.send_request(self.url, data=data)
+               else:
+                       # Send update to the server.
+                       response = self.send_request(self.url, username=self.username, password=self.password,
+                               data=data)
+ 
+               # Get the full response message.
+               output = response.read()
+ 
+               # Handle success messages.
+               if "100" in output or "101" in output:
+                       return
+ 
+               # Handle error codes.
+               if "401" or "402" in output:
+                       raise DDNSAuthenticationError
+               elif "408" in output:
+                       raise DDNSRequestError(_("Invalid IPv4 address has been sent."))
+               elif "409" in output:
+                       raise DDNSRequestError(_("Invalid IPv6 address has been sent."))
+               elif "412" in output:
+                       raise DDNSRequestError(_("No valid FQDN was given."))
+               elif "414" in output:
+                       raise DDNSInternalServerError
+ 
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+ 
+ 
  class DDNSProviderSelfhost(DDNSProvider):
        INFO = {
                "handle"    : "selfhost.de",