]> git.ipfire.org Git - oddments/ddns.git/commitdiff
chore: add provider and sample configuration for infomaniak.ch master
authorRouven Schürch <r.schuerch@gmx.ch>
Sun, 21 Apr 2024 11:11:52 +0000 (13:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Apr 2024 09:56:10 +0000 (09:56 +0000)
Signed-off-by: Rouven Schürch <r.schuerch@gmx.ch>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
README
configure.ac
ddns.conf.sample
ddns.in [changed mode: 0644->0755]
src/ddns/__init__.py
src/ddns/database.py
src/ddns/errors.py
src/ddns/i18n.py
src/ddns/providers.py
src/ddns/system.py

diff --git a/README b/README
index 76f63bcc18ab95013ee52cd4eb165db8185973b3..f0df1ff4905a83e96b088af5ee1d5fe203dc35e6 100644 (file)
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ LICENSE:
 INSTALLATION:
        REQUIREMENTS:
                ddns is written in Python and does not require any third-party
-               modules. The minumum version of Python that has been tested
+               modules. The minimum version of Python that has been tested
                is Python 2.7.
 
                Building the program from source code requires:
@@ -69,13 +69,15 @@ SUPPORTED PROVIDERS:
        enom.com
        entrydns.net
        freedns.afraid.org
+       godaddy.com
        inwx.com|de|at|ch|es
        itsdns.de
        joker.com
+       key-systems.net
        loopia.se
        myonlineportal.net
        namecheap.com
-       no-ip.com
+       noip.com
        now-dns.com
        nsupdate.info
        opendns.com
index 008950d5411a1ae31b0e80d8451f03d65fcb5d13..512f5ffb620b69e126ea118fd401242a46e1543e 100644 (file)
@@ -21,7 +21,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([ddns],
-       [011],
+       [015],
        [info@ipfire.org],
        [ddns],
        [http://git.ipfire.org/?p=oddments/ddns.git;a=summary])
@@ -54,7 +54,7 @@ AC_PROG_SED
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 # Python
-AM_PATH_PYTHON([2.7])
+AM_PATH_PYTHON([3.6])
 
 save_LIBS="$LIBS"
 
index 5b3b845c8f7092edc69d8856a7f930225eb77a14..f1adf5d95bc93dd0fced3b16dd147673e2abb98e 100644 (file)
 # username = user
 # password = pass
 
+# [test.godaddy.com]
+# provider = godaddy.com
+# username = key
+# password = secret
+
 # [test.google.com]
 # provider = domains.google.com
 # username = user
 # password = pass
 
+# [test.infomaniak.ch]
+# provider = infomaniak.ch
+# username = user
+# password = pass
+
 # [test.loopia.se]
 # provider = loopia.se
 # username = user
 # provider = namecheap.com
 # password = pass
 
-# [test.no-ip.org]
+# [test.noip.org]
 # provider = no-ip.com
 # username = user
 # password = pass
diff --git a/ddns.in b/ddns.in
old mode 100644 (file)
new mode 100755 (executable)
index 1ca5f83..20edd28
--- a/ddns.in
+++ b/ddns.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
@@ -49,6 +49,10 @@ def main():
        p_list_providers = subparsers.add_parser("list-providers",
                help=_("List all available providers"))
 
+       # list-token-providers
+       p_list_token_provider = subparsers.add_parser("list-token-providers",
+               help=_("List all providers which supports authentication via token"))
+
        # update
        p_update = subparsers.add_parser("update", help=_("Update DNS record"))
        p_update.add_argument("hostname")
@@ -74,16 +78,20 @@ def main():
                # IPv6
                ipv6_address = d.system.guess_external_ip_address("ipv6")
                if ipv6_address:
-                       print _("IPv6 Address: %s") % ipv6_address
+                       print("IPv6 Address: %s" % ipv6_address)
 
                # IPv4
                ipv4_address = d.system.guess_external_ip_address("ipv4")
                if ipv4_address:
-                       print _("IPv4 Address: %s") % ipv4_address
+                       print("IPv4 Address: %s" % ipv4_address)
 
        elif args.subparsers_name == "list-providers":
                provider_names = d.get_provider_names()
-               print "\n".join(provider_names)
+               print("\n".join(provider_names))
+
+       elif args.subparsers_name == "list-token-providers":
+               token_provider = d.get_provider_with_token_support()
+               print("\n".join(token_provider))
 
        elif args.subparsers_name == "update":
                d.updateone(hostname=args.hostname, force=args.force)
index 7f2729c2c8c0cc93e09e46ec343fce6804664276..ca232bf9ec4c571db60689b1b0cf74e00cf2f405 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
 
 import logging
 import logging.handlers
-import ConfigParser
+import configparser
 
-from i18n import _
+from .i18n import _
 
 logger = logging.getLogger("ddns.core")
 logger.propagate = 1
 
-import database
-import providers
+from . import database
+from . import providers
 
 from .errors import *
 from .system import DDNSSystem
@@ -86,10 +86,24 @@ class DDNSCore(object):
                """
                return sorted(self.providers.keys())
 
+       def get_provider_with_token_support(self):
+               """
+                       Returns a list with names of all registered providers
+                       which support token based authtentication.
+               """
+
+               token_provider = []
+
+               for handle, provider in sorted(self.providers.items()):
+                       if provider.supports_token_auth is True:
+                               token_provider.append(handle)
+
+               return sorted(token_provider)
+
        def load_configuration(self, filename):
                logger.debug(_("Loading configuration file %s") % filename)
 
-               configs = ConfigParser.RawConfigParser()
+               configs = configparser.RawConfigParser()
                configs.read([filename,])
 
                # First apply all global configuration settings.
@@ -98,7 +112,7 @@ class DDNSCore(object):
                                self.settings[k] = v
 
                # Allow missing config section
-               except ConfigParser.NoSectionError:
+               except configparser.NoSectionError:
                        pass
 
                for entry in configs.sections():
@@ -127,7 +141,7 @@ class DDNSCore(object):
                        # Check if the provider is actually supported and if there are
                        # some dependencies missing on this system.
                        if not provider.supported():
-                               logger.warning("Provider '%s' is known, but not supported on this machine" % (provider.name))
+                               logger.warning("Provider '%s' is known, but not supported on this machine" % provider.name)
                                continue
 
                        # Create an instance of the provider object with settings from the
@@ -163,13 +177,13 @@ class DDNSCore(object):
                try:
                        entry(force=force)
 
-               except DDNSError, e:
-                       logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) failed:") % \
-                               { "hostname" : entry.hostname, "provider" : entry.name })
+               except DDNSError as e:
+                       logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) failed:") %
+                               {"hostname": entry.hostname, "provider": entry.name})
                        logger.error("  %s: %s" % (e.__class__.__name__, e.reason))
                        if e.message:
                                logger.error("  %s" % e.message)
 
-               except Exception, e:
-                       logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) throwed an unhandled exception:") % \
-                               { "hostname" : entry.hostname, "provider" : entry.name }, exc_info=True)
+               except Exception:
+                       logger.error(_("Dynamic DNS update for %(hostname)s (%(provider)s) threw an unhandled exception:") %
+                                                {"hostname": entry.hostname, "provider": entry.name}, exc_info=True)
index 70a73635740211e356e2f68144dc4475f3390dea..2de050b1b7f590e3c570365b9f0702054a61d0d6 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
@@ -37,9 +37,6 @@ class DDNSDatabase(object):
                # so that we do not do it unnecessarily.
                self._db = None
 
-       def __del__(self):
-               self._close_database()
-
        def _open_database(self, path):
                logger.debug("Opening database %s" % path)
 
@@ -80,11 +77,6 @@ class DDNSDatabase(object):
                # In that case the database file will be created in _open_database().
                return os.access(os.path.dirname(self.path), os.W_OK)
 
-       def _close_database(self):
-               if self._db:
-                       self._db_close()
-                       self._db = None
-
        def _execute(self, query, *parameters):
                if self._db is None:
                        self._db = self._open_database(self.path)
index a8a201751f1111d41c2723681897e1261c467803..0bc1fa5a8a8a5668602c40fffdce3d4e43709508 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
index 170414d609566b272bae7713b4a5ea5af0035845..1b8a9702a35577353b6139981fb3858430967d46 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
@@ -25,15 +25,14 @@ TEXTDOMAIN = "ddns"
 
 N_ = lambda x: x
 
+
 def _(singular, plural=None, n=None):
        """
                A function that returnes the translation of a string if available.
-
                The language is taken from the system environment.
-        """
-       if not plural is None:
+       """
+       if plural is not None:
                assert n is not None
                return gettext.dngettext(TEXTDOMAIN, singular, plural, n)
 
        return gettext.dgettext(TEXTDOMAIN, singular)
-
index f3c62c10397cb167eddbd85e3ceaf80d602eb398..59f9665459d780d30b4b7fdbb153ec3565e34e3a 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
 
 import datetime
 import logging
+import json
 import os
 import subprocess
-import urllib2
+import urllib.request
+import urllib.error
+import urllib.parse
 import xml.dom.minidom
 
-from i18n import _
+from .i18n import _
 
 # Import all possible exception types.
 from .errors import *
@@ -71,23 +74,9 @@ class DDNSProvider(object):
        # Required to remove AAAA records if IPv6 is absent again.
        can_remove_records = True
 
-       # Automatically register all providers.
-       class __metaclass__(type):
-               def __init__(provider, name, bases, dict):
-                       type.__init__(provider, name, bases, dict)
-
-                       # The main class from which is inherited is not registered
-                       # as a provider.
-                       if name == "DDNSProvider":
-                               return
-
-                       if not all((provider.handle, provider.name, provider.website)):
-                               raise DDNSError(_("Provider is not properly configured"))
-
-                       assert not _providers.has_key(provider.handle), \
-                               "Provider '%s' has already been registered" % provider.handle
-
-                       _providers[provider.handle] = provider
+       # True if the provider supports authentication via a random
+       # generated token instead of username and password.
+       supports_token_auth = True
 
        @staticmethod
        def supported():
@@ -105,11 +94,23 @@ class DDNSProvider(object):
                self.settings = self.DEFAULT_SETTINGS.copy()
                self.settings.update(settings)
 
+       def __init_subclass__(cls, **kwargs):
+               super().__init_subclass__(**kwargs)
+
+               if not all((cls.handle, cls.name, cls.website)):
+                       raise DDNSError(_("Provider is not properly configured"))
+
+               assert cls.handle not in _providers, \
+                       "Provider '%s' has already been registered" % cls.handle
+
+               # Register class
+               _providers[cls.handle] = cls
+
        def __repr__(self):
                return "<DDNS Provider %s (%s)>" % (self.name, self.handle)
 
        def __cmp__(self, other):
-               return cmp(self.hostname, other.hostname)
+               return (lambda a, b: (a > b)-(a < b))(self.hostname, other.hostname)
 
        @property
        def db(self):
@@ -176,8 +177,8 @@ class DDNSProvider(object):
                        self.core.db.log_failure(self.hostname, e)
                        raise
 
-               logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") % \
-                       { "hostname" : self.hostname, "provider" : self.name })
+               logger.info(_("Dynamic DNS update for %(hostname)s (%(provider)s) successful") %
+                                       {"hostname": self.hostname, "provider": self.name})
                self.core.db.log_success(self.hostname)
 
        def update(self):
@@ -192,7 +193,7 @@ class DDNSProvider(object):
 
        def remove_protocol(self, proto):
                if not self.can_remove_records:
-                       raise RuntimeError, "can_remove_records is enabled, but remove_protocol() not implemented"
+                       raise RuntimeError("can_remove_records is enabled, but remove_protocol() not implemented")
 
                raise NotImplementedError
 
@@ -200,23 +201,21 @@ class DDNSProvider(object):
        def requires_update(self):
                # If the IP addresses have changed, an update is required
                if self.ip_address_changed(self.protocols):
-                       logger.debug(_("An update for %(hostname)s (%(provider)s)"
-                               " is performed because of an IP address change") % \
-                               { "hostname" : self.hostname, "provider" : self.name })
+                       logger.debug(_("An update for %(hostname)s (%(provider)s) is performed because of an IP address change") %
+                       {"hostname": self.hostname, "provider": self.name})
 
                        return True
 
                # If the holdoff time has expired, an update is required, too
                if self.holdoff_time_expired():
-                       logger.debug(_("An update for %(hostname)s (%(provider)s)"
-                               " is performed because the holdoff time has expired") % \
-                               { "hostname" : self.hostname, "provider" : self.name })
+                       logger.debug(_("An update for %(hostname)s (%(provider)s) is performed because the holdoff time has expired") %
+                                                {"hostname": self.hostname, "provider": self.name})
 
                        return True
 
                # Otherwise, we don't need to perform an update
-               logger.debug(_("No update required for %(hostname)s (%(provider)s)") % \
-                       { "hostname" : self.hostname, "provider" : self.name })
+               logger.debug(_("No update required for %(hostname)s (%(provider)s)") %
+                                        {"hostname": self.hostname, "provider": self.name})
 
                return False
 
@@ -234,8 +233,7 @@ class DDNSProvider(object):
 
                # If there is no holdoff time, we won't update ever again.
                if self.holdoff_failure_days is None:
-                       logger.warning(_("An update has not been performed because earlier updates failed for %s") \
-                               % self.hostname)
+                       logger.warning(_("An update has not been performed because earlier updates failed for %s") % self.hostname)
                        logger.warning(_("There will be no retries"))
 
                        return True
@@ -248,8 +246,7 @@ class DDNSProvider(object):
                if now < holdoff_end:
                        failure_message = self.db.last_update_failure_message(self.hostname)
 
-                       logger.warning(_("An update has not been performed because earlier updates failed for %s") \
-                               % self.hostname)
+                       logger.warning(_("An update has not been performed because earlier updates failed for %s") % self.hostname)
 
                        if failure_message:
                                logger.warning(_("Last failure message:"))
@@ -315,8 +312,8 @@ class DDNSProvider(object):
                        logger.debug("The holdoff time has expired for %s" % self.hostname)
                        return True
                else:
-                       logger.debug("Updates for %s are held off until %s" % \
-                               (self.hostname, holdoff_end))
+                       logger.debug("Updates for %s are held off until %s" %
+                                                (self.hostname, holdoff_end))
                        return False
 
        def send_request(self, *args, **kwargs):
@@ -360,6 +357,10 @@ class DDNSProtocolDynDNS2(object):
        # The DynDNS protocol version 2 does not allow to remove records
        can_remove_records = False
 
+       # The DynDNS protocol version 2 only supports authentication via
+       # username and password.
+       supports_token_auth = False
+
        def prepare_request_data(self, proto):
                data = {
                        "hostname" : self.hostname,
@@ -375,11 +376,10 @@ class DDNSProtocolDynDNS2(object):
 
        def send_request(self, data):
                # Send update to the server.
-               response = DDNSProvider.send_request(self, self.url, data=data,
-                       username=self.username, password=self.password)
+               response = DDNSProvider.send_request(self, self.url, data=data, username=self.username, password=self.password)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("good") or output.startswith("nochg"):
@@ -413,7 +413,7 @@ class DDNSResponseParserXML(object):
                will be sent by various providers. This class uses the python
                shipped XML minidom module to walk through the XML tree and return
                a requested element.
-        """
+       """
 
        def get_xml_tag_value(self, document, content):
                # Send input to the parser.
@@ -443,12 +443,13 @@ class DDNSProviderAllInkl(DDNSProvider):
        protocols = ("ipv4",)
 
        # There are only information provided by the vendor how to
-       # perform an update on a FRITZ Box. Grab requried informations
+       # perform an update on a FRITZ Box. Grab required information
        # from the net.
        # http://all-inkl.goetze.it/v01/ddns-mit-einfachen-mitteln/
 
-       url = "http://dyndns.kasserver.com"
+       url = "https://dyndns.kasserver.com"
        can_remove_records = False
+       supports_token_auth = False
 
        def update(self):
                # There is no additional data required so we directly can
@@ -456,7 +457,7 @@ class DDNSProviderAllInkl(DDNSProvider):
                response = self.send_request(self.url, username=self.username, password=self.password)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("good") or output.startswith("nochg"):
@@ -473,6 +474,8 @@ class DDNSProviderBindNsupdate(DDNSProvider):
 
        DEFAULT_TTL = 60
 
+       supports_token_auth = False
+
        @staticmethod
        def supported():
                # Search if the nsupdate utility is available
@@ -494,9 +497,7 @@ class DDNSProviderBindNsupdate(DDNSProvider):
                # -t sets the timeout
                command = ["nsupdate", "-v", "-t", "60"]
 
-               p = subprocess.Popen(command, shell=True,
-                       stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-               )
+               p = subprocess.Popen(command, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                stdout, stderr = p.communicate(scriptlet)
 
                if p.returncode == 0:
@@ -547,7 +548,7 @@ class DDNSProviderBindNsupdate(DDNSProvider):
 
                        logger.debug("  %s" % line)
 
-               return "\n".join(scriptlet)
+               return "\n".join(scriptlet).encode()
 
 
 class DDNSProviderChangeIP(DDNSProvider):
@@ -561,6 +562,7 @@ class DDNSProviderChangeIP(DDNSProvider):
 
        url = "https://nic.changeip.com/nic/update"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -570,11 +572,10 @@ class DDNSProviderChangeIP(DDNSProvider):
 
                # Send update to the server.
                try:
-                       response = self.send_request(self.url, username=self.username, password=self.password,
-                               data=data)
+                       response = self.send_request(self.url, username=self.username, password=self.password, data=data)
 
                # Handle error codes.
-               except urllib2.HTTPError, e:
+               except urllib.error.HTTPError as e:
                        if e.code == 422:
                                raise DDNSRequestError(_("Domain not found."))
 
@@ -626,8 +627,9 @@ class DDNSProviderDDNSS(DDNSProvider):
        # http://www.ddnss.de/info.php
        # http://www.megacomputing.de/2014/08/dyndns-service-response-time/#more-919
 
-       url = "http://www.ddnss.de/upd.php"
+       url = "https://www.ddnss.de/upd.php"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -654,10 +656,8 @@ class DDNSProviderDDNSS(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # This provider sends the response code as part of the header.
-               header = response.info()
-
                # Get status information from the header.
-               output = header.getheader('ddnss-response')
+               output = response.getheader('ddnss-response')
 
                # Handle success messages.
                if output == "good" or output == "nochg":
@@ -690,8 +690,10 @@ class DDNSProviderDHS(DDNSProvider):
        # No information about the used update api provided on webpage,
        # grabed from source code of ez-ipudate.
 
-       url = "http://members.dhs.org/nic/hosts"
+       # Provider currently does not support TLS 1.2.
+       url = "https://members.dhs.org/nic/hosts"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -703,8 +705,7 @@ class DDNSProviderDHS(DDNSProvider):
                }
 
                # Send update to the server.
-               response = self.send_request(self.url, username=self.username, password=self.password,
-                       data=data)
+               response = self.send_request(self.url, username=self.username, password=self.password, data=data)
 
                # Handle success messages.
                if response.code == 200:
@@ -725,6 +726,7 @@ class DDNSProviderDNSpark(DDNSProvider):
 
        url = "https://control.dnspark.com/api/dynamic/update.php"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -733,11 +735,10 @@ class DDNSProviderDNSpark(DDNSProvider):
                }
 
                # Send update to the server.
-               response = self.send_request(self.url, username=self.username, password=self.password,
-                       data=data)
+               response = self.send_request(self.url, username=self.username, password=self.password, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("ok") or output.startswith("nochange"):
@@ -774,6 +775,7 @@ class DDNSProviderDtDNS(DDNSProvider):
 
        url = "https://www.dtdns.com/api/autodns.cfm"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -786,7 +788,7 @@ class DDNSProviderDtDNS(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Remove all leading and trailing whitespace.
                output = output.strip()
@@ -818,16 +820,63 @@ class DDNSProviderDtDNS(DDNSProvider):
                raise DDNSUpdateError
 
 
-class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider):
+class DDNSProviderDuckDNS(DDNSProvider):
        handle    = "duckdns.org"
        name      = "Duck DNS"
        website   = "http://www.duckdns.org/"
-       protocols = ("ipv4",)
+       protocols = ("ipv6", "ipv4",)
 
        # Information about the format of the request is to be found
-       # https://www.duckdns.org/install.jsp
+       # https://www.duckdns.org/spec.jsp
+
+       url = "https://www.duckdns.org/update"
+       can_remove_records = False
+       supports_token_auth = True
 
-       url = "https://www.duckdns.org/nic/update"
+       def update(self):
+               # Raise an error if no auth details are given.
+               if not self.token:
+                       raise DDNSConfigurationError
+
+               data =  {
+                       "domains" : self.hostname,
+                       "token"    : self.token,
+               }
+
+               # Check if we update an IPv4 address.
+               address4 = self.get_address("ipv4")
+               if address4:
+                       data["ip"] = address4
+
+               # Check if we update an IPv6 address.
+               address6 = self.get_address("ipv6")
+               if address6:
+                       data["ipv6"] = address6
+
+               # Raise an error if no address is given.
+               if "ip" not in data and "ipv6" not in data:
+                       raise DDNSConfigurationError
+
+               # Send update to the server.
+               response = self.send_request(self.url, data=data)
+
+               # Get the full response message.
+               output = response.read().decode()
+
+               # Remove all leading and trailing whitespace.
+               output = output.strip()
+
+               # Handle success messages.
+               if output == "OK":
+                       return
+
+               # The provider does not give detailed information
+               # if the update fails. Only a "KO" will be sent back.
+               if output == "KO":
+                       raise DDNSUpdateError
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
 
 
 class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
@@ -840,7 +889,7 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider):
        # https://www.dy.fi/page/clients?lang=en
        # https://www.dy.fi/page/specification?lang=en
 
-       url = "http://www.dy.fi/nic/update"
+       url = "https://www.dy.fi/nic/update"
 
        # Please only send automatic updates when your IP address changes,
        # or once per 5 to 6 days to refresh the address mapping (they will
@@ -884,6 +933,7 @@ class DDNSProviderDynUp(DDNSProvider):
 
        url = "https://dynup.de/dyn.php"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -897,20 +947,19 @@ class DDNSProviderDynUp(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Remove all leading and trailing whitespace.
                output = output.strip()
 
                # Handle success messages.
-               if output.startswith("I:OK") :
+               if output.startswith("I:OK"):
                        return
 
                # If we got here, some other update error happened.
                raise DDNSUpdateError
 
 
-
 class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider):
        handle    = "dynu.com"
        name      = "Dynu"
@@ -948,7 +997,9 @@ class DDNSProviderEasyDNS(DDNSProvider):
        # (API 1.3) are available on the providers webpage.
        # https://fusion.easydns.com/index.php?/Knowledgebase/Article/View/102/7/dynamic-dns
 
-       url = "http://api.cp.easydns.com/dyn/tomato.php"
+       url = "https://api.cp.easydns.com/dyn/tomato.php"
+
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -957,11 +1008,10 @@ class DDNSProviderEasyDNS(DDNSProvider):
                }
 
                # Send update to the server.
-               response = self.send_request(self.url, data=data,
-                       username=self.username, password=self.password)
+               response = self.send_request(self.url, data=data, username=self.username, password=self.password)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Remove all leading and trailing whitespace.
                output = output.strip()
@@ -995,7 +1045,8 @@ class DDNSProviderDomopoli(DDNSProtocolDynDNS2, DDNSProvider):
 
        # https://www.domopoli.de/?page=howto#DynDns_start
 
-       url = "http://dyndns.domopoli.de/nic/update"
+       # This provider does not support TLS 1.2.
+       url = "https://dyndns.domopoli.de/nic/update"
 
 
 class DDNSProviderDynsNet(DDNSProvider):
@@ -1004,12 +1055,13 @@ class DDNSProviderDynsNet(DDNSProvider):
        website   = "http://www.dyns.net/"
        protocols = ("ipv4",)
        can_remove_records = False
+       supports_token_auth = False
 
        # 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"
+       url = "https://www.dyns.net/postscript011.php"
 
        def update_protocol(self, proto):
                data = {
@@ -1023,7 +1075,7 @@ class DDNSProviderDynsNet(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("200"):
@@ -1055,6 +1107,7 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
 
        url = "https://dynamic.name-services.com/interface.asp"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -1069,7 +1122,7 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if self.get_xml_tag_value(output, "ErrCount") == "0":
@@ -1097,6 +1150,7 @@ class DDNSProviderEntryDNS(DDNSProvider):
        # here: https://entrydns.net/help
        url = "https://entrydns.net/records/modify"
        can_remove_records = False
+       supports_token_auth = True
 
        def update_protocol(self, proto):
                data = {
@@ -1111,7 +1165,7 @@ class DDNSProviderEntryDNS(DDNSProvider):
                        response = self.send_request(url, data=data)
 
                # Handle error codes
-               except urllib2.HTTPError, e:
+               except urllib.error.HTTPError as e:
                        if e.code == 404:
                                raise DDNSAuthenticationError
 
@@ -1135,25 +1189,23 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
 
        # 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"
+       url = "https://sync.afraid.org/u/"
        can_remove_records = False
+       supports_token_auth = True
 
        def update_protocol(self, proto):
-               data = {
-                       "address" : self.get_address(proto),
-               }
 
                # Add auth token to the update url.
-               url = "%s?%s" % (self.url, self.token)
+               url = "%s%s/" % (self.url, self.token)
 
                # Send update to the server.
-               response = self.send_request(url, data=data)
+               response = self.send_request(url)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
-               if output.startswith("Updated") or "has not changed" in output:
+               if output.startswith("Updated") or output.startswith("No IP change detected"):
                        return
 
                # Handle error codes.
@@ -1166,6 +1218,71 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
                raise DDNSUpdateError
 
 
+class DDNSProviderGodaddy(DDNSProvider):
+       handle    = "godaddy.com"
+       name      = "godaddy.com"
+       website   = "https://godaddy.com/"
+       protocols = ("ipv4",)
+
+       # Information about the format of the HTTP request is to be found
+       # here: https://developer.godaddy.com/doc/endpoint/domains#/v1/recordReplaceTypeName
+       url = "https://api.godaddy.com/v1/domains/"
+       can_remove_records = False
+
+       def update_protocol(self, proto):
+               # retrieve ip
+               ip_address = self.get_address(proto)
+
+               # set target url
+               url = f"{self.url}/{self.hostname}/records/A/@"
+
+               # prepare data
+               data = json.dumps([{"data": ip_address, "ttl": 600, "name": self.hostname, "type": "A"}]).encode("utf-8")
+
+               # Method requires authentication by special headers.
+               request = urllib.request.Request(url=url,
+                                                                                data=data,
+                                                                                headers={"Authorization": f"sso-key {self.username}:{self.password}",
+                                                                                                 "Content-Type": "application/json"},
+                                                                                method="PUT")
+               result = urllib.request.urlopen(request)
+
+               # handle success
+               if result.code == 200:
+                       return
+
+               # handle errors
+               if result.code == 400:
+                       raise DDNSRequestError(_("Malformed request received."))
+               if result.code in (401, 403):
+                       raise DDNSAuthenticationError
+               if result.code == 404:
+                       raise DDNSRequestError(_("Resource not found."))
+               if result.code == 422:
+                       raise DDNSRequestError(_("Record does not fulfill the schema."))
+               if result.code == 429:
+                       raise DDNSRequestError(_("API Rate limiting."))
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+
+
+class DDNSProviderHENet(DDNSProtocolDynDNS2, DDNSProvider):
+                handle    = "he.net"
+                name      = "he.net"
+                website   = "https://he.net"
+                protocols = ("ipv6", "ipv4",)
+
+                # Detailed information about the update api can be found here.
+                # http://dns.he.net/docs.html
+
+                url = "https://dyn.dns.he.net/nic/update"
+                @property
+                def username(self):
+                        return self.get("hostname")
+
+               
+
 class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
                handle    = "inwx.com"
                name      = "INWX"
@@ -1204,6 +1321,52 @@ class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
                url = "https://svc.joker.com/nic/update"
 
 
+class DDNSProviderKEYSYSTEMS(DDNSProvider):
+       handle    = "key-systems.net"
+       name      = "dynamicdns.key-systems.net"
+       website   = "https://domaindiscount24.com/"
+       protocols = ("ipv4",)
+
+       # There are only information provided by the domaindiscount24 how to
+       # perform an update with HTTP APIs
+       # https://www.domaindiscount24.com/faq/dynamic-dns
+       # examples: https://dynamicdns.key-systems.net/update.php?hostname=hostname&password=password&ip=auto
+       #           https://dynamicdns.key-systems.net/update.php?hostname=hostname&password=password&ip=213.x.x.x&mx=213.x.x.x
+
+       url = "https://dynamicdns.key-systems.net/update.php"
+       can_remove_records = False
+       supports_token_auth = False
+
+       def update_protocol(self, proto):
+               address = self.get_address(proto)
+               data = {
+                       "hostname"      : self.hostname,
+                       "password"      : self.password,
+                       "ip"            : address,
+               }
+
+               # Send update to the server.
+               response = self.send_request(self.url, data=data)
+
+               # Get the full response message.
+               output = response.read().decode()
+
+               # Handle success messages.
+               if "code = 200" in output:
+                       return
+
+               # Handle error messages.
+               if "abuse prevention triggered" in output:
+                       raise DDNSAbuseError
+               elif "invalid password" in output:
+                       raise DDNSAuthenticationError
+               elif "Authorization failed" in output:
+                       raise DDNSRequestError(_("Invalid hostname specified"))
+
+               # If we got here, some other update error happened.
+               raise DDNSUpdateError
+
+
 class DDNSProviderGoogle(DDNSProtocolDynDNS2, DDNSProvider):
         handle    = "domains.google.com"
         name      = "Google Domains"
@@ -1219,35 +1382,27 @@ class DDNSProviderGoogle(DDNSProtocolDynDNS2, DDNSProvider):
 class DDNSProviderLightningWireLabs(DDNSProvider):
        handle    = "dns.lightningwirelabs.com"
        name      = "Lightning Wire Labs DNS Service"
-       website   = "http://dns.lightningwirelabs.com/"
+       website   = "https://dns.lightningwirelabs.com/"
 
        # Information about the format of the HTTPS request is to be found
        # https://dns.lightningwirelabs.com/knowledge-base/api/ddns
 
+       supports_token_auth = True
+
        url = "https://dns.lightningwirelabs.com/update"
 
        def update(self):
+               # Raise an error if no auth details are given.
+               if not self.token:
+                       raise DDNSConfigurationError
+
                data =  {
                        "hostname" : self.hostname,
+                       "token"    : self.token,
                        "address6" : self.get_address("ipv6", "-"),
                        "address4" : self.get_address("ipv4", "-"),
                }
 
-               # Check if a token has been set.
-               if self.token:
-                       data["token"] = self.token
-
-               # Check for username and password.
-               elif self.username and self.password:
-                       data.update({
-                               "username" : self.username,
-                               "password" : self.password,
-                       })
-
-               # Raise an error if no auth details are given.
-               else:
-                       raise DDNSConfigurationError
-
                # Send update to the server.
                response = self.send_request(self.url, data=data)
 
@@ -1302,6 +1457,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
 
        url = "https://dynamicdns.park-your-domain.com/update"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                # Namecheap requires the hostname splitted into a host and domain part.
@@ -1321,7 +1477,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if self.get_xml_tag_value(output, "IP") == address:
@@ -1345,15 +1501,15 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
 
 class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
        handle    = "no-ip.com"
-       name      = "No-IP"
-       website   = "http://www.no-ip.com/"
+       name      = "NoIP"
+       website   = "http://www.noip.com/"
        protocols = ("ipv4",)
 
        # Information about the format of the HTTP request is to be found
-       # here: http://www.no-ip.com/integrate/request and
-       # here: http://www.no-ip.com/integrate/response
+       # here: http://www.noip.com/integrate/request and
+       # here: http://www.noip.com/integrate/response
 
-       url = "http://dynupdate.no-ip.com/nic/update"
+       url = "https://dynupdate.noip.com/nic/update"
 
        def prepare_request_data(self, proto):
                assert proto == "ipv4"
@@ -1395,6 +1551,8 @@ class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider):
        # has not been implemented here, yet.
        can_remove_records = False
 
+       supports_token_auth = True
+
        # After a failed update, there will be no retries
        # https://bugzilla.ipfire.org/show_bug.cgi?id=10603
        holdoff_failure_days = None
@@ -1471,6 +1629,7 @@ class DDNSProviderRegfish(DDNSProvider):
 
        url = "https://dyndns.regfish.de/"
        can_remove_records = False
+       supports_token_auth = True
 
        def update(self):
                data = {
@@ -1488,7 +1647,7 @@ class DDNSProviderRegfish(DDNSProvider):
                        data["ipv4"] = address4
 
                # Raise an error if none address is given.
-               if not data.has_key("ipv6") and not data.has_key("ipv4"):
+               if "ipv6" not in data and "ipv4" not in data:
                        raise DDNSConfigurationError
 
                # Check if a token has been set.
@@ -1506,11 +1665,10 @@ class DDNSProviderRegfish(DDNSProvider):
                        response = self.send_request(self.url, data=data)
                else:
                        # Send update to the server.
-                       response = self.send_request(self.url, username=self.username, password=self.password,
-                               data=data)
+                       response = self.send_request(self.url, username=self.username, password=self.password, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if "100" in output or "101" in output:
@@ -1568,6 +1726,7 @@ class DDNSProviderServercow(DDNSProvider):
 
        url = "https://www.servercow.de/dnsupdate/update.php"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -1581,7 +1740,7 @@ class DDNSProviderServercow(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Read response
-               output = response.read()
+               output = response.read().decode()
 
                # Server responds with OK if update was successful
                if output.startswith("OK"):
@@ -1609,6 +1768,8 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider):
 
        url = "https://update.spdyn.de/nic/update"
 
+       supports_token_auth = True
+
        @property
        def username(self):
                return self.get("username") or self.hostname
@@ -1712,6 +1873,8 @@ class DDNSProviderZoneedit(DDNSProvider):
        website   = "http://www.zoneedit.com"
        protocols = ("ipv4",)
 
+       supports_token_auth = False
+
        # Detailed information about the request and the response codes can be
        # obtained here:
        # http://www.zoneedit.com/doc/api/other.html
@@ -1726,11 +1889,10 @@ class DDNSProviderZoneedit(DDNSProvider):
                }
 
                # Send update to the server.
-               response = self.send_request(self.url, username=self.username, password=self.password,
-                       data=data)
+               response = self.send_request(self.url, username=self.username, password=self.password, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("<SUCCESS"):
@@ -1760,6 +1922,7 @@ class DDNSProviderDNSmadeEasy(DDNSProvider):
 
        url = "https://cp.dnsmadeeasy.com/servlet/updateip?"
        can_remove_records = False
+       supports_token_auth = False
 
        def update_protocol(self, proto):
                data = {
@@ -1773,7 +1936,7 @@ class DDNSProviderDNSmadeEasy(DDNSProvider):
                response = self.send_request(self.url, data=data)
 
                # Get the full response message.
-               output = response.read()
+               output = response.read().decode()
 
                # Handle success messages.
                if output.startswith("success") or output.startswith("error-record-ip-same"):
@@ -1810,6 +1973,7 @@ class DDNSProviderZZZZ(DDNSProvider):
 
        url = "https://zzzz.io/api/v1/update"
        can_remove_records = False
+       supports_token_auth = True
 
        def update_protocol(self, proto):
                data = {
@@ -1841,3 +2005,15 @@ class DDNSProviderZZZZ(DDNSProvider):
 
                # If we got here, some other update error happened.
                raise DDNSUpdateError
+
+class DDNSProviderInfomaniak(DDNSProtocolDynDNS2, DDNSProvider):
+       handle    = "infomaniak.ch"
+       name      = "infomaniak"
+       website   = "https://www.infomaniak.ch"
+       protocols = ("ipv4",)
+
+       # Detailed information about how to send the update request and possible response
+       # codes can be obtained from here.
+       # https://www.infomaniak.com/de/support/faq/2376/dyndns-aktualisieren-eines-dynamischen-dns-uber-die-api
+
+       url = "https://infomaniak.com/nic/update"
index 67ea553b434bdcb7c96989328ea56422fe711973..48c9a8f88fdde2b922cb6548e450c9a1407851fb 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###############################################################################
 #                                                                             #
 # ddns - A dynamic DNS client for IPFire                                      #
@@ -23,12 +23,13 @@ import base64
 import re
 import ssl
 import socket
-import urllib
-import urllib2
+import urllib.request
+import urllib.parse
+import urllib.error
 
-from __version__ import CLIENT_VERSION
+from .__version__ import CLIENT_VERSION
 from .errors import *
-from i18n import _
+from .i18n import _
 
 # Initialize the logger.
 import logging
@@ -79,7 +80,7 @@ class DDNSSystem(object):
                                with open("/var/ipfire/red/local-ipaddress") as f:
                                        return f.readline()
 
-                       except IOError, e:
+                       except IOError as e:
                                # File not found
                                if e.errno == 2:
                                        return
@@ -104,17 +105,17 @@ class DDNSSystem(object):
                if not response.code == 200:
                        return
 
-               match = re.search(r"^Your IP address is: (.*)$", response.read())
+               match = re.search(b"^Your IP address is: (.*)$", response.read())
                if match is None:
                        return
 
-               return match.group(1)
+               return match.group(1).decode()
 
        def guess_external_ip_address(self, family, **kwargs):
                if family == "ipv6":
-                       url = "http://checkip6.dns.lightningwirelabs.com"
+                       url = "https://checkip6.dns.lightningwirelabs.com"
                elif family == "ipv4":
-                       url = "http://checkip4.dns.lightningwirelabs.com"
+                       url = "https://checkip4.dns.lightningwirelabs.com"
                else:
                        raise ValueError("unknown address family")
 
@@ -137,11 +138,11 @@ class DDNSSystem(object):
                if data:
                        logger.debug("  data: %s" % data)
 
-               req = urllib2.Request(url, data=data)
+               req = urllib.request.Request(url, data=data)
 
                if username and password:
                        basic_auth_header = self._make_basic_auth_header(username, password)
-                       req.add_header("Authorization", "Basic %s" % basic_auth_header)
+                       req.add_header("Authorization", "Basic %s" % basic_auth_header.decode())
 
                # Set the user agent.
                req.add_header("User-Agent", self.USER_AGENT)
@@ -163,7 +164,7 @@ class DDNSSystem(object):
                        logger.debug("  %s: %s" % (k, v))
 
                try:
-                       resp = urllib2.urlopen(req, timeout=timeout)
+                       resp = urllib.request.urlopen(req, timeout=timeout)
 
                        # Log response header.
                        logger.debug(_("Response header (Status Code %s):") % resp.code)
@@ -173,7 +174,7 @@ class DDNSSystem(object):
                        # Return the entire response object.
                        return resp
 
-               except urllib2.HTTPError, e:
+               except urllib.error.HTTPError as e:
                        # Log response header.
                        logger.debug(_("Response header (Status Code %s):") % e.code)
                        for k, v in e.hdrs.items():
@@ -209,7 +210,7 @@ class DDNSSystem(object):
                        # Raise all other unhandled exceptions.
                        raise
 
-               except urllib2.URLError, e:
+               except urllib.error.URLError as e:
                        if e.reason:
                                # Handle SSL errors
                                if isinstance(e.reason, ssl.SSLError):
@@ -225,8 +226,12 @@ class DDNSSystem(object):
                                if e.reason.errno == -2:
                                        raise DDNSResolveError
 
+                               # Cannot assign requested address
+                               elif e.reason.errno == 99:
+                                       raise DDNSNetworkUnreachableError
+
                                # Network Unreachable (e.g. no IPv6 access)
-                               if e.reason.errno == 101:
+                               elif e.reason.errno == 101:
                                        raise DDNSNetworkUnreachableError
 
                                # Connection Refused
@@ -240,7 +245,7 @@ class DDNSSystem(object):
                        # Raise all other unhandled exceptions.
                        raise
 
-               except socket.timeout, e:
+               except socket.timeout as e:
                        logger.debug(_("Connection timeout"))
 
                        raise DDNSConnectionTimeoutError
@@ -249,7 +254,7 @@ class DDNSSystem(object):
                args = []
 
                for k, v in data.items():
-                       arg = "%s=%s" % (k, urllib.quote(v))
+                       arg = "%s=%s" % (k, urllib.parse.quote(v))
                        args.append(arg)
 
                return "&".join(args)
@@ -258,10 +263,7 @@ class DDNSSystem(object):
                authstring = "%s:%s" % (username, password)
 
                # Encode authorization data in base64.
-               authstring = base64.encodestring(authstring)
-
-               # Remove any newline characters.
-               authstring = authstring.replace("\n", "")
+               authstring = base64.b64encode(authstring.encode())
 
                return authstring
 
@@ -354,7 +356,7 @@ class DDNSSystem(object):
                # Resolve the host address.
                try:
                        response = socket.getaddrinfo(hostname, None, family)
-               except socket.gaierror, e:
+               except socket.gaierror as e:
                        # Name or service not known
                        if e.errno == -2:
                                return []
@@ -388,7 +390,7 @@ class DDNSSystem(object):
                                continue
 
                        # Add to repsonse list if not already in there.
-                       if not address in addresses:
+                       if address not in addresses:
                                addresses.append(address)
 
                return addresses
@@ -418,7 +420,7 @@ class DDNSSystem(object):
                """
                try:
                        f = open("/etc/os-release", "r")
-               except IOError, e:
+               except IOError as e:
                        # File not found
                        if e.errno == 2:
                                return
@@ -447,7 +449,7 @@ class DDNSSystem(object):
                """
                try:
                        f = open("/etc/system-release", "r")
-               except IOError, e:
+               except IOError as e:
                        # File not found
                        if e.errno == 2:
                                return