Merge remote-tracking branch 'stevee/twodns.de'

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

diff --git a/ddns.conf.sample b/ddns.conf.sample
index 107acc878bc20c1d9ac97c835629ffd7e302c3f6..90755369ddb682a8dbd07ca3fed642e3c08125bc 100644 (file)
--- a/ddns.conf.sample
+++ b/ddns.conf.sample
@@ -15,6 +15,11 @@
 # Accounts are its own sections.
 # These are some examples.
 
+# [test.all-inkl.com]
+# provider = all-inkl.com
+# username = user
+# password = pass
+
 # [test.dhs.org]
 # provider = dhs.org
 # username = user
@@ -49,6 +54,10 @@
 # token = token
 # proto = ipv4 OR ipv6
 
+# [test.namecheap.com]
+# provider = namecheap.com
+# password = pass
+
 # [test.no-ip.org]
 # provider = no-ip.com
 # username = user
@@ -77,6 +86,11 @@
 # username = user
 # password = pass
 
+# [test.strato.com]
+# provider = strato.com
+# username = user
+# password = pass
+
 # [test.lightningwirelabs.com]
 # provider = dns.lightningwirelabs.com
 

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index 18d89ec09da172850fd9ccfe8bbf596d495e7dfe..f22eb66c400bf735ab1eee741fde2ea68d30b406 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -91,6 +91,7 @@ class DDNSCore(object):
                        Simply registers all providers.
                """
                for provider in (
+                       DDNSProviderAllInkl,
                        DDNSProviderDHS,
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
@@ -98,12 +99,14 @@ class DDNSCore(object):
                        DDNSProviderDynU,
                        DDNSProviderEasyDNS,
                        DDNSProviderFreeDNSAfraidOrg,
+                       DDNSProviderNamecheap,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderOVH,
                        DDNSProviderRegfish,
                        DDNSProviderSelfhost,
                        DDNSProviderSPDNS,
+                       DDNSProviderStrato,
                        DDNSProviderTwoDNS,
                        DDNSProviderVariomedia,
                ):

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index fdc86c69d53778f561d7a303e430f7b6915db7be..3d89350087f17dbc2823280d54d90e7fe5b95f1e 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -20,6 +20,8 @@
 ###############################################################################
 
 import logging
+import urllib2
+import xml.dom.minidom
 
 from i18n import _
 
@@ -167,6 +169,47 @@ class DDNSProvider(object):
                return self.core.system.get_address(proto)
 
 
+class DDNSProviderAllInkl(DDNSProvider):
+       INFO = {
+               "handle"    : "all-inkl.com",
+               "name"      : "All-inkl.com",
+               "website"   : "http://all-inkl.com/",
+               "protocols" : ["ipv4",]
+       }
+
+       # There are only information provided by the vendor how to
+       # perform an update on a FRITZ Box. Grab requried informations
+       # from the net.
+       # http://all-inkl.goetze.it/v01/ddns-mit-einfachen-mitteln/
+
+       url = "http://dyndns.kasserver.com"
+
+       def update(self):
+
+               # There is no additional data required so we directly can
+               # send our request.
+               try:
+                       # Send request to the server.
+                       response = self.send_request(self.url, username=self.username, password=self.password)
+
+                       # Handle 401 HTTP Header (Authentication Error)
+               except urllib2.HTTPError, e:
+                       if e.code == 401:
+                               raise DDNSAuthenticationError
+
+                       raise
+
+               # Get the full response message.
+               output = response.read()
+
+               # Handle success messages.
+               if output.startswith("good") or output.startswith("nochg"):
+                       return
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+
+
 class DDNSProviderDHS(DDNSProvider):
        INFO = {
                "handle"    : "dhs.org",
@@ -504,6 +547,77 @@ class DDNSProviderLightningWireLabs(DDNSProvider):
                raise DDNSUpdateError
 
 
+class DDNSProviderNamecheap(DDNSProvider):
+       INFO = {
+               "handle"    : "namecheap.com",
+               "name"      : "Namecheap",
+               "website"   : "http://namecheap.com",
+               "protocols" : ["ipv4",]
+       }
+
+       # Information about the format of the HTTP request is to be found
+       # https://www.namecheap.com/support/knowledgebase/article.aspx/9249/0/nc-dynamic-dns-to-dyndns-adapter
+       # https://community.namecheap.com/forums/viewtopic.php?f=6&t=6772
+
+       url = "https://dynamicdns.park-your-domain.com/update"
+
+       def parse_xml(self, document, content):
+               # Send input to the parser.
+               xmldoc = xml.dom.minidom.parseString(document)
+
+               # Get XML elements by the given content.
+               element = xmldoc.getElementsByTagName(content)
+
+               # If no element has been found, we directly can return None.
+               if not element:
+                       return None
+
+               # Only get the first child from an element, even there are more than one.
+               firstchild = element[0].firstChild
+
+               # Get the value of the child.
+               value = firstchild.nodeValue
+
+               # Return the value.
+               return value
+               
+       def update(self):
+               # Namecheap requires the hostname splitted into a host and domain part.
+               host, domain = self.hostname.split(".", 1)
+
+               data = {
+                       "ip"       : self.get_address("ipv4"),
+                       "password" : self.password,
+                       "host"     : host,
+                       "domain"   : domain
+               }
+
+               # Send update to the server.
+               response = self.send_request(self.url, data=data)
+
+               # Get the full response message.
+               output = response.read()
+
+               # Handle success messages.
+               if self.parse_xml(output, "IP") == self.get_address("ipv4"):
+                       return
+
+               # Handle error codes.
+               errorcode = self.parse_xml(output, "ResponseNumber")
+
+               if errorcode == "304156":
+                       raise DDNSAuthenticationError
+               elif errorcode == "316153":
+                       raise DDNSRequestError(_("Domain not found."))
+               elif errorcode == "316154":
+                       raise DDNSRequestError(_("Domain not active."))
+               elif errorcode in ("380098", "380099"):
+                       raise DDNSInternalServerError
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+
+
 class DDNSProviderNOIP(DDNSProviderDynDNS):
        INFO = {
                "handle"    : "no-ip.com",
@@ -668,6 +782,20 @@ class DDNSProviderSPDNS(DDNSProviderDynDNS):
        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",