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

diff --combined ddns.conf.sample
index 0a057823367d08f4812167816edb51bef43d535e,68756f53e62b187ca13e6fe3e31898a20549dbb0..29b1ef19570d4e0b4b2f8f7727c2a66574ca05cb
--- 1/ddns.conf.sample
--- 2/ddns.conf.sample
+++ b/ddns.conf.sample
@@@ -86,11 -86,6 +86,11 @@@
  # username = user
  # password = pass
  
 +# [test.strato.com]
 +# provider = strato.com
 +# username = user
 +# password = pass
 +
  # [test.lightningwirelabs.com]
  # provider = dns.lightningwirelabs.com
  
@@@ -99,18 -94,14 +99,24 @@@
  # username = user
  # password = pass
  
 +# [test.twodns.de]
 +# provider = twodns.de
 +# username = user
 +# password = pass
 +
 +# [test.udmedia.de]
 +# provider = udmedia.de
 +# username = user
 +# password = pass
 +
  # [test.variomedia.de]
  # provider = variomedia.de
  # username = user
  # password = pass
  # proto = ipv4 OR ipv6
+ 
+ # [test.zoneedit.com]
+ # provider = zoneedit.com
+ # username = user
+ # password = pass
+ # proto = ipv4 OR ipv6 

diff --combined src/ddns/__init__.py
index 7e5be0022721697f67fd9cbec6df335e2f5451bb,65e61d50062b5f56acdf5c1d2980e0ac5bdb6176..e4e484e01323db1187d4640b11600765c0738618
--- 1/src/ddns/__init__.py
--- 2/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -106,10 -106,8 +106,11 @@@ class DDNSCore(object)
                        DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
 +                      DDNSProviderStrato,
 +                      DDNSProviderTwoDNS,
 +                      DDNSProviderUdmedia,
                        DDNSProviderVariomedia,
+                       DDNSProviderZoneedit,
                ):
                        self.register_provider(provider)
  

diff --combined src/ddns/providers.py
index aa4546c36bdbf106240c62b09c852ec4b4fdc7bc,06cade872f85d8372e6c83add2a5fa3d10e00979..2a5115608fd41d7d1d7a0ecf31596ac68c94433a
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -782,57 -782,6 +782,57 @@@ class DDNSProviderSPDNS(DDNSProviderDyn
        url = "https://update.spdns.de/nic/update"
  
  
 +class DDNSProviderStrato(DDNSProviderDynDNS):
 +      INFO = {
 +              "handle"    : "strato.com",
 +              "name"      : "Strato AG",
 +              "website"   : "http:/www.strato.com/",
 +              "protocols" : ["ipv4",]
 +      }
 +
 +      # Information about the request and response can be obtained here:
 +      # http://www.strato-faq.de/article/671/So-einfach-richten-Sie-DynDNS-f%C3%BCr-Ihre-Domains-ein.html
 +
 +      url = "https://dyndns.strato.com/nic/update"
 +
 +
 +class DDNSProviderTwoDNS(DDNSProviderDynDNS):
 +      INFO = {
 +              "handle"    : "twodns.de",
 +              "name"      : "TwoDNS",
 +              "website"   : "http://www.twodns.de",
 +              "protocols" : ["ipv4",]
 +      }
 +
 +      # Detailed information about the request can be found here
 +      # http://twodns.de/en/faqs
 +      # http://twodns.de/en/api
 +
 +      url = "https://update.twodns.de/update"
 +
 +      def _prepare_request_data(self):
 +              data = {
 +                      "ip" : self.get_address("ipv4"),
 +                      "hostname" : self.hostname
 +              }
 +
 +              return data
 +
 +
 +class DDNSProviderUdmedia(DDNSProviderDynDNS):
 +      INFO = {
 +              "handle"    : "udmedia.de",
 +              "name"      : "Udmedia GmbH",
 +              "website"   : "http://www.udmedia.de",
 +              "protocols" : ["ipv4",]
 +      }
 +
 +      # Information about the request can be found here
 +      # http://www.udmedia.de/faq/content/47/288/de/wie-lege-ich-einen-dyndns_eintrag-an.html
 +
 +      url = "https://www.udmedia.de/nic/update"
 +
 +
  class DDNSProviderVariomedia(DDNSProviderDynDNS):
        INFO = {
                "handle"   : "variomedia.de",
@@@ -857,3 -806,51 +857,51 @@@
                }
  
                return data
+ 
+ 
+ class DDNSProviderZoneedit(DDNSProvider):
+       INFO = {
+               "handle"    : "zoneedit.com",
+               "name"      : "Zoneedit",
+               "website"   : "http://www.zoneedit.com",
+               "protocols" : ["ipv6", "ipv4",]
+       }
+ 
+       # Detailed information about the request and the response codes can be
+       # obtained here:
+       # http://www.zoneedit.com/doc/api/other.html
+       # http://www.zoneedit.com/faq.html
+ 
+       url = "https://dynamic.zoneedit.com/auth/dynamic.html"
+ 
+       @property
+       def proto(self):
+               return self.get("proto")
+ 
+       def update(self):
+               data = {
+                       "dnsto" : self.get_address(self.proto),
+                       "host"  : self.hostname
+               }
+ 
+               # 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 output.startswith("<SUCCESS"):
+                       return
+ 
+               # Handle error codes.
+               if output.startswith("invalid login"):
+                       raise DDNSAuthenticationError
+               elif output.startswith("<ERROR CODE=\"704\""):
+                       raise DDNSRequestError(_("No valid FQDN was given.")) 
+               elif output.startswith("<ERROR CODE=\"702\""):
+                       raise DDNSInternalServerError
+ 
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError