Merge remote-tracking branch 'stevee/dynu.com'

Conflicts:
	ddns.conf.sample
	src/ddns/__init__.py
	src/ddns/providers.py

diff --combined ddns.conf.sample
index 1665cb951ecd313686a5021369c63589523ddf0e,fae8ba0ab936b3da1643ddf49787db38c39ed947..1fb20719369c48fba26af6eeaa38bc1e248ea757
--- 1/ddns.conf.sample
--- 2/ddns.conf.sample
+++ b/ddns.conf.sample
@@@ -34,11 -34,11 +34,16 @@@
  # username = user
  # password = pass
  
+ # [test.dynu.com]
+ # provider = dynu.com
+ # 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,14 -54,6 +59,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 df85bf7e73133f5c360812259006fc3379260a0c,83e337c2f903a8a589e6a4ff1237d921cf6325ef..bb9c748dfee40b20c9299a3515a51a25a9bd8868
--- 1/src/ddns/__init__.py
--- 2/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -95,12 -95,11 +95,13 @@@ class DDNSCore(object)
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
                        DDNSProviderDynDNS,
+                       DDNSProviderDynU,
 +                      DDNSProviderEasyDNS,
                        DDNSProviderFreeDNSAfraidOrg,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderOVH,
 +                      DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
                        DDNSProviderVariomedia,

diff --combined src/ddns/providers.py
index f79890dedaef46bff54f47ed1247f6970fc41b53,ab05f77c7a7cbb689cd9a830baea842ce2335b70..f2e470091fa192876143dcc6e5389299ef6a19a1
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -361,21 -361,29 +361,44 @@@ class DDNSProviderDynDNS(DDNSProvider)
                raise DDNSUpdateError
  
  
+ class DDNSProviderDynU(DDNSProviderDynDNS):
+       INFO = {
+               "handle"    : "dynu.com",
+               "name"      : "Dynu",
+               "website"   : "http://dynu.com/",
+               "protocols" : ["ipv6", "ipv4",]
+       }
+ 
+ 
+       # Detailed information about the request and response codes
+       # are available on the providers webpage.
+       # http://dynu.com/Default.aspx?page=dnsapi
+ 
+       url = "https://api.dynu.com/nic/update"
+ 
+       def _prepare_request_data(self):
+               data = {
+                       "hostname" : self.hostname,
+                       "myip"     : self.get_address("ipv4"),
+                       "myipv6"   : self.get_address("ipv6"),
+               }
+ 
+ 
 +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,80 -533,6 +548,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",