* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b1a6c9f6243c3ae687fd18297848cc8e7510fbc2
@ 2020-02-16 16:03 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2020-02-16 16:03 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 22136 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 (commit)
via 88cb5eb18744911513c08e851f945a548b324efc (commit)
via a8df6e7807528a475a958f0d8aa66494e59b1a8e (commit)
via 1466ab70c7bbbf477fbdef69117ada4251ff3a1a (commit)
via 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469 (commit)
via 56f4f279a5a5bfb2d919f2e603c8551f422e932f (commit)
via 130babccc8efbdd80a9358e1faf09faba6ee3e43 (commit)
via 08cf4d21540c4fe185db1f17ae365f7ab6adae27 (commit)
via f16ddb5fc74128e6387e736e4c7f66ace6d0b338 (commit)
via d553895700c1d4842cd62cceaea83f2fd0fd5195 (commit)
via 77ea7462bcc134b6147dd985abdd4e2311487515 (commit)
via 7b7789da2f79bf00c98139c17c18002388d4f0df (commit)
from c2c5bad960f03407b79e7b0afce45157363a55d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b1a6c9f6243c3ae687fd18297848cc8e7510fbc2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 16:02:56 2020 +0000
core142: add cloudinit helper to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 88cb5eb18744911513c08e851f945a548b324efc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:08 2020 +0000
cloud-init: Disable using ISP nameservers
This is mostly aesthetic because there are no ISP nameservers
anyways that we could use here.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a8df6e7807528a475a958f0d8aa66494e59b1a8e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:07 2020 +0000
aws-setup: Remove some excessive whitespace
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1466ab70c7bbbf477fbdef69117ada4251ff3a1a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:59:06 2020 +0000
core142: add dns.cgi to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 5 14:27:06 2020 +0000
dns.cgi: Do not show table header if no servers are configured
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 56f4f279a5a5bfb2d919f2e603c8551f422e932f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 4 08:59:33 2020 +0100
guardian: Add upstream patch for HTTP parser.
Fixes #12289.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 130babccc8efbdd80a9358e1faf09faba6ee3e43
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:55:15 2020 +0000
core142: add ddns to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 08cf4d21540c4fe185db1f17ae365f7ab6adae27
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Feb 7 12:32:46 2020 +0100
ddns: Import latest upstream patches for ddns-013
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f16ddb5fc74128e6387e736e4c7f66ace6d0b338
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jan 31 07:13:31 2020 +0100
ddns: Update to 013
This is an update to the first python3-based release of ddns.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d553895700c1d4842cd62cceaea83f2fd0fd5195
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 16 15:49:52 2020 +0000
core142: add proxy.cgi tp updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 77ea7462bcc134b6147dd985abdd4e2311487515
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Feb 7 12:06:39 2020 +0100
proxy.cgi: Switch to MD5 hashed passwords for local user auth.
The former used default Crypt algorithmus only supports passwords up to
eight signs wheater MD5 does not have any limitation here.
Fixes 12290.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7b7789da2f79bf00c98139c17c18002388d4f0df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Feb 6 11:34:27 2020 +0000
libpciaccess: Update to 0.16
There are not rootfile changes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/104 => core/142}/filelists/ddns | 0
config/rootfiles/core/142/filelists/files | 4 ++
html/cgi-bin/dns.cgi | 71 +++++++++++-----------
html/cgi-bin/proxy.cgi | 8 ++-
lfs/ddns | 9 ++-
lfs/guardian | 5 +-
lfs/libpciaccess | 10 +--
src/initscripts/helper/aws-setup | 5 +-
src/initscripts/helper/azure-setup | 3 +
src/patches/ddns-012-noip-fix-handle-name.patch | 36 -----------
src/patches/ddns-012-noip-rename-provider.patch | 65 --------------------
src/patches/ddns-013-dyfi-use-https.patch | 22 +++++++
src/patches/guardian-2.0.2-http-parser.patch | 45 ++++++++++++++
13 files changed, 133 insertions(+), 150 deletions(-)
copy config/rootfiles/{oldcore/104 => core/142}/filelists/ddns (100%)
delete mode 100644 src/patches/ddns-012-noip-fix-handle-name.patch
delete mode 100644 src/patches/ddns-012-noip-rename-provider.patch
create mode 100644 src/patches/ddns-013-dyfi-use-https.patch
create mode 100644 src/patches/guardian-2.0.2-http-parser.patch
Difference in files:
diff --git a/config/rootfiles/core/142/filelists/ddns b/config/rootfiles/core/142/filelists/ddns
new file mode 120000
index 000000000..739516420
--- /dev/null
+++ b/config/rootfiles/core/142/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 03d6bd379..12df9c26d 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -2,9 +2,13 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/helper/azure-setup
etc/suricata/suricata.yaml
lib/udev/network-hotplug-bridges
opt/pakfire/etc/pakfire.conf
opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/dns.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/suricata/ruleset-sources
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 4f3418a70..09fd50206 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -449,7 +449,7 @@ sub show_nameservers () {
$dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")";
}
-print <<END;
+ print <<END;
<table width='100%'>
<tr>
<td>
@@ -458,7 +458,36 @@ print <<END;
</td>
</tr>
</table>
+END
+
+ # Check the usage of ISP assigned nameservers is enabled.
+ my $id = 1;
+
+ # Loop through the array which stores the files.
+ foreach my $file (@ISP_nameserver_files) {
+ # Grab the address of the nameserver.
+ my $address = &General::grab_address_from_file($file);
+
+ # Check if we got an address.
+ if ($address) {
+ # Add the address to the hash of nameservers.
+ $dns_servers{$id} = [ "$address", "none",
+ ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
+ "$Lang::tr{'dns isp assigned nameserver'}" ];
+
+ # Increase id by one.
+ $id++;
+ }
+ }
+ # Check some DNS servers have been configured. In this case
+ # the hash contains at least one key.
+ my $server_amount;
+ if (keys %dns_servers) {
+ # Sort the keys by their ID and store them in an array.
+ my @keys = sort { $a <=> $b } keys %dns_servers;
+
+ print <<END;
<br>
<table class="tbl" width='100%'>
@@ -479,51 +508,23 @@ print <<END;
<strong>$Lang::tr{'remark'}</strong>
</td>
END
- # Check if the status should be displayed.
- if ($check_servers) {
-print <<END
+
+ # Check if the status should be displayed.
+ if ($check_servers) {
+ print <<END;
<td align="center">
<strong>$Lang::tr{'status'}</strong>
</td>
END
-;
- }
+ }
-print <<END
+ print <<END;
<td align="center" colspan="3">
<strong>$Lang::tr{'action'}</strong>
</td>
</tr>
END
-;
-
- # Check the usage of ISP assigned nameservers is enabled.
- my $id = 1;
-
- # Loop through the array which stores the files.
- foreach my $file (@ISP_nameserver_files) {
- # Grab the address of the nameserver.
- my $address = &General::grab_address_from_file($file);
-
- # Check if we got an address.
- if ($address) {
- # Add the address to the hash of nameservers.
- $dns_servers{$id} = [ "$address", "none",
- ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled",
- "$Lang::tr{'dns isp assigned nameserver'}" ];
-
- # Increase id by one.
- $id++;
- }
- }
-
- # Check some DNS servers have been configured. In this case
- # the hash contains at least one key.
- my $server_amount;
- if (keys %dns_servers) {
- # Sort the keys by their ID and store them in an array.
- my @keys = sort { $a <=> $b } keys %dns_servers;
# Loop through all entries of the array/hash.
foreach my $id (@keys) {
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index b63964081..06aca579b 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3945,7 +3945,13 @@ sub adduser
} else {
&deluser($str_user);
- my $htpasswd = new Apache::Htpasswd("$userdb");
+ my %htpasswd_options = (
+ passwdFile => "$userdb",
+ UseMD5 => 1,
+ );
+
+ my $htpasswd = new Apache::Htpasswd(\%htpasswd_options);
+
$htpasswd->htpasswd($str_user, $str_pass);
}
diff --git a/lfs/ddns b/lfs/ddns
index 47817c058..0e045ddc4 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
include Config
-VER = 012
+VER = 013
THISAPP = ddns-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7
+$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb
install : $(TARGET)
@@ -71,9 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- # Add upstream patch for fixing noip.com
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-rename-provider.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-fix-handle-name.patch
+ # Apply upstream patches.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure \
diff --git a/lfs/guardian b/lfs/guardian
index a40480c0c..3e2c3347f 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = guardian
-PAK_VER = 18
+PAK_VER = 19
DEPS = "perl-inotify2 perl-Net-IP"
@@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axvf $(DIR_DL)/$(DL_FILE)
+ # Add upstream patches.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/guardian-2.0.2-http-parser.patch
+
# Adjust path for firewall binaries.
cd $(DIR_APP) && sed -i "s|/usr/sbin/|/sbin/|g" modules/IPtables.pm
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
index 571a71d6f..dd109220c 100644
--- a/lfs/libpciaccess
+++ b/lfs/libpciaccess
@@ -24,15 +24,15 @@
include Config
-VER = 0.13.4
+VER = 0.16
THISAPP = libpciaccess-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libpciaccess
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4
+$(DL_FILE)_MD5 = b34e2cbdd6aa8f9cc3fa613fd401a6d6
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index cee78a283..884319822 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -212,10 +212,11 @@ import_aws_configuration() {
# Save CONFIG_TYPE
echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings
-
-
# Actions performed only on the very first start
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+ # Disable using ISP nameservers
+ sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings
+
# Enable SSH
sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings
diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
index d84ec3aca..291b8e0a4 100644
--- a/src/initscripts/helper/azure-setup
+++ b/src/initscripts/helper/azure-setup
@@ -240,6 +240,9 @@ import_azure_configuration() {
# Actions performed only on the very first start
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
+ # Disable using ISP nameservers
+ sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings
+
# Enable SSH
sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings
diff --git a/src/patches/ddns-012-noip-fix-handle-name.patch b/src/patches/ddns-012-noip-fix-handle-name.patch
deleted file mode 100644
index d1d281c34..000000000
--- a/src/patches/ddns-012-noip-fix-handle-name.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit c0277eeea2b2c1ed8f40f1248b28438e44e51912
-Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
-Date: Tue Nov 12 08:43:31 2019 +0100
-
- NoIP.com: Rename handle back to no-ip.com
-
- The old handle name is required for backward compatiblity.
-
- Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 528684f..61a608a 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -120,7 +120,7 @@
- # password = pass
-
- # [test.noip.org]
--# provider = noip.com
-+# provider = no-ip.com
- # username = user
- # password = pass
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index 4789107..661fbcc 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,7 +1344,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
-
-
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
-- handle = "noip.com"
-+ handle = "no-ip.com"
- name = "NoIP"
- website = "http://www.noip.com/"
- protocols = ("ipv4",)
diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch
deleted file mode 100644
index acc5e66a7..000000000
--- a/src/patches/ddns-012-noip-rename-provider.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445
-Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
-Date: Tue Nov 5 19:09:53 2019 +0100
-
- No-IP.com: Rename provider and handle to NoIP.com
-
- Fixes #11561.
-
- Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
-
-diff --git a/README b/README
-index 76f63bc..c75c448 100644
---- a/README
-+++ b/README
-@@ -75,7 +75,7 @@ SUPPORTED PROVIDERS:
- loopia.se
- myonlineportal.net
- namecheap.com
-- no-ip.com
-+ noip.com
- now-dns.com
- nsupdate.info
- opendns.com
-diff --git a/ddns.conf.sample b/ddns.conf.sample
-index 5b3b845..528684f 100644
---- a/ddns.conf.sample
-+++ b/ddns.conf.sample
-@@ -119,8 +119,8 @@
- # provider = namecheap.com
- # password = pass
-
--# [test.no-ip.org]
--# provider = no-ip.com
-+# [test.noip.org]
-+# provider = noip.com
- # username = user
- # password = pass
-
-diff --git a/src/ddns/providers.py b/src/ddns/providers.py
-index f3c62c1..4789107 100644
---- a/src/ddns/providers.py
-+++ b/src/ddns/providers.py
-@@ -1344,16 +1344,16 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider):
-
-
- class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider):
-- handle = "no-ip.com"
-- name = "No-IP"
-- website = "http://www.no-ip.com/"
-+ handle = "noip.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 = "http://dynupdate.noip.com/nic/update"
-
- def prepare_request_data(self, proto):
- assert proto == "ipv4"
diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch
new file mode 100644
index 000000000..f131c5b24
--- /dev/null
+++ b/src/patches/ddns-013-dyfi-use-https.patch
@@ -0,0 +1,22 @@
+commit ce6e977f0ace7fe468411270ad07f1824a3aeaec
+Author: Mauno Pirnes <mauno.pirnes(a)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(a)hotmail.com>
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)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/guardian-2.0.2-http-parser.patch b/src/patches/guardian-2.0.2-http-parser.patch
new file mode 100644
index 000000000..1ecae658c
--- /dev/null
+++ b/src/patches/guardian-2.0.2-http-parser.patch
@@ -0,0 +1,45 @@
+commit 5028c7fde1fa15e4960f2fec3c025d0338382895
+Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
+Date: Tue Feb 4 07:55:48 2020 +0100
+
+ Parser: Adjust HTTP parser to be compatible with newer log format.
+
+ Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
+
+diff --git a/modules/Parser.pm b/modules/Parser.pm
+index 3880228..bcca88f 100644
+--- a/modules/Parser.pm
++++ b/modules/Parser.pm
+@@ -302,7 +302,7 @@ sub message_parser_httpd (@) {
+ # been passed.
+ foreach my $line (@message) {
+ # This will catch brute-force attacks against htaccess logins (username).
+- if ($line =~ /.*\[error\] \[client (.*)\] user(.*) not found:.*/) {
++ if ($line =~ /.*\[client (.*)\] .* user(.*) not found:.*/) {
+ # Store the grabbed IP-address.
+ $address = $1;
+
+@@ -311,7 +311,7 @@ sub message_parser_httpd (@) {
+ }
+
+ # Detect htaccess password brute-forcing against a username.
+- elsif ($line =~ /.*\[error\] \[client (.*)\] user(.*): authentication failure for.*/) {
++ elsif ($line =~ /.*\[client (.*)\] .* user(.*): authentication failure for.*/) {
+ # Store the extracted IP-address.
+ $address = $1;
+
+@@ -321,6 +321,14 @@ sub message_parser_httpd (@) {
+
+ # Check if at least the IP-address information has been extracted.
+ if (defined ($address)) {
++ # Check if the address also contains a port value.
++ if ($address =~ m/:/) {
++ my ($add_address, $port) = split(/:/, $address);
++
++ # Only process the address.
++ $address = $add_address;
++ }
++
+ # Add the extracted values and event message to the actions array.
+ push(@actions, "count $address $name $message");
+ }
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-16 16:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-16 16:03 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox