Merge remote-tracking branch 'stevee/freedns.afraid.org'

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

diff --cc ddns.conf.sample
index bb0e83952845a1b1c64131833bb30caf8a55d07e,bf31b59c5da7cdba02942be45f22b5edefd666b4..888137eef22fd4bfb68f2ea46e84251ed2d5769d
--- 1/ddns.conf.sample
--- 2/ddns.conf.sample
+++ b/ddns.conf.sample
@@@ -29,11 -29,11 +29,16 @@@
  # provider = dtdns.org
  # password = pass
  
 +# [test.dyndns.org]
 +# provider = dnydns.org
 +# username = user
 +# password = pass
 +
+ # [test.freedns.afraid.org]
+ # provider = freedns.afraid.org
+ # token = token
+ # proto = ipv4 OR ipv6
+ 
  # [test.no-ip.org]
  # provider = no-ip.com
  # username = user

diff --cc src/ddns/__init__.py
index 51728325d86b5fadd3a3b6c3e450e3a16534db15,8af99d73f83f76ae6fc0de7f68976c878dd2a615..494bf76ac86288e2556d08ddfe5487cbced15081
--- 1/src/ddns/__init__.py
--- 2/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -94,7 -94,7 +94,8 @@@ class DDNSCore(object)
                        DDNSProviderDHS,
                        DDNSProviderDNSpark,
                        DDNSProviderDtDNS,
 +                      DDNSProviderDynDNS,
+                       DDNSProviderFreeDNSAfraidOrg,
                        DDNSProviderNOIP,
                        DDNSProviderLightningWireLabs,
                        DDNSProviderSelfhost,

diff --cc src/ddns/providers.py
index 8a5185fe7aaf42352a4932270765f0642881312c,cbbeeea2c74f9f8ce1783a14f0b989f4e62ab900..919642fb0022d4dedb90458d0022835f44e1f198
--- 1/src/ddns/providers.py
--- 2/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -258,7 -275,7 +265,6 @@@ class DDNSProviderDtDNS(DDNSProvider)
        # http://www.dtdns.com/dtsite/updatespec
        url = "https://www.dtdns.com/api/autodns.cfm"
  
--
        def update(self):
                data = {
                        "ip" : self.get_address("ipv4"),
@@@ -302,54 -319,52 +308,93 @@@
                raise DDNSUpdateError
  
  
 -              # Get the full response message.
 -              output = response.read()
 -
 -              # Handle success messages.
 +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 DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
+       INFO = {
+               "handle"    : "freedns.afraid.org",
+               "name"      : "freedns.afraid.org",
+               "website"   : "http://freedns.afraid.org/",
+               "protocols" : ["ipv6", "ipv4",]
+               }
+ 
+       # No information about the request or response could be found on the vendor
+       # page. All used values have been collected by testing.
+       url = "https://freedns.afraid.org/dynamic/update.php"
+ 
+       @property
+       def proto(self):
+               return self.get("proto")
+ 
+       def update(self):
+               address = self.get_address(self.proto)
+ 
+               data = {
+                       "address" : address,
+               }
+ 
+               # Add auth token to the update url.
+               url = "%s?%s" % (self.url, self.token)
+ 
+               # Send update to the server.
+               response = self.send_request(url, data=data)
+ 
 -              # If we got here, some other update error happened.
 -              raise DDNSUpdateError
 -
+               if output.startswith("Updated") or "has not changed" in output:
+                       return
+ 
+               # Handle error codes.
+               if output == "ERROR: Unable to locate this record":
+                       raise DDNSAuthenticationError
+               elif "is an invalid IP address" in output:
+                       raise DDNSRequestError(_("Invalid IP address has been sent."))
+ 
+ 
  class DDNSProviderLightningWireLabs(DDNSProvider):
        INFO = {
                "handle"    : "dns.lightningwirelabs.com",