]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/log
people/stevee/ipfire-2.x.git
3 years agoshowrequestfromblocklist.dat: Modify regex for added space in ipblocklist
Rob Brewer [Sat, 5 Mar 2022 21:18:42 +0000 (21:18 +0000)] 
showrequestfromblocklist.dat: Modify regex for added space in
log-prefix.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.dat: Do not rely on any theme settings.
Rob Brewer [Sun, 3 Apr 2022 08:55:34 +0000 (10:55 +0200)] 
ipblocklist.dat: Do not rely on any theme settings.

The support for themes has been removed since ages, so we
do not need this anymore and may crash the page.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Add space at the end of the log prefix.
Rob Brewer [Sun, 3 Apr 2022 08:52:56 +0000 (10:52 +0200)] 
rules.pl: Add space at the end of the log prefix.

This improves the readabiliy when digging through the logs.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoupdate-ipblocklist: Add code to reload updated blocklists.
Stefan Schantl [Mon, 7 Mar 2022 18:54:44 +0000 (19:54 +0100)] 
update-ipblocklist: Add code to reload updated blocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Mark and display a notice about a required reload of
Stefan Schantl [Sun, 6 Mar 2022 20:16:07 +0000 (21:16 +0100)] 
ipblocklist.cgi: Mark and display a notice about a required reload of
the firewall.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Add better messages in error case.
Stefan Schantl [Sun, 6 Mar 2022 20:15:18 +0000 (21:15 +0100)] 
ipblocklist.cgi: Add better messages in error case.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agologs.cgi/log.dat: Allow to show logged ipblocklist messages.
Tim FitzGeorge [Sun, 6 Mar 2022 20:03:20 +0000 (21:03 +0100)] 
logs.cgi/log.dat: Allow to show logged ipblocklist messages.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMenu: Add ipblocklist entry to firewall menu.
Tim FitzGeorge [Sun, 6 Mar 2022 20:01:44 +0000 (21:01 +0100)] 
Menu: Add ipblocklist entry to firewall menu.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMenu: Add ipblocklist entry to log menu.
Tim FitzGeorge [Sun, 6 Mar 2022 19:58:19 +0000 (20:58 +0100)] 
Menu: Add ipblocklist entry to log menu.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklists.dat: Remove uneccessary and broken module includes.
Rob Brewer [Sun, 6 Mar 2022 19:55:25 +0000 (20:55 +0100)] 
ipblocklists.dat: Remove uneccessary and broken module includes.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoLanguage file update for ipblocklist
Tim FitzGeorge [Sun, 6 Mar 2022 19:53:07 +0000 (20:53 +0100)] 
Language file update for ipblocklist

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblacklist: WUI Log details page
Tim FitzGeorge [Mon, 27 Apr 2020 14:06:14 +0000 (15:06 +0100)] 
ipblacklist: WUI Log details page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: WUI Log page
Tim FitzGeorge [Mon, 27 Apr 2020 14:05:16 +0000 (15:05 +0100)] 
ipblocklist: WUI Log page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Adjust CGI to work with backend from ipblocklist-functions.pl
Stefan Schantl [Sun, 6 Mar 2022 19:23:55 +0000 (20:23 +0100)] 
ipblocklist.cgi: Adjust CGI to work with backend from ipblocklist-functions.pl

* Slightly adjust code indention.
* Remove Java Script code for show/hiding.
* Remove unnedded functions.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: WUI Settings page
Tim FitzGeorge [Mon, 27 Apr 2020 14:04:38 +0000 (15:04 +0100)] 
ipblocklist: WUI Settings page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
3 years agoipblocklist-update: Introduce script to automatically update blacklists.
Stefan Schantl [Sun, 6 Mar 2022 14:11:48 +0000 (15:11 +0100)] 
ipblocklist-update: Introduce script to automatically update blacklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Allow export of modified_file and
Stefan Schantl [Sun, 6 Mar 2022 14:09:58 +0000 (15:09 +0100)] 
ipblocklist-functions.pl: Allow export of modified_file and
blocklist_dir values.

