Merge remote-tracking branch 'stevee/fixes'

diff --git a/ddns.conf.sample b/ddns.conf.sample
index 9ac67e47419b695e1ba56244bff88d31e7c616ad..bb0e83952845a1b1c64131833bb30caf8a55d07e 100644 (file)
--- a/ddns.conf.sample
+++ b/ddns.conf.sample
@@ -29,6 +29,11 @@
 # provider = dtdns.org
 # password = pass
 
+# [test.dyndns.org]
+# provider = dnydns.org
+# username = user
+# password = pass
+
 # [test.no-ip.org]
 # provider = no-ip.com
 # username = user

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index e728c3752bbdb88d559ae4b59f5ff123d92f46c5..51728325d86b5fadd3a3b6c3e450e3a16534db15 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -94,6 +94,7 @@ class DDNSCore(object):
                        DDNSProviderDHS,
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
+                       DDNSProviderDynDNS,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderSelfhost,

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 07683957c47964e272249e6305ea56e3fde6a846..8a5185fe7aaf42352a4932270765f0642881312c 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -302,6 +302,54 @@ class DDNSProviderDtDNS(DDNSProvider):
                raise DDNSUpdateError
 
 
+class DDNSProviderDynDNS(DDNSProvider):
+       INFO = {
+               "handle"    : "dyndns.org",
+               "name"      : "Dyn",
+               "website"   : "http://dyn.com/dns/",
+               "protocols" : ["ipv4",]
+       }
+
+       # Information about the format of the request is to be found
+       # http://http://dyn.com/support/developers/api/perform-update/
+       # http://dyn.com/support/developers/api/return-codes/
+       url = "https://members.dyndns.org/nic/update"
+
+       def update(self):
+               data = {
+                       "hostname" : self.hostname,
+                       "myip"     : self.get_address("ipv4"),
+               }
+
+               # 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("good") or output.startswith("nochg"):
+                       return
+
+               # Handle error codes.
+               if output == "badauth":
+                       raise DDNSAuthenticationError
+               elif output == "aduse":
+                       raise DDNSAbuseError
+               elif output == "notfqdn":
+                       raise DDNSRequestError(_("No valid FQDN was given."))
+               elif output == "nohost":
+                       raise DDNSRequestError(_("Specified host does not exist."))
+               elif output == "911":
+                       raise DDNSInternalServerError
+               elif output == "dnserr":
+                       raise DDNSInternalServerError(_("DNS error encountered."))
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+
+
 class DDNSProviderLightningWireLabs(DDNSProvider):
        INFO = {
                "handle"    : "dns.lightningwirelabs.com",