Development January 2021

development@lists.ipfire.org

18 participants
78 discussions

[PATCH 1/2] sshfs: Update to 3.7.1
by Adolf Belka 09 Jan '21

09 Jan '21

- Update sshfs from 2.2 to 3.7.1 - Changelog is available at https://github.com/libfuse/sshfs/releases - Build had to be changed from autotools to meson/ninja - Change in rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.30.0

3 12

chrony
by Gerd Hoerst 07 Jan '21

07 Jan '21

hi ! as postet in community during last week i "made" packages chrony for ipfire. maybe you have to modify it for integration. I modified it running together with dcfshm and my DCF77 USB clock (i also run it on a Pi4 with an 8 dollar GPS Reveiver and PPS signal... Ciao Gerd

4 4

Forcing DNS/NTP V2 - new approach
by Matthias Fischer 07 Jan '21

07 Jan '21

Hi, since restarting the *whole* firewall through '/etc/rc.d/init.d/firewall restart' as I did before is NOT an option, I'm thinking about another - simpler way - to do this. As Michael wrote "There are plenty of temporary rules that are being created and which simply will get lost after restarting the firewall. Mainly this affects IPsec, but also QoS." For me - and of course for everybody who uses IPSec or QoS - this is a showstopper. Saving the affected - temporary rules - is too complicated (for me). I'm trying to make this as simple as possible. So I'm thinking about separating the DNS/NTP-commands and use them in a another init-file, apart from the firewall initscript. I just want to "go out of the way". ;-) As I see it, IPSec and QoS (e.g) would not be affected and furthermore we would perhaps have the choice to control some other settings through this file. E.g., the settings from '/var/ipfire/optionsfw/settings' are processed in various control files, see: https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… And perhaps that would give us the chance to tidy things up. Just a thought. So what about using an 'optionsfw' initscript for the DNS/NTP rules? This and *only* this file would be started through "Save and Restart' on 'optionsfw.cgi', using a new binary. As before, this would be 'optionsfwctrl(.c)', now just containing a call of '/etc/rc.d/init.d/optionsfw'. Controlling other settings could be added as needed. A complete firewall restart is NOT initiated. In this init, the existence of the needed values is first checked, and only processed if they exist (e.g.): ... if [ -z "$DNS_FORCE_ON_GREEN" ] && [ "$DNS_FORCE_ON_GREEN" == "on" ]; then ... The only affected chain is CUSTOMPREROUTING, so other functionalities/chains (IPSec, QoS) should not be affected. May I ask for your opinions? ;-) Best, Matthias

3 3

[PATCH 2/2] fuse: Update to 3.10.1
by Adolf Belka 06 Jan '21

06 Jan '21