They so easily can be accessed by other perl scripts.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Store the local time if no last modified could
Stefan Schantl [Sun, 6 Mar 2022 14:09:18 +0000 (15:09 +0100)] 
ipblocklist-functions.pl: Store the local time if no last modified could
be determined.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add function to get the holdoff_rate of a
Tim FitzGeorge [Sun, 6 Mar 2022 14:07:17 +0000 (15:07 +0100)] 
ipblocklist-functions.pl: Add function to get the holdoff_rate of a
given list.

The function will return the rate in seconds based on the configured
rate value in the blocklist sources file and the given blocklist.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Add code to deal with ipblocklists.
Stefan Schantl [Tue, 1 Mar 2022 16:36:51 +0000 (17:36 +0100)] 
rules.pl: Add code to deal with ipblocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Abort and return code if a list is empty or
Stefan Schantl [Sat, 5 Mar 2022 09:01:24 +0000 (10:01 +0100)] 
ipblocklist-functions.pl: Abort and return code if a list is empty or
not parse-able.

In case the downloaded list is empty or the parser is not able to parse
it properly, the download_and_create_blocklist() function now exits and
will return "empty_list" as new error code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add helper function to proper calculate the
Tim FitzGeorge [Fri, 4 Mar 2022 21:11:48 +0000 (22:11 +0100)] 
ipblocklist-functions.pl: Add helper function to proper calculate the
hashsize.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add parser of dshield.
Tim FitzGeorge [Fri, 4 Mar 2022 21:10:29 +0000 (22:10 +0100)] 
ipblocklist-functions.pl: Add parser of dshield.

This vendor has a different list format and therefore requires an
own parser.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add parser to obtain IP or Net addresses from
Tim FitzGeorge [Fri, 4 Mar 2022 21:08:16 +0000 (22:08 +0100)] 
ipblocklist-functions.pl: Add parser to obtain IP or Net addresses from
a blocklist.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add download_and_create_blocklist function.
Stefan Schantl [Fri, 4 Mar 2022 20:57:03 +0000 (21:57 +0100)] 
ipblocklist-functions.pl: Add download_and_create_blocklist function.

This function is responisible for downloading and converting the
blocklist into an ipset compatible format.

The only required argument is the blocklist (in upper letter format) which should be
performed. It automatically will setup an upstream proxy (if configured)
and grab the file specified in the blocklist vendor configuration hash.

There is a maximum amount of five attempts until the script gives up and
returns a "dl_error". In case the server responses with "Not Modified"
(Code 304) a "not_modified" will be returned.

If the blocklist successfully has been grabbed, the modification date
get stored for further purposes and the list content will be converted
and stored in an ipset compatible format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Inspired-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
3 years agoipblocklist-functions.pl: Add get_ipset_db_file() function.
Stefan Schantl [Tue, 1 Mar 2022 16:35:20 +0000 (17:35 +0100)] 
ipblocklist-functions.pl: Add get_ipset_db_file() function.

This function is used to generate the filename and full path
for a given blocklist name.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Initial commit.
Stefan Schantl [Tue, 1 Mar 2022 14:23:44 +0000 (15:23 +0100)] 
ipblocklist-functions.pl: Initial commit.

This library file will contain a collection of functions, which are
required to deal with the ipblocklist feature.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: Add sources file.
Tim FitzGeorge [Tue, 1 Mar 2022 14:31:58 +0000 (15:31 +0100)] 
ipblocklist: Add sources file.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMerge branch 'central-ipset' into ipblocklist
Stefan Schantl [Sat, 5 Mar 2022 18:32:41 +0000 (19:32 +0100)] 
Merge branch 'central-ipset' into ipblocklist

3 years agofirewall-lib.pl: Remove prefix when dealing with ipset sets.
Stefan Schantl [Wed, 2 Mar 2022 19:41:52 +0000 (20:41 +0100)] 
firewall-lib.pl: Remove prefix when dealing with ipset sets.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Autodetect ipset db file to restore. central-ipset
Stefan Schantl [Tue, 1 Mar 2022 14:04:58 +0000 (15:04 +0100)] 
rules.pl: Autodetect ipset db file to restore.

This commit allows the ipset_restore() function to auto-detect
which set file needs to be restored.

Currently it is limitated to country codes only, because we currently
does not support anything else.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agosuricata: drop unsupported JA3 rule provider
Arne Fitzenreiter [Sat, 26 Feb 2022 14:19:45 +0000 (14:19 +0000)] 
suricata: drop unsupported JA3 rule provider

our current suricata version not support JA3 based rules so
this drop the providers from the list.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agofirewall: Move dropping hostile networks to rules.pl.
Stefan Schantl [Thu, 24 Feb 2022 17:48:28 +0000 (18:48 +0100)] 
firewall: Move dropping hostile networks to rules.pl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Allow dynamic destory of loaded but unused ipset sets.
Stefan Schantl [Thu, 24 Feb 2022 17:02:54 +0000 (18:02 +0100)] 
rules.pl: Allow dynamic destory of loaded but unused ipset sets.

Instead of stupidly destroying all ipsets, we now grab the already loaded sets
and compare them with the loaded sets during runtime of the script.

So we are now able to determine which sets are not longer required and
safely can destroy (unload) at a later time.

This saves us from taking care about dropping/flushing rules which are
based on ipset before we can destroy them - because only unused sets are
affected.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Inspired-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
3 years agocore164: exclude boot/uEnv.txt
Arne Fitzenreiter [Tue, 22 Feb 2022 11:38:15 +0000 (11:38 +0000)] 
core164: exclude boot/uEnv.txt

uEnv.txt was destroyed on aarch64 because here a new u-boot was shipped.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Stefan Schantl [Tue, 22 Feb 2022 04:54:19 +0000 (05:54 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

3 years agoCore Update 165: Ship oci-setup initscript
Peter Müller [Mon, 21 Feb 2022 21:36:18 +0000 (21:36 +0000)] 
Core Update 165: Ship oci-setup initscript

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agooci: user-data: Try to decode base64 content
Michael Tremer [Mon, 21 Feb 2022 17:24:56 +0000 (17:24 +0000)] 
oci: user-data: Try to decode base64 content

Terraform only supports sending any shell scripts encoded in base64
which is however not required by Oracle. Therefore we have to test if
the script is encoded or not.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agosamba: Fix rootfiles on ARM
Peter Müller [Mon, 21 Feb 2022 21:28:03 +0000 (21:28 +0000)] 
samba: Fix rootfiles on ARM

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agooci-cli: Depend on python3-jmespath
Michael Tremer [Mon, 21 Feb 2022 18:43:18 +0000 (18:43 +0000)] 
oci-cli: Depend on python3-jmespath

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agooci-cli: Ship egg metadata
Michael Tremer [Mon, 21 Feb 2022 18:43:17 +0000 (18:43 +0000)] 
oci-cli: Ship egg metadata

This package tries to identify if it is actually installed and does that
in a rather unorthodox way. So, thoses files are needed to run the "oci"
command. Only god knows why.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-terminaltables: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:16 +0000 (18:43 +0000)] 
python3-terminaltables: New package

Required by oci-cli.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-arrow: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:15 +0000 (18:43 +0000)] 
python3-arrow: New package

Required by oci-cli.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-click: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:14 +0000 (18:43 +0000)] 
python3-click: New package

Required by oci-python-sdk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-pytz: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:13 +0000 (18:43 +0000)] 
python3-pytz: New package

Required by oci-python-sdk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-circuitbreaker: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:12 +0000 (18:43 +0000)] 
python3-circuitbreaker: New package

