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

Conflicts:
	src/ddns/providers.py

diff --git a/ddns.conf.sample b/ddns.conf.sample
index 209f4ae4d26861a5c33cd80b83c81df18fb5b3a6..3e73842058acf7910845c04b9096c691e19766b9 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

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index 7ee6a2042e92a3da02945336c928b5093e60db96..a764c2ce4804bb9b29c20fb436c79fe02526f51a 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,

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 9ffd264b916ffc7e655b3ae639b7153bd31e469a..acd0253170cacef460799ba39289c7c0bbeb9a41 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -20,6 +20,7 @@
 ###############################################################################
 
 import logging
+import urllib2
 import xml.dom.minidom
 
 from i18n import _
@@ -168,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",