This is a major update to the latest available version of ddns.

Remove patches which are part of the upstream release.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- lfs/ddns | 11 +- ...13-add-option-to-list-token-provider.patch | 292 ------------------ src/patches/ddns-013-duckdns-new-api.patch | 83 ----- src/patches/ddns-013-dyfi-use-https.patch | 22 -- ...13-fix-argparse-list-token-providers.patch | 23 -- .../ddns-013-proper-encode-string.patch | 24 -- 6 files changed, 3 insertions(+), 452 deletions(-) delete mode 100644 src/patches/ddns-013-add-option-to-list-token-provider.patch delete mode 100644 src/patches/ddns-013-duckdns-new-api.patch delete mode 100644 src/patches/ddns-013-dyfi-use-https.patch delete mode 100644 src/patches/ddns-013-fix-argparse-list-token-providers.patch delete mode 100644 src/patches/ddns-013-proper-encode-string.patch

diff --git a/lfs/ddns b/lfs/ddns index 538cf7256..b1d0f2dbb 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@

include Config

-VER = 013 +VER = 014

THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb +$(DL_FILE)_MD5 = f10f7dfb29bd159db10e7a52c0a91d72

install : $(TARGET)

@@ -72,12 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)

# Apply upstream patches. - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-option-to-list-token-provider.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-proper-encode-string.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-fix-argparse-list-token-providers.patch + # No upstream patches at the moment.

cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/ddns-013-add-option-to-list-token-provider.patch b/src/patches/ddns-013-add-option-to-list-token-provider.patch deleted file mode 100644 index 7603422a2..000000000 --- a/src/patches/ddns-013-add-option-to-list-token-provider.patch +++ /dev/null @@ -1,292 +0,0 @@ -commit 287b2bfe7bf5e0639da9227a8c7893ce40d298ae -Author: Stefan Schantl stefan.schantl@ipfire.org -Date: Wed Dec 2 20:31:19 2020 +0100 - - Add option to list provider with token support. - - This option can be used to get a list of all known provider which support - a token based authentication method. - - In order to provide this feature the provider details has been extended - to contain the information if a provider supports this authentication - method or not. - - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/ddns.in b/ddns.in -old mode 100644 -new mode 100755 -index 0e377e7..538e4b0 ---- a/ddns.in -+++ b/ddns.in -@@ -49,6 +49,10 @@ def main(): - p_list_providers = subparsers.add_parser("list-providers", - help=_("List all available providers")) - -+ # list-token-provider -+ p_list_token_provider = subparsers.add_parser("list-token-provider", -+ 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") -@@ -85,6 +89,10 @@ def main(): - provider_names = d.get_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) - -diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py -index 3e43fa7..ca232bf 100644 ---- a/src/ddns/__init__.py -+++ b/src/ddns/__init__.py -@@ -86,6 +86,20 @@ 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) - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index a1ca3f3..b0066d5 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -73,6 +73,10 @@ class DDNSProvider(object): - # Required to remove AAAA records if IPv6 is absent again. - can_remove_records = True - -+ # True if the provider supports authentication via a random -+ # generated token instead of username and password. -+ supports_token_auth = True -+ - @staticmethod - def supported(): - """ -@@ -352,6 +356,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, -@@ -440,6 +448,7 @@ class DDNSProviderAllInkl(DDNSProvider): - - url = "http://dyndns.kasserver.com" - can_remove_records = False -+ supports_token_auth = False - - def update(self): - # There is no additional data required so we directly can -@@ -464,6 +473,8 @@ class DDNSProviderBindNsupdate(DDNSProvider): - - DEFAULT_TTL = 60 - -+ supports_token_auth = False -+ - @staticmethod - def supported(): - # Search if the nsupdate utility is available -@@ -550,6 +561,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 = { -@@ -616,6 +628,7 @@ class DDNSProviderDDNSS(DDNSProvider): - - url = "http://www.ddnss.de/upd.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -678,6 +691,7 @@ class DDNSProviderDHS(DDNSProvider): - - url = "http://members.dhs.org/nic/hosts" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -710,6 +724,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 = { -@@ -758,6 +773,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 = { -@@ -813,6 +829,7 @@ class DDNSProviderDuckDNS(DDNSProvider): - - url = "https://www.duckdns.org/update" - can_remove_records = False -+ supports_token_auth = True - - def update(self): - # Raise an error if no auth details are given. -@@ -914,6 +931,7 @@ class DDNSProviderDynUp(DDNSProvider): - - url = "https://dynup.de/dyn.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -979,6 +997,8 @@ class DDNSProviderEasyDNS(DDNSProvider): - - url = "http://api.cp.easydns.com/dyn/tomato.php" - -+ supports_token_auth = False -+ - def update_protocol(self, proto): - data = { - "myip" : self.get_address(proto, "-"), -@@ -1032,6 +1052,7 @@ 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) -@@ -1083,6 +1104,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 = { -@@ -1125,6 +1147,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 = { -@@ -1165,6 +1188,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): - # page. All used values have been collected by testing. - url = "https://freedns.afraid.org/dynamic/update.php" - can_remove_records = False -+ supports_token_auth = True - - def update_protocol(self, proto): - data = { -@@ -1246,6 +1270,7 @@ class DDNSProviderKEYSYSTEMS(DDNSProvider): - - 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) -@@ -1297,6 +1322,8 @@ class DDNSProviderLightningWireLabs(DDNSProvider): - # 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): -@@ -1365,6 +1392,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. -@@ -1458,6 +1486,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 -@@ -1534,6 +1564,7 @@ class DDNSProviderRegfish(DDNSProvider): - - url = "https://dyndns.regfish.de/" - can_remove_records = False -+ supports_token_auth = True - - def update(self): - data = { -@@ -1630,6 +1661,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 = { -@@ -1671,6 +1703,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 -@@ -1774,6 +1808,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 -@@ -1821,6 +1857,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 = { -@@ -1871,6 +1908,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 = { diff --git a/src/patches/ddns-013-duckdns-new-api.patch b/src/patches/ddns-013-duckdns-new-api.patch deleted file mode 100644 index a671bf917..000000000 --- a/src/patches/ddns-013-duckdns-new-api.patch +++ /dev/null @@ -1,83 +0,0 @@ -commit ebdb37245e2033b065cce5a19597be4ef1c8875c -Author: Carl Mascott cmascott@yahoo.com -Date: Wed Dec 2 11:39:20 2020 +0100 - - DuckDNS: Update to use new API. - - The new API supports IPv6 and a token based auth. - - Reference #12415. - - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index 46d8a67..a1ca3f3 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -802,16 +802,62 @@ 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 -+ -+ 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 - -- url = "https://www.duckdns.org/nic/update" -+ # 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): diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch deleted file mode 100644 index f131c5b24..000000000 --- a/src/patches/ddns-013-dyfi-use-https.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit ce6e977f0ace7fe468411270ad07f1824a3aeaec -Author: Mauno Pirnes mauno.pirnes@hotmail.com -Date: Fri Feb 7 12:25:00 2020 +0100 - - dy.fi: Use HTTPS to perform updates. - - Signed-off-by: Mauno Pirnes mauno.pirnes@hotmail.com - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index dcdc5da..f1fed22 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -826,7 +826,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 diff --git a/src/patches/ddns-013-fix-argparse-list-token-providers.patch b/src/patches/ddns-013-fix-argparse-list-token-providers.patch deleted file mode 100644 index 065dbb666..000000000 --- a/src/patches/ddns-013-fix-argparse-list-token-providers.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 5e075681008174839a47cae698ae459c0ea3a30a -Author: Stefan Schantl stefan.schantl@ipfire.org -Date: Wed May 12 19:59:01 2021 +0200 - - Fix argsparse string for listing token providers. - - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/ddns.in b/ddns.in -index 538e4b0..20edd28 100755 ---- a/ddns.in -+++ b/ddns.in -@@ -49,8 +49,8 @@ def main(): - p_list_providers = subparsers.add_parser("list-providers", - help=_("List all available providers")) - -- # list-token-provider -- p_list_token_provider = subparsers.add_parser("list-token-provider", -+ # list-token-providers -+ p_list_token_provider = subparsers.add_parser("list-token-providers", - help=_("List all providers which supports authentication via token")) - - # update diff --git a/src/patches/ddns-013-proper-encode-string.patch b/src/patches/ddns-013-proper-encode-string.patch deleted file mode 100644 index b101913e8..000000000 --- a/src/patches/ddns-013-proper-encode-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 27aea61ba3c8e561c4a5921aeb0ea0986d4d234c -Author: Johannes Schwietzke johannes.schwietzke@web.de -Date: Tue Dec 29 12:07:19 2020 +0100 - - providers.py: Proper encode string. - - Python 3 memoryview requires an encoded string. - - Signed-off-by: Johannes Schwietzke johannes.schwietzke@web.de - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index b0066d5..56e6620 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -547,7 +547,7 @@ class DDNSProviderBindNsupdate(DDNSProvider): - - logger.debug(" %s" % line) - -- return "\n".join(scriptlet) -+ return "\n".join(scriptlet).encode() - - - class DDNSProviderChangeIP(DDNSProvider):