Required by oci-python-sdk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agomake.sh: Re-order build of some Python modules
Michael Tremer [Mon, 21 Feb 2022 18:43:11 +0000 (18:43 +0000)] 
make.sh: Re-order build of some Python modules

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-cryptography: Fix build against Rust
Michael Tremer [Mon, 21 Feb 2022 18:43:10 +0000 (18:43 +0000)] 
python3-cryptography: Fix build against Rust

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-pycparser: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:09 +0000 (18:43 +0000)] 
python3-pycparser: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-install: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:08 +0000 (18:43 +0000)] 
python3-install: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-pep517: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:07 +0000 (18:43 +0000)] 
python3-pep517: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-build: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:06 +0000 (18:43 +0000)] 
python3-build: New package

This can build packages.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-flit: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:05 +0000 (18:43 +0000)] 
python3-flit: New package

Yet another build system for Python

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-idna: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:04 +0000 (18:43 +0000)] 
python3-idna: New package

Adds support for international domain names to python3-requests.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-certifi: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:03 +0000 (18:43 +0000)] 
python3-certifi: New package

This package provides the Mozilla CA list for python3-requests.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-requests: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:02 +0000 (18:43 +0000)] 
python3-requests: New package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-charset-normalizer: New package
Michael Tremer [Mon, 21 Feb 2022 18:43:01 +0000 (18:43 +0000)] 
python3-charset-normalizer: New package

Required by python3-requests

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-cryptography: New package required by oci-python-sdk
Michael Tremer [Mon, 21 Feb 2022 18:43:00 +0000 (18:43 +0000)] 
python3-cryptography: New package required by oci-python-sdk

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-cffi: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:59 +0000 (18:42 +0000)] 
python3-cffi: New package

Required by python3-cryptography.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agomake.sh: Build python3-packaging sooner
Michael Tremer [Mon, 21 Feb 2022 18:42:58 +0000 (18:42 +0000)] 
make.sh: Build python3-packaging sooner

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-semantic-version: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:57 +0000 (18:42 +0000)] 
python3-semantic-version: New package

This is required by setuptools-rust.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-typing-extensions: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:56 +0000 (18:42 +0000)] 
python3-typing-extensions: New package

This is required by setuptools-rust.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopython3-setuptools-rust: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:55 +0000 (18:42 +0000)] 
python3-setuptools-rust: New package

This is an extension for the setuptools package to build extensions in
Rust.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agomake.sh: Build the rust compiler earlier
Michael Tremer [Mon, 21 Feb 2022 18:42:54 +0000 (18:42 +0000)] 
make.sh: Build the rust compiler earlier

rustc is being required earlier for building python3-cryptography.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agooci-python-sdk: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:53 +0000 (18:42 +0000)] 
oci-python-sdk: New package

This is a dependency required by oci-cli.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agooci-cli: New package
Michael Tremer [Mon, 21 Feb 2022 18:42:52 +0000 (18:42 +0000)] 
oci-cli: New package

This package includes CLI tools for Oracle Cloud Infrastructure

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agohostapd: Repair LFS file after merge garbage
Peter Müller [Mon, 21 Feb 2022 21:09:48 +0000 (21:09 +0000)] 
hostapd: Repair LFS file after merge garbage

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 165: Ship wirelessclient.cgi
Peter Müller [Mon, 21 Feb 2022 20:56:38 +0000 (20:56 +0000)] 
Core Update 165: Ship wirelessclient.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agowireless client: Remove option for WEP
Michael Tremer [Sun, 20 Feb 2022 17:56:31 +0000 (17:56 +0000)] 
wireless client: Remove option for WEP

This has not been compiled into our version of wpa_supplicant (if it has
been ever) and so there is no danger to disable this without any further
ado.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoexpat: Update to version 2.4.6 - Security/CVE fixes
Adolf Belka [Mon, 21 Feb 2022 13:11:21 +0000 (14:11 +0100)] 
expat: Update to version 2.4.6 - Security/CVE fixes