- Update fuse from 2.9.7 to 3.10.1 - Update also required by sshfs update - Changelog is available at https://github.com/libfuse/libfuse/releases - Build had to be changed from autools to meson/ninja - Rootfiles changed - namespace conflict fix patch no longer required. Fix now built into kernel.h Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- config/rootfiles/common/fuse | 69 +++++++++++-------- lfs/fuse | 20 +++--- .../fuse-2.9.2-namespace-conflict-fix.patch | 21 ------ 3 files changed, 50 insertions(+), 60 deletions(-) delete mode 100644 src/patches/fuse-2.9.2-namespace-conflict-fix.patch diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index 2cd91cb0c..ec5200a1c 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -1,30 +1,39 @@ -#etc/rc.d/init.d/fuse -etc/udev/rules.d/99-fuse.rules -sbin/mount.fuse -usr/bin/fusermount -usr/bin/ulockmgr_server -#usr/include/fuse -#usr/include/fuse.h -#usr/include/fuse/cuse_lowlevel.h -#usr/include/fuse/fuse.h -#usr/include/fuse/fuse_common.h -#usr/include/fuse/fuse_common_compat.h -#usr/include/fuse/fuse_compat.h -#usr/include/fuse/fuse_lowlevel.h -#usr/include/fuse/fuse_lowlevel_compat.h -#usr/include/fuse/fuse_opt.h -#usr/include/ulockmgr.h -#usr/lib/libfuse.a -#usr/lib/libfuse.la -usr/lib/libfuse.so -usr/lib/libfuse.so.2 -usr/lib/libfuse.so.2.9.7 -#usr/lib/libulockmgr.a -#usr/lib/libulockmgr.la -usr/lib/libulockmgr.so -usr/lib/libulockmgr.so.1 -usr/lib/libulockmgr.so.1.0.1 -#usr/lib/pkgconfig/fuse.pc -#usr/share/man/man1/fusermount.1 -#usr/share/man/man1/ulockmgr_server.1 -#usr/share/man/man8/mount.fuse.8 +#etc/rc.d/init.d/fuse3 +#lib/udev/rules.d/99-fuse3.rules +etc/udev/rules.d/99-fuse3.rules +sbin/mount.fuse3 +usr/bin/fusermount3 +#usr/local/bin/fusermount3 +#usr/local/etc +#usr/local/etc/fuse.conf +#usr/local/include/fuse3 +#usr/local/include/fuse3/cuse_lowlevel.h +#usr/local/include/fuse3/fuse.h +#usr/local/include/fuse3/fuse_common.h +#usr/local/include/fuse3/fuse_log.h +#usr/local/include/fuse3/fuse_lowlevel.h +#usr/local/include/fuse3/fuse_opt.h +#usr/local/lib/libfuse3.so +#usr/local/lib/libfuse3.so.3 +#usr/local/lib/libfuse3.so.3.10.1 +#usr/local/lib/pkgconfig +#usr/local/lib/pkgconfig/fuse3.pc +#usr/local/sbin/mount.fuse3 +#usr/local/share/man/man1/fusermount3.1 +#usr/local/share/man/man8/mount.fuse3.8 +#etc/fuse.conf +#usr/include/fuse3 +#usr/include/fuse3/cuse_lowlevel.h +#usr/include/fuse3/fuse.h +#usr/include/fuse3/fuse_common.h +#usr/include/fuse3/fuse_log.h +#usr/include/fuse3/fuse_lowlevel.h +#usr/include/fuse3/fuse_opt.h +#usr/lib/libfuse3.so +usr/lib/libfuse3.so.3 +usr/lib/libfuse3.so.3.10.1 +#usr/lib/pkgconfig/fuse3.pc +#usr/sbin/mount.fuse3 +#usr/share/man/man1/fusermount3.1 +#usr/share/man/man8/mount.fuse3.8 + diff --git a/lfs/fuse b/lfs/fuse index db649a880..167612f68 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -24,10 +24,10 @@ include Config -VER = 2.9.7 +VER = 3.10.1 THISAPP = fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9bd4ce8184745fd3d000ca2692adacdb +$(DL_FILE)_MD5 = e973012119e98b048307558271b5b296 install : $(TARGET) @@ -72,12 +72,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch - cd $(DIR_APP) && ./configure \ - --prefix=/usr + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install + + # Move mount.fuse3 to same location as mount.fuse was in previous version + mv -v /usr/sbin/mount.fuse3 /sbin + + # Move 99-fuse3 rules to same udev location as in previous version of fuse + mv -v /lib/udev/rules.d/99-fuse3.rules /etc/udev/rules.d - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/fuse-2.9.2-namespace-conflict-fix.patch b/src/patches/fuse-2.9.2-namespace-conflict-fix.patch deleted file mode 100644 index ae67e7d45..000000000 --- a/src/patches/fuse-2.9.2-namespace-conflict-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h ---- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400 -+++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400 -@@ -88,12 +88,16 @@ - #ifndef _LINUX_FUSE_H - #define _LINUX_FUSE_H - --#include <sys/types.h> -+#ifdef __linux__ -+#include <linux/types.h> -+#else -+#include <stdint.h> - #define __u64 uint64_t - #define __s64 int64_t - #define __u32 uint32_t - #define __s32 int32_t - #define __u16 uint16_t -+#endif - - /* - * Version negotiation: -- 2.30.0

