X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=blobdiff_plain;f=src%2Fddns%2Fproviders.py;h=2ffc35d50953da4fe44823c5b7b647f05d34c4c3;hp=3927808b19cb494b279623e9022ad973295323ac;hb=a197d1a6e02345440071c6eac59f17ea609d8e72;hpb=90663439cb088d3cfa49c20e39f1aed37c913b07

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index 3927808..2ffc35d 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -129,12 +129,16 @@ class DDNSProvider(object):
 
 		# Check if we actually need to update this host.
 		elif self.is_uptodate(self.protocols):
-			logger.debug(_("%s is already up to date") % self.hostname)
+			logger.debug(_("The dynamic host %(hostname)s (%(provider)s) is already up to date") % \
+				{ "hostname" : self.hostname, "provider" : self.name })
 			return
 
 		# Execute the update.
 		self.update()
 
+		logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") % \
+			{ "hostname" : self.hostname, "provider" : self.name })
+
 	def update(self):
 		raise NotImplementedError
 
@@ -210,7 +214,7 @@ class DDNSProtocolDynDNS2(object):
 		# Handle error codes.
 		if output == "badauth":
 			raise DDNSAuthenticationError
-		elif output == "aduse":
+		elif output == "abuse":
 			raise DDNSAbuseError
 		elif output == "notfqdn":
 			raise DDNSRequestError(_("No valid FQDN was given."))
@@ -220,6 +224,8 @@ class DDNSProtocolDynDNS2(object):
 			raise DDNSInternalServerError
 		elif output == "dnserr":
 			raise DDNSInternalServerError(_("DNS error encountered."))
+		elif output == "badagent":
+			raise DDNSBlockedError
 
 		# If we got here, some other update error happened.
 		raise DDNSUpdateError(_("Server response: %s") % output)
@@ -316,6 +322,11 @@ class DDNSProviderBindNsupdate(DDNSProvider):
 		if server:
 			scriptlet.append("server %s" % server)
 
+		# Set the DNS zone the host should be added to.
+		zone = self.get("zone", None)
+		if zone:
+			scriptlet.append("zone %s" % zone)
+
 		key = self.get("key", None)
 		if key:
 			secret = self.get("secret")
@@ -509,12 +520,14 @@ class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider):
 	url = "https://api.dynu.com/nic/update"
 
 	def _prepare_request_data(self):
-		data = DDNSProviderDynDNS._prepare_request_data(self)
+		data = DDNSProtocolDynDNS2._prepare_request_data(self)
 
 		# This one supports IPv6
-		data.update({
-			"myipv6"   : self.get_address("ipv6"),
-		})
+		myipv6 = self.get_address("ipv6")
+
+		# Add update information if we have an IPv6 address.
+		if myipv6:
+			data["myipv6"] = myipv6
 
 		return data
 
@@ -532,6 +545,61 @@ class DDNSProviderEasyDNS(DDNSProtocolDynDNS2, DDNSProvider):
 	url = "http://api.cp.easydns.com/dyn/tomato.php"
 
 
+class DDNSProviderDomopoli(DDNSProtocolDynDNS2, DDNSProvider):
+	handle    = "domopoli.de"
+	name      = "domopoli.de"
+	website   = "http://domopoli.de/"
+	protocols = ("ipv4",)
+
+	# https://www.domopoli.de/?page=howto#DynDns_start
+
+	url = "http://dyndns.domopoli.de/nic/update"
+
+
+class DDNSProviderDynsNet(DDNSProvider):
+	handle    = "dyns.net"
+	name      = "DyNS"
+	website   = "http://www.dyns.net/"
+	protocols = ("ipv4",)
+
+	# There is very detailed informatio about how to send the update request and
+	# the possible response codes. (Currently we are using the v1.1 proto)
+	# http://www.dyns.net/documentation/technical/protocol/
+
+	url = "http://www.dyns.net/postscript011.php"
+
+	def update(self):
+		data = {
+			"ip"       : self.get_address("ipv4"),
+			"host"     : self.hostname,
+			"username" : self.username,
+			"password" : self.password,
+		}
+
+		# 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 output.startswith("200"):
+			return
+
+		# Handle error codes.
+		if output.startswith("400"):
+			raise DDNSRequestError(_("Malformed request has been sent."))
+		elif output.startswith("401"):
+			raise DDNSAuthenticationError
+		elif output.startswith("402"):
+			raise DDNSRequestError(_("Too frequent update requests have been sent."))
+		elif output.startswith("403"):
+			raise DDNSInternalServerError
+
+		# If we got here, some other update error happened.
+		raise DDNSUpdateError(_("Server response: %s") % output) 
+
+
 class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
 	handle    = "enom.com"
 	name      = "eNom Inc."
@@ -574,6 +642,46 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
 		raise DDNSUpdateError
 
 
+class DDNSProviderEntryDNS(DDNSProvider):
+	handle    = "entrydns.net"
+	name      = "EntryDNS"
+	website   = "http://entrydns.net/"
+	protocols = ("ipv4",)
+
+	# Some very tiny details about their so called "Simple API" can be found
+	# here: https://entrydns.net/help
+	url = "https://entrydns.net/records/modify"
+
+	def update(self):
+		data = {
+			"ip" : self.get_address("ipv4")
+		}
+
+		# Add auth token to the update url.
+		url = "%s/%s" % (self.url, self.token)
+
+		# Send update to the server.
+		try:
+			response = self.send_request(url, data=data)
+
+		# Handle error codes
+		except urllib2.HTTPError, e:
+			if e.code == 404:
+				raise DDNSAuthenticationError
+
+			elif e.code == 422:
+				raise DDNSRequestError(_("An invalid IP address was submitted"))
+
+			raise
+
+		# Handle success messages.
+		if response.code == 200:
+			return
+
+		# If we got here, some other update error happened.
+		raise DDNSUpdateError
+
+
 class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
 	handle    = "freedns.afraid.org"
 	name      = "freedns.afraid.org"
@@ -899,7 +1007,7 @@ class DDNSProviderSelfhost(DDNSProtocolDynDNS2, DDNSProvider):
 	url = "https://carol.selfhost.de/nic/update"
 
 	def _prepare_request_data(self):
-		data = DDNSProviderDynDNS._prepare_request_data(self)
+		data = DDNSProtocolDynDNS2._prepare_request_data(self)
 		data.update({
 			"hostname" : "1",
 		})