- Update from 2.4.4 to 2.4.6
- Update of rootfile
- Changelog
   Release 2.4.6 Sun February 20 2022
      Bug fixes:
            #566  Fix a regression introduced by the fix for CVE-2022-25313
                    in release 2.4.5 that affects applications that (1)
                    call function XML_SetElementDeclHandler and (2) are
                    parsing XML that contains nested element declarations
                    (e.g. "<!ELEMENT junk ((bar|foo|xyz+), zebra*)>").
   Release 2.4.5 Fri February 18 2022
      Security fixes:
            #562  CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8
                    sequences (e.g. from start tag names) to the XML
                    processing application on top of Expat can cause
                    arbitrary damage (e.g. code execution) depending
                    on how invalid UTF-8 is handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #561  CVE-2022-25236 -- Passing (one or more) namespace separator
                    characters in "xmlns[:prefix]" attribute values
                    made Expat send malformed tag names to the XML
                    processor on top of Expat which can cause
                    arbitrary damage (e.g. code execution) depending
                    on such unexpectable cases are handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #558  CVE-2022-25313 -- Fix stack exhaustion in doctype parsing
                    that could be triggered by e.g. a 2 megabytes
                    file with a large number of opening braces.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.
            #560  CVE-2022-25314 -- Fix integer overflow in function copyString;
                    only affects the encoding name parameter at parser creation
                    time which is often hardcoded (rather than user input),
                    takes a value in the gigabytes to trigger, and a 64-bit
                    machine.  Expected impact is denial of service.
            #559  CVE-2022-25315 -- Fix integer overflow in function storeRawNames;
                    needs input in the gigabytes and a 64-bit machine.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoMerge branch 'master' into next
Arne Fitzenreiter [Sat, 19 Feb 2022 16:02:28 +0000 (16:02 +0000)] 
Merge branch 'master' into next

3 years agocore164: add unbound initskript
Arne Fitzenreiter [Sat, 19 Feb 2022 15:53:54 +0000 (15:53 +0000)] 
core164: add unbound initskript

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agounbound: fix dns working check
Arne Fitzenreiter [Sat, 19 Feb 2022 08:22:06 +0000 (09:22 +0100)] 
unbound: fix dns working check

pool.ipfire.org cannot resolved. Now try both default dns
servers. If one works dns is working.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
3 years agofirewall: Make logging of conntrack INVALIDs configureable
Peter Müller [Fri, 18 Feb 2022 22:40:55 +0000 (22:40 +0000)] 
firewall: Make logging of conntrack INVALIDs configureable

In theory, logging of dropped packets classified by conntrack as being
INVALID should never be disabled, since one wants to have a paper trail
of what his/her firewall is doing.

However, conntrack seems to drop a lot of (at the first glance
legitimate) packets, hence bloating the logs, making spotting the
important firewall hits more difficult.

This patch therefore adds the option to disable logging of packets being
dropped by conntrack due to INVALID state.

Please note:
- This patch does not add this category to the firewall hits graph.
- The variables in this patch ("LOGDROPCTINVALID") should make it clear
  that it is about toggling _logging_, not the actual _dropping_. Other
  variables are still in need of being renamed to clarify this, which
  will be done in a dedicated patch.
- Also, the changes made to update.sh need to take place in
  config/rootfiles/core/164/update.sh for "master", since this patch has
  been developed against "next". Kindly cherry-pick the necessary
  changes.

Partially fixes: #12778

Reported-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agostage2: Zut alors, delete the right line in rootfile
Peter Müller [Sat, 19 Feb 2022 11:54:10 +0000 (11:54 +0000)] 
stage2: Zut alors, delete the right line in rootfile

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agostage2: Remove forgotten mv command
Peter Müller [Sat, 19 Feb 2022 09:46:27 +0000 (09:46 +0000)] 
stage2: Remove forgotten mv command

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agofirewall: Add proper logging prefix for conntrack INVALID hits
Peter Müller [Thu, 17 Feb 2022 20:16:02 +0000 (20:16 +0000)] 
firewall: Add proper logging prefix for conntrack INVALID hits

Fixes: #12778
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoFix Bugzilla URL in GCC LFS file
Peter Müller [Sat, 19 Feb 2022 00:23:21 +0000 (00:23 +0000)] 
Fix Bugzilla URL in GCC LFS file

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoDrop ovpn-collectd-convert
Peter Müller [Sat, 19 Feb 2022 00:01:47 +0000 (00:01 +0000)] 
Drop ovpn-collectd-convert