2 1

[PATCHv2] ddns: Add latest upstream patches.
by Stefan Schantl 06 Jan '21

06 Jan '21

* Add patch to support listing of token providers. * Add fix to proper encode python string. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 2 + ...13-add-option-to-list-token-provider.patch | 292 ++++++++++++++++++ .../ddns-013-proper-encode-string.patch | 24 ++ 3 files changed, 318 insertions(+) create mode 100644 src/patches/ddns-013-add-option-to-list-token-provider.patch create mode 100644 src/patches/ddns-013-proper-encode-string.patch diff --git a/lfs/ddns b/lfs/ddns index 2a6dbca2b..98b374ed1 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -75,6 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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) && [ -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 new file mode 100644 index 000000000..7603422a2 --- /dev/null +++ b/src/patches/ddns-013-add-option-to-list-token-provider.patch @@ -0,0 +1,292 @@ +commit 287b2bfe7bf5e0639da9227a8c7893ce40d298ae +Author: Stefan Schantl <stefan.schantl(a)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(a)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-proper-encode-string.patch b/src/patches/ddns-013-proper-encode-string.patch new file mode 100644 index 000000000..b101913e8 --- /dev/null +++ b/src/patches/ddns-013-proper-encode-string.patch @@ -0,0 +1,24 @@ +commit 27aea61ba3c8e561c4a5921aeb0ea0986d4d234c +Author: Johannes Schwietzke <johannes.schwietzke(a)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(a)web.de> + Signed-off-by: Stefan Schantl <stefan.schantl(a)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): -- 2.20.1

2 3

[PATCH 1/4] zoneconf.cgi: Change NIC display order, improve code
by Leo-Andres Hofmann 06 Jan '21

06 Jan '21

Refactor duplicate perl code and add comments Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- html/cgi-bin/zoneconf.cgi | 53 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index 0914ceb78..bf46ab0c7 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -26,6 +26,7 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +###--- HTML HEAD ---### my $extraHead = <<END <style> table#zoneconf { @@ -105,7 +106,9 @@ my $extraHead = <<END <script src="/include/zoneconf.js"></script> END ; +###--- END HTML HEAD ---### +### Read configuration ### my %ethsettings = (); my %vlansettings = (); my %cgiparams = (); @@ -119,7 +122,7 @@ my $restart_notice = ""; &Header::showhttpheaders(); # Define all zones we will check for NIC assignment -my @zones = ("green", "red", "orange", "blue"); +my @zones = ("red", "green", "orange", "blue"); # Get all physical NICs present opendir(my $dh, "/sys/class/net/"); @@ -153,6 +156,21 @@ foreach (@nics) { } } +### Functions ### + +# Check if a zone is in IP mode or in PPP, PPPoE, VDSL, ... mode +sub is_zonetype_ip { + my $zone_type = shift; + return ($zone_type eq "STATIC" || $zone_type eq "DHCP"); +} + +# Check if a zone is activated (device assigned) +sub is_zone_activated { + my $zone = uc shift; + return ($ethsettings{"${zone}_DEV"} ne ""); +} + +### START PAGE ### &Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead); &Header::openbigbox('100%', 'center'); @@ -195,6 +213,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { } } + # skip NIC/VLAN assignment and additional zone options for RED in PPP mode next; } @@ -278,6 +297,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { } } + # validation failed, show error message and exit if ($VALIDATE_error) { &Header::openbox('100%', 'left', $Lang::tr{"error"}); @@ -290,16 +310,17 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { exit 0; } + # new settings are valid, write configuration files &General::writehash("${General::swroot}/ethernet/settings",\%ethsettings); &General::writehash("${General::swroot}/ethernet/vlans",\%vlansettings); $restart_notice = $Lang::tr{'zoneconf notice reboot'}; } -&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"}); - ### START OF TABLE ### +&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"}); + print <<END <form method='post' enctype='multipart/form-data'> <table id="zoneconf"> @@ -311,19 +332,16 @@ END # Fill the table header with all activated zones foreach (@zones) { my $uc = uc $_; - my $dev_name = $ethsettings{"${uc}_DEV"}; - if ($dev_name eq "") { # If the zone is not activated, don't show it - next; - } + # If the zone is not activated, don't show it + next unless is_zone_activated($_); - # If the zone is in PPP mode, don't show a mode dropdown + # If the red zone is in PPP mode, don't show a mode dropdown if ($uc eq "RED") { my $red_type = $ethsettings{"RED_TYPE"}; - my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); - if ($red_restricted) { - print "\t\t<td class='heading $_'>$uc ($red_type)</td>\n"; + unless (is_zonetype_ip($red_type)) { + print "\t\t<td class='heading bold $_'>$uc ($red_type)</td>\n"; next; # We're done here } @@ -354,6 +372,7 @@ END print "\t</tr>\n"; +# NIC assignment matrix foreach (@nics) { my $mac = $_->[0]; my $nic = $_->[1]; @@ -365,19 +384,14 @@ foreach (@nics) { # Iterate through all zones and check if the current NIC is assigned to it foreach (@zones) { my $uc = uc $_; - my $dev_name = $ethsettings{"${uc}_DEV"}; my $highlight = ""; - if ($dev_name eq "") { # Again, skip the zone if it is not activated - next; - } + # If the zone is not activated, don't show it + next unless is_zone_activated($_); if ($uc eq "RED") { - my $red_type = $ethsettings{"RED_TYPE"}; - my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); - # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ... - if ($red_restricted) { + unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) { my $checked = ""; if ($mac eq $ethsettings{"${uc}_MACADDR"}) { @@ -449,6 +463,7 @@ END print "\t</tr>\n"; } +# footer and submit button print <<END </table> -- 2.27.0.windows.1

4 9

[PATCH 1/3] wireless client: Add support for WPA3
by Michael Tremer 06 Jan '21

06 Jan '21

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 8 ++++++++ html/cgi-bin/wirelessclient.cgi | 5 +++-- langs/en/cgi-bin/en.pl | 1 + src/initscripts/system/wlanclient | 15 ++++++++++++++- 13 files changed, 35 insertions(+), 3 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 6d22fcea4..5d9cbcebc 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -887,6 +887,7 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: user management = User Management WARNING: untranslated string: winbind daemon = Winbind Daemon +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index b3c46de5e..c1e0ec33f 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2124,6 +2124,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.es b/doc/language_issues.es index 9f62f03f2..9c41d68be 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1499,6 +1499,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 90a745360..aad3667c4 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -921,3 +921,4 @@ WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) WARNING: untranslated string: whois results from = WHOIS results from +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 diff --git a/doc/language_issues.it b/doc/language_issues.it index 62e4f9953..83229dad2 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1191,6 +1191,7 @@ WARNING: untranslated string: wlan client eap authentication method = EAP Authen WARNING: untranslated string: wlan client eap phase2 method = EAP Phase 2 Method WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9a767322e..fc5915883 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1232,6 +1232,7 @@ WARNING: untranslated string: wlan client eap authentication method = EAP Authen WARNING: untranslated string: wlan client eap phase2 method = EAP Phase 2 Method WARNING: untranslated string: wlan client eap state = EAP Status WARNING: untranslated string: wlan client encryption eap = EAP +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client identity = Identity WARNING: untranslated string: wlan client method = Method WARNING: untranslated string: wlan client password = Password diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9f62f03f2..9c41d68be 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1499,6 +1499,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 5d16e0b18..3ec377f5e 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1492,6 +1492,7 @@ WARNING: untranslated string: wlan client encryption none = None WARNING: untranslated string: wlan client encryption wep = WEP WARNING: untranslated string: wlan client encryption wpa = WPA WARNING: untranslated string: wlan client encryption wpa2 = WPA2 +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlan client group cipher = Group cipher WARNING: untranslated string: wlan client group key algorithm = GKA WARNING: untranslated string: wlan client identity = Identity diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 26530a923..3c6b44a63 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1061,6 +1061,7 @@ WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: whois results from = WHOIS results from WARNING: untranslated string: winbind daemon = Winbind Daemon +WARNING: untranslated string: wlan client encryption wpa3 = WPA3 WARNING: untranslated string: wlanap 802.11w disabled = Disabled WARNING: untranslated string: wlanap 802.11w enforced = Enforced WARNING: untranslated string: wlanap 802.11w optional = Optional diff --git a/doc/language_missings b/doc/language_missings index 12e341402..946d7d1fe 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -64,6 +64,7 @@ < wlanap 802.11w disabled < wlanap 802.11w enforced < wlanap 802.11w optional +< wlan client encryption wpa3 ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ @@ -917,6 +918,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -973,6 +975,7 @@ < tor use guard nodes < upload fcdsl.o < whois results from +< wlan client encryption wpa3 ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1332,6 +1335,7 @@ < wlan client eap phase2 method < wlan client eap state < wlan client encryption eap +< wlan client encryption wpa3 < wlan client identity < wlan client method < wlan client password @@ -1767,6 +1771,7 @@ < wlan client eap phase2 method < wlan client eap state < wlan client encryption eap +< wlan client encryption wpa3 < wlan client identity < wlan client method < wlan client password @@ -2625,6 +2630,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -3506,6 +3512,7 @@ < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 +< wlan client encryption wpa3 < wlan client group cipher < wlan client group key algorithm < wlan client identity @@ -3714,6 +3721,7 @@ < wlanap neighbor scan < wlanap neighbor scan warning < wlanap ssid +< wlan client encryption wpa3 < working < zoneconf access native < zoneconf access none diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index bbb71a984..440a9e887 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -462,6 +462,7 @@ sub showEditBox() { my %selected = (); $selected{'ENCRYPTION'} = (); $selected{'ENCRYPTION'}{'NONE'} = ''; + $selected{'ENCRYPTION'}{'WPA3'} = ''; $selected{'ENCRYPTION'}{'WPA2'} = ''; $selected{'ENCRYPTION'}{'WPA'} = ''; $selected{'ENCRYPTION'}{'WEP'} = ''; @@ -505,9 +506,10 @@ sub showEditBox() { <select name='ENCRYPTION'> <option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option> <option value="EAP" $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option> + <option value="WPA3" $selected{'ENCRYPTION'}{'WPA3'}>$Lang::tr{'wlan client encryption wpa3'}</option> <option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option> <option value="WPA" $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option> - <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> + <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> </select> </td> <td colspan="2" width='40%'></td> @@ -839,7 +841,6 @@ sub ValidateInput($) { # Check for invalid key length. } elsif (ValidKeyLength($settings{'ENCRYPTION'}, $settings{'PSK'})) { return "$Lang::tr{'wlan client invalid key length'}"; - } # Reset WPA mode, if WPA(2) is not selected. diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b5284effa..9190eab57 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2948,6 +2948,7 @@ 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', +'wlan client encryption wpa3' => 'WPA3', 'wlan client group cipher' => 'Group cipher', 'wlan client group key algorithm' => 'GKA', 'wlan client identity' => 'Identity', diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient index b32a4cb4a..27a144f72 100644 --- a/src/initscripts/system/wlanclient +++ b/src/initscripts/system/wlanclient @@ -86,6 +86,7 @@ function wpa_supplicant_config_line() { local config=${2} shift 2 + local ieee80211w local anonymous_identity local auth_alg local auth_mode @@ -144,6 +145,11 @@ function wpa_supplicant_config_line() { EAP) key_mgmt="WPA-EAP" ;; + WPA3) + key_mgmt="SAE" + + ieee80211w="2" + ;; WPA2) auth_alg="OPEN" proto="RSN" @@ -209,7 +215,11 @@ function wpa_supplicant_config_line() { echo " key_mgmt=${key_mgmt}" fi if [ -n "${psk}" ]; then - echo " psk=\"${psk}\"" + if [ "${key_mgmt}" = "SAE" ]; then + echo " sae_password=\"${psk}\"" + else + echo " psk=\"${psk}\"" + fi fi if [ -n "${wep_tx_keyidx}" ]; then echo " wep_tx_keyidx=${wep_tx_keyidx}" @@ -227,6 +237,9 @@ function wpa_supplicant_config_line() { if [ -n "${priority}" ]; then echo " priority=${priority}" fi + if [ -n "${ieee80211w}" ]; then + echo " ieee80211w=${ieee80211w}" + fi # EAP if [ "${mode}" = "EAP" ]; then -- 2.20.1

1 2

[PATCHv2] ddns.cgi: Make dealing with auth tokens more user-friendly.
by Stefan Schantl 06 Jan '21

06 Jan '21

If a provider supports authentication with a token, now the username and password fileds will be swapped by some Java Script code in favour of an input field for the token. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/ddns.cgi | 112 ++++++++++++++++++++++++++++++++++++----- langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 2 + 3 files changed, 104 insertions(+), 12 deletions(-) diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 024eaf7f6..9b58db895 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -59,14 +59,18 @@ $settings{'HOSTNAME'} = ''; $settings{'DOMAIN'} = ''; $settings{'LOGIN'} = ''; $settings{'PASSWORD'} = ''; +$settings{'TOKEN'} = ''; $settings{'ENABLED'} = ''; $settings{'PROXY'} = ''; $settings{'SERVICE'} = ''; $settings{'ACTION'} = ''; -# Get supported ddns providers. -my @providers = &GetProviders(); +# Get all supported ddns providers. +my @providers = &GetProviders("all"); + +# Get provider which support a token based authentication mechanism. +my @token_provider = &GetProviders("token-providers"); # Hook to regenerate the configuration files, if cgi got called from command line. if ($ENV{"REMOTE_ADDR"} eq "") { @@ -178,6 +182,11 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: $errormessage = $Lang::tr{'password not set'}; } + # Check if a token has been given for provider which support tokens. + if (($settings{'SERVICE'} ~~ @token_provider) && ($settings{'TOKEN'} eq '')) { + $errormessage = $Lang::tr{'token not set'}; + } + # Go furter if there was no error. if (!$errormessage) { # Splitt hostname field into 2 parts for storrage. @@ -189,6 +198,16 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: $settings{'ENABLED'} = 'off'; } + # Handle token provider. + if($settings{'SERVICE'} ~~ @token_provider) { + # Clear username and password if they contain values. + undef($settings{'LOGIN'}); + undef($settings{'PASSWORD'}); + + # Assign the token as a password for saving. + $settings{'PASSWORD'} = $settings{'TOKEN'}; + } + # Handle adding new accounts. if ($settings{'ACTION'} eq $Lang::tr{'add'}) { # Open /var/ipfire/ddns/config for writing. @@ -234,7 +253,8 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Write out notice to logfile. &General::log($Lang::tr{'ddns hostname modified'}); } - undef $settings{'ID'}; + # Clear settings hash. + %settings = ''; # Update ddns config file. &GenerateDDNSConfigFile(); @@ -307,6 +327,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'WILDCARDS'} = $temp[4]; $settings{'LOGIN'} = $temp[5]; $settings{'PASSWORD'} = $temp[6]; + $settings{'TOKEN'} = $temp[6]; $settings{'ENABLED'} = $temp[7]; } @@ -334,6 +355,58 @@ if (!$settings{'ACTION'}) { } &Header::openpage($Lang::tr{'dynamic dns'}, 1, ''); + +### Java Script ### +print"<script>\n"; + +# Generate Java Script Array which contains the provider that support token. +my $line = ""; +$line = join("', '", @token_provider); + +print "\t// Array which contains the providers that support token.\n"; +print "\ttoken_provider = ['$line']\;\n\n"; + +print <<END + // Java Script function to swap the text input fields for + // username and password or token. + var update_auth = function() { + if(inArray(\$('#SERVICE').val(), token_provider)) { + \$('.username').hide(); + \$('.password').hide(); + \$('.token').show(); + } else { + \$('.username').show(); + \$('.password').show(); + \$('.token').hide(); + } + }; + + // Java Script function to check if a given value is part of + // an array. + function inArray(value,array) { + var count=array.length; + + for(var i=0;i<count;i++) { + if(array[i]===value){ + return true; + } + } + + return false; + } + + // JQuery function to call corresponding function when + // the service provider is changed or the page is loaded for showing/hiding + // the username/password or token area. + \$(document).ready(function() { + \$('#SERVICE').change(update_auth); + update_auth(); + }); + +</script> +END +; + &Header::openbigbox('100%', 'left', '', $errormessage); # Read file for general ddns settings. @@ -414,7 +487,7 @@ print <<END END ; # Generate dropdown menu for service selection. - print"<select size='1' name='SERVICE'>\n"; + print"<select size='1' name='SERVICE' id='SERVICE'>\n"; my $selected; @@ -440,11 +513,15 @@ print <<END <tr> <td class='base'>$Lang::tr{'enabled'}</td> <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> - <td class='base'>$Lang::tr{'username'}</td> - <td><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td> + + <td class='username'>$Lang::tr{'username'}</td> + <td class='username'><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td> + + <td class='token' style='display:none'>$Lang::tr{'token'}</td> + <td class='token' style='display:none'><input type='text' name='TOKEN' value='$settings{'TOKEN'}' /></td> </tr> - <tr> + <tr class='password'> <td class='base'></td> <td></td> <td class='base'>$Lang::tr{'password'}</td> @@ -665,8 +742,8 @@ sub GenerateDDNSConfigFile { my $use_token = 0; - # Check if token based auth is configured. - if ($username eq "token") { + # Handle token based auth for various providers. + if ($provider ~~ @token_provider) { $use_token = 1; } @@ -707,9 +784,20 @@ sub GenerateDDNSConfigFile { } # Function which generates an array (@providers) which contains the supported providers. -sub GetProviders { - # Get supported providers. - open(PROVIDERS, "/usr/bin/ddns list-providers |"); +sub GetProviders ($) { + my ($type) = @_; + + # Set default type to get all providers + $type = $type ? $type : "all"; + + # Check if the requested type is "token-providers". + if ($type eq "token-providers") { + # Call ddns util to only get providers which supports token based auth. + open(PROVIDERS, "/usr/bin/ddns list-token-providers |"); + } else { + # Get all supported providers. + open(PROVIDERS, "/usr/bin/ddns list-providers |"); + } # Create new array to store the providers. my @providers = (); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 87181c184..307b8a97c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2374,6 +2374,8 @@ 'to warn email bad' => 'An E-Mail-Adresse ist nicht gültig', 'toggle' => 'Pause/Resume', 'toggle enable disable' => 'Aktivieren oder Deaktivieren', +'token' => 'Token:', +'token not set' => 'Kein Token angegeben.', 'tone' => 'Ton', 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 625c6899f..4d23f7aac 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2412,6 +2412,8 @@ 'to warn email bad' => 'To e-mail address is not valid', 'toggle' => 'pause/resume', 'toggle enable disable' => 'Enable or disable', +'token' => 'Token:', +'token not set' => 'No Token has been given.', 'tone' => 'Tone', 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', -- 2.20.1

1 0

[PATCH] ddns: Add latest upstream patches.
by Stefan Schantl 06 Jan '21

06 Jan '21

1 0

[PATCH] iproute2: Update to 5.10.0
by Adolf Belka 06 Jan '21

06 Jan '21

- Update from 5.8.0 to 5.10.0 - No changelog available - No changes to the rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- lfs/iproute2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/iproute2 b/lfs/iproute2 index 53fd4a59e..27e246d23 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 5.8.0 +VER = 5.10.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e2016acc07d91b2508916c459a8435af +$(DL_FILE)_MD5 = 19ffea480a21e600453776b7225f3319 install : $(TARGET) -- 2.30.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development January 2021