This script is orphaned: It was only used while upgrading to Core Update
89, sitting around in /usr/sbin/ doing nothing ever since.

Keeping it there won't do any harm. On the other hand, dragging an
unused script around on our installations does not make sense either.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoEarly spring clean: Remove trailing whitespaces, and correct licence headers
Peter Müller [Fri, 18 Feb 2022 23:54:57 +0000 (23:54 +0000)] 
Early spring clean: Remove trailing whitespaces, and correct licence headers

Bumping across one of our scripts with very long trailing whitespaces, I
thought it might be a good idea to clean these up. Doing so, some
missing or inconsistent licence headers were fixed.

There is no need in shipping all these files en bloc, as their
functionality won't change.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoMerge branch 'temp-c165-development' into next
Peter Müller [Fri, 18 Feb 2022 22:47:07 +0000 (22:47 +0000)] 
Merge branch 'temp-c165-development' into next

3 years agofirewall: Make logging of conntrack INVALIDs configureable
Peter Müller [Fri, 18 Feb 2022 22:40:55 +0000 (22:40 +0000)] 
firewall: Make logging of conntrack INVALIDs configureable

In theory, logging of dropped packets classified by conntrack as being
INVALID should never be disabled, since one wants to have a paper trail
of what his/her firewall is doing.

However, conntrack seems to drop a lot of (at the first glance
legitimate) packets, hence bloating the logs, making spotting the
important firewall hits more difficult.

This patch therefore adds the option to disable logging of packets being
dropped by conntrack due to INVALID state.

Please note:
- This patch does not add this category to the firewall hits graph.
- The variables in this patch ("LOGDROPCTINVALID") should make it clear
  that it is about toggling _logging_, not the actual _dropping_. Other
  variables are still in need of being renamed to clarify this, which
  will be done in a dedicated patch.
- Also, the changes made to update.sh need to take place in
  config/rootfiles/core/164/update.sh for "master", since this patch has
  been developed against "next". Kindly cherry-pick the necessary
  changes.

Partially fixes: #12778

Reported-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agofirewall: Add proper logging prefix for conntrack INVALID hits
Peter Müller [Thu, 17 Feb 2022 20:16:02 +0000 (20:16 +0000)] 
firewall: Add proper logging prefix for conntrack INVALID hits

Fixes: #12778
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoMerge branch 'master' into temp-c165-development
Peter Müller [Fri, 18 Feb 2022 22:28:55 +0000 (22:28 +0000)] 
Merge branch 'master' into temp-c165-development

3 years agoMerge branch 'master' into next
Peter Müller [Fri, 18 Feb 2022 22:28:35 +0000 (22:28 +0000)] 
Merge branch 'master' into next

3 years agoacct.en.pl: Update to use proxy accounting - Bug#12772
Adolf Belka [Fri, 18 Feb 2022 14:32:39 +0000 (15:32 +0100)] 
acct.en.pl: Update to use proxy accounting - Bug#12772

-Replace the variable names used for the accounting page with proxy accounting in a
  consistent manner
- Tested on a vm system and confirmed to have a consistent naming approach now

Fixes: Bug#12772
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agoacct.pl: Change name of package in Error message - Bug#12772
Adolf Belka [Fri, 18 Feb 2022 14:32:38 +0000 (15:32 +0100)] 
acct.pl: Change name of package in Error message - Bug#12772

- Change package name from squid accounting to proxy accounting in mail Subject line

Fixes: Bug#12772
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agosquid-accounting: Rename to proxy-accounting - bug#12772
Adolf Belka [Fri, 18 Feb 2022 14:32:37 +0000 (15:32 +0100)] 
squid-accounting: Rename to proxy-accounting - bug#12772

- Rename lfs, rootfile and paks directory
- Change name in make.sh
- Tested out in a vm system and worked

Fixes: Bug#12772
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agoaccounting.cgi: Change some variables to alphanumeric - Bug#12777
Adolf Belka [Fri, 18 Feb 2022 14:33:52 +0000 (15:33 +0100)] 
accounting.cgi: Change some variables to alphanumeric - Bug#12777

- The Postcode in the address only allowed numeric postcodes. The Netherlands and Great
   Britain are at lease two countries that use alphanumeric postcodes with spaces. Changed
   the postcode check from numeric to alphanumeric.
- The Bank Code in the Providers details only allowed numeric Bank Codes. In Great Britain
   the Bank Code, also known as the Sort Code is made up of three groups of digits separated
   by a - .
- Adjusted the regex for the alphanumeric check to include a space and a - . The original
   comment indicated that a - was allowed but it was not included in the regex.
- Tested on a vm system and confirmed that a postcode from The Netherlands and Great Britain
   and a Sort Code from Breat Britain are now accepted.

Fixes: Bug#12777
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
3 years agoCore Update 165: Ship wpa_supplicant
Peter Müller [Fri, 18 Feb 2022 21:57:28 +0000 (21:57 +0000)] 
Core Update 165: Ship wpa_supplicant

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agowpa_supplicant: Update to 2.10
Matthias Fischer [Fri, 18 Feb 2022 17:13:35 +0000 (18:13 +0100)] 
wpa_supplicant: Update to 2.10

For details see:
https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog

"2022-01-16 - v2.10
* SAE changes
  - improved protection against side channel attacks
    [https://w1.fi/security/2022-1/]
  - added support for the hash-to-element mechanism (sae_pwe=1 or
    sae_pwe=2); this is currently disabled by default, but will likely
    get enabled by default in the future
  - fixed PMKSA caching with OKC
  - added support for SAE-PK
* EAP-pwd changes
  - improved protection against side channel attacks
  [https://w1.fi/security/2022-1/]
* fixed P2P provision discovery processing of a specially constructed
  invalid frame
  [https://w1.fi/security/2021-1/]
* fixed P2P group information processing of a specially constructed
  invalid frame
  [https://w1.fi/security/2020-2/]
* fixed PMF disconnection protection bypass in AP mode
  [https://w1.fi/security/2019-7/]
* added support for using OpenSSL 3.0
* increased the maximum number of EAP message exchanges (mainly to
  support cases with very large certificates)
* fixed various issues in experimental support for EAP-TEAP peer
* added support for DPP release 2 (Wi-Fi Device Provisioning Protocol)
* a number of MKA/MACsec fixes and extensions
* added support for SAE (WPA3-Personal) AP mode configuration
* added P2P support for EDMG (IEEE 802.11ay) channels
* fixed EAP-FAST peer with TLS GCM/CCM ciphers
* improved throughput estimation and BSS selection
* dropped support for libnl 1.1
* added support for nl80211 control port for EAPOL frame TX/RX
* fixed OWE key derivation with groups 20 and 21; this breaks backwards
  compatibility for these groups while the default group 19 remains
  backwards compatible
* added support for Beacon protection
* added support for Extended Key ID for pairwise keys
* removed WEP support from the default build (CONFIG_WEP=y can be used
  to enable it, if really needed)
* added a build option to remove TKIP support (CONFIG_NO_TKIP=y)
* added support for Transition Disable mechanism to allow the AP to
  automatically disable transition mode to improve security
* extended D-Bus interface
* added support for PASN
* added a file-based backend for external password storage to allow
  secret information to be moved away from the main configuration file
  without requiring external tools
* added EAP-TLS peer support for TLS 1.3 (disabled by default for now)
* added support for SCS, MSCS, DSCP policy
* changed driver interface selection to default to automatic fallback
  to other compiled in options
* a large number of other fixes, cleanup, and extensions"

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agohostapd: Update to 2.10
Matthias Fischer [Fri, 18 Feb 2022 17:13:34 +0000 (18:13 +0100)] 
hostapd: Update to 2.10

For details see:
https://w1.fi/cgit/hostap/plain/hostapd/ChangeLog

"2022-01-16 - v2.10
* SAE changes
  - improved protection against side channel attacks
    [https://w1.fi/security/2022-1/]
  - added option send SAE Confirm immediately (sae_config_immediate=1)
    after SAE Commit
  - added support for the hash-to-element mechanism (sae_pwe=1 or
    sae_pwe=2)
  - fixed PMKSA caching with OKC
  - added support for SAE-PK
* EAP-pwd changes
  - improved protection against side channel attacks
    [https://w1.fi/security/2022-1/]
* fixed WPS UPnP SUBSCRIBE handling of invalid operations
  [https://w1.fi/security/2020-1/]
* fixed PMF disconnection protection bypass
  [https://w1.fi/security/2019-7/]
* added support for using OpenSSL 3.0
* fixed various issues in experimental support for EAP-TEAP server
* added configuration (max_auth_rounds, max_auth_rounds_short) to
  increase the maximum number of EAP message exchanges (mainly to
  support cases with very large certificates) for the EAP server
* added support for DPP release 2 (Wi-Fi Device Provisioning Protocol)
* extended HE (IEEE 802.11ax) support, including 6 GHz support
* removed obsolete IAPP functionality
* fixed EAP-FAST server with TLS GCM/CCM ciphers
* dropped support for libnl 1.1
* added support for nl80211 control port for EAPOL frame TX/RX
* fixed OWE key derivation with groups 20 and 21; this breaks backwards
  compatibility for these groups while the default group 19 remains
  backwards compatible; owe_ptk_workaround=1 can be used to enabled a
  a workaround for the group 20/21 backwards compatibility
* added support for Beacon protection
* added support for Extended Key ID for pairwise keys
* removed WEP support from the default build (CONFIG_WEP=y can be used
  to enable it, if really needed)
* added a build option to remove TKIP support (CONFIG_NO_TKIP=y)
* added support for Transition Disable mechanism to allow the AP to
  automatically disable transition mode to improve security
* added support for PASN
* added EAP-TLS server support for TLS 1.3 (disabled by default for now)
* a large number of other fixes, cleanup, and extensions"

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore 165: Export location DB in new format.
Stefan Schantl [Fri, 18 Feb 2022 05:07:42 +0000 (06:07 +0100)] 
Core 165: Export location DB in new format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agofirewall: Load ipset list before creating rules for DROP_HOSTILE.
Stefan Schantl [Fri, 18 Feb 2022 05:03:51 +0000 (06:03 +0100)] 
firewall: Load ipset list before creating rules for DROP_HOSTILE.

Otherwise there is no ipset list use-able and the feature will not work.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCore 165: Export location DB in new format.
Stefan Schantl [Fri, 18 Feb 2022 05:06:43 +0000 (06:06 +0100)] 
Core 165: Export location DB in new format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agofirewall: Load ipset list before creating rules for DROP_HOSTILE.
Stefan Schantl [Fri, 18 Feb 2022 05:00:41 +0000 (06:00 +0100)] 
firewall: Load ipset list before creating rules for DROP_HOSTILE.

Otherwise there is no ipset list use-able and the feature will not work.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
Stefan Schantl [Fri, 18 Feb 2022 04:52:04 +0000 (05:52 +0100)] 
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

3 years agorules.pl: Adjust check against loading the same lists multiple times.
Stefan Schantl [Thu, 17 Feb 2022 05:40:03 +0000 (06:40 +0100)] 
rules.pl: Adjust check against loading the same lists multiple times.

This check now has been moved to the ipset_restore() function, which
will help to keep the code clean and maintain-able.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agomanualpages: Drop p2p-block entry
Leo-Andres Hofmann [Thu, 17 Feb 2022 12:40:43 +0000 (13:40 +0100)] 
manualpages: Drop p2p-block entry

The p2p-block CGI has been removed. Therefore the link to its
manual page can be removed as well.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 165: Fixed symlink after renaming Perl packages
Peter Müller [Thu, 17 Feb 2022 19:23:15 +0000 (19:23 +0000)] 
Core Update 165: Fixed symlink after renaming Perl packages

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>