]> git.ipfire.org Git - ipfire-2.x.git/log
ipfire-2.x.git
4 years agoApache: deny framing of WebUI from different origins
peter.mueller@ipfire.org [Mon, 4 Nov 2019 18:53:00 +0000 (18:53 +0000)] 
Apache: deny framing of WebUI from different origins

There is no legitimate reason to do this. Setting header X-Frame-Options
to "sameorigin" is necessary for displaying some collectd graphs on the
WebUI.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add ipfire-interface.conf
Arne Fitzenreiter [Wed, 13 Nov 2019 19:10:03 +0000 (19:10 +0000)] 
core138: add ipfire-interface.conf

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoApache: prevent Referrer leaks via WebUI
peter.mueller@ipfire.org [Mon, 4 Nov 2019 18:52:00 +0000 (18:52 +0000)] 
Apache: prevent Referrer leaks via WebUI

By default, even modern browsers sent the URL of ther originating
site to another one when accessing hyperlinks. This is an information
leak and may expose internal details (such as FQDN or IP address)
of an IPFire installation to a third party.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add ipfire-interface-ssl.conf
Arne Fitzenreiter [Wed, 13 Nov 2019 19:08:02 +0000 (19:08 +0000)] 
core138: add ipfire-interface-ssl.conf

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoApache: drop CBC ciphers for WebUI
peter.mueller@ipfire.org [Mon, 4 Nov 2019 18:35:00 +0000 (18:35 +0000)] 
Apache: drop CBC ciphers for WebUI

CBC ciphers contain some known vulnerabilities and should not be used
anymore. While dropping them for OpenSSL clients or public web servers
still causes interoperability problems with legacy setups, they can
be safely removed from IPFire's administrative UI.

This patch changes the used cipersuite to:

TLS_CHACHA20_POLY1305_SHA256 TLSv1.3 Kx=any      Au=any  Enc=CHACHA20/POLY1305(256) Mac=AEAD
TLS_AES_256_GCM_SHA384  TLSv1.3 Kx=any      Au=any  Enc=AESGCM(256) Mac=AEAD
TLS_AES_128_GCM_SHA256  TLSv1.3 Kx=any      Au=any  Enc=AESGCM(128) Mac=AEAD
ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(256) Mac=AEAD
ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD
ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(128) Mac=AEAD
ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AESGCM(256) Mac=AEAD
ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH     Au=RSA  Enc=CHACHA20/POLY1305(256) Mac=AEAD
ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AESGCM(128) Mac=AEAD

Since TLS 1.3 ciphers will be added automatically by OpenSSL, mentioning
them in "SSLCipherSuite" is unnecessary. ECDSA is preferred over RSA for
performance reasons.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add openssl
Arne Fitzenreiter [Wed, 13 Nov 2019 19:04:48 +0000 (19:04 +0000)] 
core138: add openssl

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoOpenSSL: drop preferring of Chacha20/Poly1305 over AES-GCM
peter.mueller@ipfire.org [Mon, 4 Nov 2019 18:24:00 +0000 (18:24 +0000)] 
OpenSSL: drop preferring of Chacha20/Poly1305 over AES-GCM

As hardware acceleration for AES is emerging (Fireinfo indicates
30.98% of reporting installations support this, compared to
28.22% in summer), there is no more reason to manually prefer
Chacha20/Poly1305 over it.

Further, overall performance is expected to increase as server
CPUs usually come with AES-NI today, where Chacha/Poly would
be an unnecessary bottleneck. Small systems without AES-NI,
however, compute Chacha/Poly measurable, but not significantly faster,
so there only was a small advantage of this.

This patch changes the OpenSSL default ciphersuite to:

TLS_CHACHA20_POLY1305_SHA256 TLSv1.3 Kx=any      Au=any  Enc=CHACHA20/POLY1305(256) Mac=AEAD
TLS_AES_256_GCM_SHA384  TLSv1.3 Kx=any      Au=any  Enc=AESGCM(256) Mac=AEAD
TLS_AES_128_GCM_SHA256  TLSv1.3 Kx=any      Au=any  Enc=AESGCM(128) Mac=AEAD
ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(256) Mac=AEAD
ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD
ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(128) Mac=AEAD
ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AESGCM(256) Mac=AEAD
ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH     Au=RSA  Enc=CHACHA20/POLY1305(256) Mac=AEAD
ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AESGCM(128) Mac=AEAD
ECDHE-ECDSA-AES256-SHA384 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AES(256)  Mac=SHA384
ECDHE-ECDSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=Camellia(256) Mac=SHA384
ECDHE-RSA-AES256-SHA384 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AES(256)  Mac=SHA384
ECDHE-RSA-CAMELLIA256-SHA384 TLSv1.2 Kx=ECDH     Au=RSA  Enc=Camellia(256) Mac=SHA384
ECDHE-ECDSA-AES128-SHA256 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AES(128)  Mac=SHA256
ECDHE-ECDSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH     Au=ECDSA Enc=Camellia(128) Mac=SHA256
ECDHE-RSA-AES128-SHA256 TLSv1.2 Kx=ECDH     Au=RSA  Enc=AES(128)  Mac=SHA256
ECDHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=ECDH     Au=RSA  Enc=Camellia(128) Mac=SHA256
DHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=DH       Au=RSA  Enc=AESGCM(256) Mac=AEAD
DHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=DH       Au=RSA  Enc=CHACHA20/POLY1305(256) Mac=AEAD
DHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=DH       Au=RSA  Enc=AESGCM(128) Mac=AEAD
DHE-RSA-AES256-SHA256   TLSv1.2 Kx=DH       Au=RSA  Enc=AES(256)  Mac=SHA256
DHE-RSA-CAMELLIA256-SHA256 TLSv1.2 Kx=DH       Au=RSA  Enc=Camellia(256) Mac=SHA256
DHE-RSA-AES128-SHA256   TLSv1.2 Kx=DH       Au=RSA  Enc=AES(128)  Mac=SHA256
DHE-RSA-CAMELLIA128-SHA256 TLSv1.2 Kx=DH       Au=RSA  Enc=Camellia(128) Mac=SHA256
ECDHE-ECDSA-AES256-SHA  TLSv1 Kx=ECDH     Au=ECDSA Enc=AES(256)  Mac=SHA1
ECDHE-ECDSA-AES128-SHA  TLSv1 Kx=ECDH     Au=ECDSA Enc=AES(128)  Mac=SHA1
ECDHE-RSA-AES256-SHA    TLSv1 Kx=ECDH     Au=RSA  Enc=AES(256)  Mac=SHA1
ECDHE-RSA-AES128-SHA    TLSv1 Kx=ECDH     Au=RSA  Enc=AES(128)  Mac=SHA1
DHE-RSA-AES256-SHA      SSLv3 Kx=DH       Au=RSA  Enc=AES(256)  Mac=SHA1
DHE-RSA-CAMELLIA256-SHA SSLv3 Kx=DH       Au=RSA  Enc=Camellia(256) Mac=SHA1
DHE-RSA-AES128-SHA      SSLv3 Kx=DH       Au=RSA  Enc=AES(128)  Mac=SHA1
DHE-RSA-CAMELLIA128-SHA SSLv3 Kx=DH       Au=RSA  Enc=Camellia(128) Mac=SHA1
AES256-GCM-SHA384       TLSv1.2 Kx=RSA      Au=RSA  Enc=AESGCM(256) Mac=AEAD
AES128-GCM-SHA256       TLSv1.2 Kx=RSA      Au=RSA  Enc=AESGCM(128) Mac=AEAD
AES256-SHA256           TLSv1.2 Kx=RSA      Au=RSA  Enc=AES(256)  Mac=SHA256
CAMELLIA256-SHA256      TLSv1.2 Kx=RSA      Au=RSA  Enc=Camellia(256) Mac=SHA256
AES128-SHA256           TLSv1.2 Kx=RSA      Au=RSA  Enc=AES(128)  Mac=SHA256
CAMELLIA128-SHA256      TLSv1.2 Kx=RSA      Au=RSA  Enc=Camellia(128) Mac=SHA256
AES256-SHA              SSLv3 Kx=RSA      Au=RSA  Enc=AES(256)  Mac=SHA1
CAMELLIA256-SHA         SSLv3 Kx=RSA      Au=RSA  Enc=Camellia(256) Mac=SHA1
AES128-SHA              SSLv3 Kx=RSA      Au=RSA  Enc=AES(128)  Mac=SHA1
CAMELLIA128-SHA         SSLv3 Kx=RSA      Au=RSA  Enc=Camellia(128) Mac=SHA1

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add ovpnmain.cgi
Arne Fitzenreiter [Wed, 13 Nov 2019 18:55:53 +0000 (18:55 +0000)] 
core138: add ovpnmain.cgi

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoOpenVPN: Fix max-clients option
Erik Kapfer [Mon, 4 Nov 2019 14:52:26 +0000 (15:52 +0100)] 
OpenVPN: Fix max-clients option

Fix: Triggered by https://forum.ipfire.org/viewtopic.php?f=16&t=23551

Since the 'DHCP_WINS' cgiparam has been set for the max-client directive, changes in the WUI has not been adapted to server.conf.

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add unbound initscript
Arne Fitzenreiter [Wed, 13 Nov 2019 18:54:28 +0000 (18:54 +0000)] 
core138: add unbound initscript

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agounbound: Fix whitespace error in initscript
Michael Tremer [Mon, 4 Nov 2019 12:02:46 +0000 (12:02 +0000)] 
unbound: Fix whitespace error in initscript

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add openvpn
Arne Fitzenreiter [Wed, 13 Nov 2019 18:52:15 +0000 (18:52 +0000)] 
core138: add openvpn

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoOpenVPN: Update to version 2.4.8
Erik Kapfer [Fri, 1 Nov 2019 13:33:06 +0000 (14:33 +0100)] 
OpenVPN: Update to version 2.4.8

This is primarily a maintenance release with bugfixes and improvements. All changes can be overviewed in here -->
https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24 .

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add init.d/functions
Arne Fitzenreiter [Wed, 13 Nov 2019 18:50:07 +0000 (18:50 +0000)] 
core138: add init.d/functions

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoinitscripts: Tell users to report bugs on Bugzilla
Michael Tremer [Thu, 31 Oct 2019 18:09:05 +0000 (18:09 +0000)] 
initscripts: Tell users to report bugs on Bugzilla

I have been receiving a couple of emails recently directed
at info@ipfire.org with bug reports when a system did not
boot up or shut down properly.

This is obviously not the right way to report bugs, but
we are telling our users to do so.

This patch changes this to report bugs to Bugzilla like
it should be.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agolibarchiv: Update to version 3.4.0
Erik Kapfer [Thu, 31 Oct 2019 07:58:30 +0000 (08:58 +0100)] 
libarchiv: Update to version 3.4.0

Version 3.4.0 is a feature and security release. The changelog can be found in here --> https://github.com/libarchive/libarchive/releases .

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add lz4
Arne Fitzenreiter [Wed, 13 Nov 2019 18:44:36 +0000 (18:44 +0000)] 
core138: add lz4

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agolz4: Update to version 1.9.2
Erik Kapfer [Thu, 31 Oct 2019 07:49:55 +0000 (08:49 +0100)] 
lz4: Update to version 1.9.2

Several fixes and improvements has been integrated. The changes list through the different versions since
the current version 1.8.1.2 can be found in here --> https://github.com/lz4/lz4/releases

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add mail.cgi
Arne Fitzenreiter [Wed, 13 Nov 2019 18:42:17 +0000 (18:42 +0000)] 
core138: add mail.cgi

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agomail.cgi: Do not print content of input fields
Michael Tremer [Wed, 30 Oct 2019 10:59:00 +0000 (10:59 +0000)] 
mail.cgi: Do not print content of input fields

This was printed unescaped and could therefore be used
for a stored XSS attack.

Fixes: #12226
Reported-by: Pisher Honda <pisher24@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agomail.cgi: Always check content of fields
Michael Tremer [Wed, 30 Oct 2019 10:58:59 +0000 (10:58 +0000)] 
mail.cgi: Always check content of fields

These checks did not do anything but clear all fields
when mailing was disabled.

It makes a lot more sense to retain people's settings,
even when they have been disabled.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoCore Update 138: ship ca-certificates
peter.mueller@ipfire.org [Tue, 29 Oct 2019 18:17:00 +0000 (18:17 +0000)] 
Core Update 138: ship ca-certificates

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoupdate ca-certificates CA bundle
peter.mueller@ipfire.org [Tue, 29 Oct 2019 18:16:00 +0000 (18:16 +0000)] 
update ca-certificates CA bundle

Update the CA certificates list to what Mozilla NSS ships currently.

The original file can be retrieved from:
https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoTor: fix permissions of /var/ipfire/tor/torrc after installation
peter.mueller@ipfire.org [Tue, 29 Oct 2019 18:37:00 +0000 (18:37 +0000)] 
Tor: fix permissions of /var/ipfire/tor/torrc after installation

Fixes #12220

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore138: add firewall-lib.pl to update
Arne Fitzenreiter [Tue, 29 Oct 2019 13:25:55 +0000 (13:25 +0000)] 
core138: add firewall-lib.pl to update

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agofirewall-lib.pl: Populate GeoIP rules only if location is available.
Stefan Schantl [Tue, 16 Apr 2019 19:08:05 +0000 (21:08 +0200)] 
firewall-lib.pl: Populate GeoIP rules only if location is available.

In case a GeoIP related firewall rule should be created, the script
now will check if the given location is still available.

Fixes #12054.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agostart core138
Arne Fitzenreiter [Tue, 29 Oct 2019 13:22:31 +0000 (13:22 +0000)] 
start core138

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agospeedtest-cli: Use Python 3 instead of Python 2
Michael Tremer [Mon, 28 Oct 2019 16:51:29 +0000 (16:51 +0000)] 
speedtest-cli: Use Python 3 instead of Python 2

This seems to be required although the documentation says
that Python 2 is supported.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agopython3: Bump release version to redistribute package
Michael Tremer [Mon, 28 Oct 2019 16:49:54 +0000 (16:49 +0000)] 
python3: Bump release version to redistribute package

Python 3 was linked against an old version of OpenSSL on my
system and to avoid this, we need to ship it again being built
against the current version of it.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Do no classify as default when L7 filter isn't done core137 v2.23-core137
Michael Tremer [Tue, 22 Oct 2019 15:48:14 +0000 (17:48 +0200)] 
QoS: Do no classify as default when L7 filter isn't done

We need to allow some more packets to pass through the
mangle chains so that the layer 7 filter can determine
what protocol it finds.

If L7 filter decides that a connection is of type "unknown",
we mark it as default, or it is marked with the correct class.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "Revert "Revert "core137: Remove imq0 and unload imq module after QoS has...
Arne Fitzenreiter [Tue, 22 Oct 2019 15:54:37 +0000 (15:54 +0000)] 
Revert "Revert "Revert "core137: Remove imq0 and unload imq module after QoS has been stopped"""

This reverts commit e4d242da4ae1074b75d5d45eeb16061ba178f6c4.

this fails because we let QoS running and it doesn't like if the imq0
device was removed. (why imq0 can removed when it is up?)

4 years agobind: Update to 9.11.12
Matthias Fischer [Thu, 17 Oct 2019 11:29:57 +0000 (13:29 +0200)] 
bind: Update to 9.11.12

For details see:
https://downloads.isc.org/isc/bind9/9.11.12/RELEASE-NOTES-bind-9.11.12.html

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agogrub: Build after Python is available
Michael Tremer [Thu, 17 Oct 2019 16:01:10 +0000 (16:01 +0000)] 
grub: Build after Python is available

The build sometimes aborted because python was not found
when Grub was being built for EFI.

Fixes: #12209
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "Revert "core137: Remove imq0 and unload imq module after QoS has been stopped""
Arne Fitzenreiter [Mon, 21 Oct 2019 19:00:19 +0000 (19:00 +0000)] 
Revert "Revert "core137: Remove imq0 and unload imq module after QoS has been stopped""

This reverts commit 39c4ed442714451e380d45c9837547a081a80f6f.

4 years agoQoS: Delete more unused iptables commands
Michael Tremer [Mon, 21 Oct 2019 18:45:39 +0000 (20:45 +0200)] 
QoS: Delete more unused iptables commands

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Drop support for setting TOS bits per class
Michael Tremer [Mon, 21 Oct 2019 18:45:37 +0000 (20:45 +0200)] 
QoS: Drop support for setting TOS bits per class

This is useless since no ISP will evaluate those settings
any more and it has a rather large impact on throughput.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: No longer set TOS bits for ACK packets
Michael Tremer [Mon, 21 Oct 2019 18:45:38 +0000 (20:45 +0200)] 
QoS: No longer set TOS bits for ACK packets

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Remove some IPsec rules which never worked
Michael Tremer [Mon, 21 Oct 2019 18:45:36 +0000 (20:45 +0200)] 
QoS: Remove some IPsec rules which never worked

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Classify incoming traffic in PREROUTING
Michael Tremer [Mon, 21 Oct 2019 18:45:35 +0000 (20:45 +0200)] 
QoS: Classify incoming traffic in PREROUTING

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Use CONNMARK to mark connections in connection tracking
Daniel Weismüller [Mon, 21 Oct 2019 18:45:34 +0000 (20:45 +0200)] 
QoS: Use CONNMARK to mark connections in connection tracking

This patch modifies the connection tracking in that ways that
it sets a connection mark which will be retrieved when a packet
is being redirected to the IFB interface.

This way, we can use classification without having the packet
being sent through iptables first.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "Make IMQ Switchable between PREROUTING and POSTROUTING"
Michael Tremer [Mon, 21 Oct 2019 18:45:33 +0000 (20:45 +0200)] 
Revert "Make IMQ Switchable between PREROUTING and POSTROUTING"

This reverts commit 88b8ffac6b258e7b7687eb26111134bf435e23ca.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Drop support for subclasses
Michael Tremer [Mon, 21 Oct 2019 18:45:32 +0000 (20:45 +0200)] 
QoS: Drop support for subclasses

This feature was never properly implemented and the UI was dead

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Suppress an error message when cleaning up from previous runs
Michael Tremer [Mon, 21 Oct 2019 18:45:31 +0000 (20:45 +0200)] 
QoS: Suppress an error message when cleaning up from previous runs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agolinux+iptables: Drop support for IMQ
Michael Tremer [Mon, 21 Oct 2019 18:45:30 +0000 (20:45 +0200)] 
linux+iptables: Drop support for IMQ

This is no longer needed since we are using IFB now

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Do not delete egress qdisc after classes have been created
Michael Tremer [Mon, 21 Oct 2019 18:45:29 +0000 (20:45 +0200)] 
QoS: Do not delete egress qdisc after classes have been created

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Start qosd immediately
Michael Tremer [Mon, 21 Oct 2019 18:45:28 +0000 (20:45 +0200)] 
QoS: Start qosd immediately

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Tidy up qdiscs after QoS is being stopped
Michael Tremer [Mon, 21 Oct 2019 18:45:27 +0000 (20:45 +0200)] 
QoS: Tidy up qdiscs after QoS is being stopped

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Use Intermediate Functional Block
Michael Tremer [Mon, 21 Oct 2019 18:45:26 +0000 (20:45 +0200)] 
QoS: Use Intermediate Functional Block

This is an alternative implementation to the Intermediate Queuing
Device (IMQ) which is an out-of-tree kernel patch and has been
criticised for being slow, especially with mutliple processors.

IFB is part of the mainline kernel and a lot less code.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Do not manually load iptables modules
Michael Tremer [Mon, 21 Oct 2019 18:45:25 +0000 (20:45 +0200)] 
QoS: Do not manually load iptables modules

This should not be necessary and causes the script to
wait for two seconds.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore137: remove QoS stop at update
Arne Fitzenreiter [Sun, 20 Oct 2019 20:29:50 +0000 (20:29 +0000)] 
core137: remove QoS stop at update

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "core137: Remove imq0 and unload imq module after QoS has been stopped"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:28:10 +0000 (20:28 +0000)] 
Revert "core137: Remove imq0 and unload imq module after QoS has been stopped"

This reverts commit f48920d84f72235c5141e32772d5c8a447f9900e.

4 years agoRevert "QoS: Do not manually load iptables modules"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:25:24 +0000 (20:25 +0000)] 
Revert "QoS: Do not manually load iptables modules"

This reverts commit cae6916d598b08d79d91e92733f676be4a4bb10c.

4 years agoRevert "QoS: Use Intermediate Functional Block"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:24:43 +0000 (20:24 +0000)] 
Revert "QoS: Use Intermediate Functional Block"

This reverts commit 3c33d9d8545c46d2446244e7d20eb25f3d2f2d90.

4 years agoRevert "Revert "Make IMQ Switchable between PREROUTING and POSTROUTING""
Arne Fitzenreiter [Sun, 20 Oct 2019 20:24:16 +0000 (20:24 +0000)] 
Revert "Revert "Make IMQ Switchable between PREROUTING and POSTROUTING""

This reverts commit ec01ebe246072cae77bc53d3c1fc09ad8277a89f.

4 years agoRevert "QoS: Tidy up qdiscs after QoS is being stopped"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:23:54 +0000 (20:23 +0000)] 
Revert "QoS: Tidy up qdiscs after QoS is being stopped"

This reverts commit eedf7b06c0c4a598b78dd87edb0f49a7f2bb061c.

4 years agoRevert "QoS: Process incoming packets in PREROUTING only"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:23:13 +0000 (20:23 +0000)] 
Revert "QoS: Process incoming packets in PREROUTING only"

This reverts commit e6341c5856ad6d7ed390d1a9ffbfadf449daebd8.

4 years agoRevert "QoS: Do not delete egress qdisc after classes have been created"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:21:53 +0000 (20:21 +0000)] 
Revert "QoS: Do not delete egress qdisc after classes have been created"

This reverts commit 39ff91ecf8d22a4752e3eeef8ae5cf60e497cb44.

4 years agoRevert "QoS: Start qosd immediately"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:21:23 +0000 (20:21 +0000)] 
Revert "QoS: Start qosd immediately"

This reverts commit 6a9bcd6c1d7ac0f8f4926a886beb8b3989227874.

4 years agoRevert "linux+iptables: Drop support for IMQ"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:20:26 +0000 (20:20 +0000)] 
Revert "linux+iptables: Drop support for IMQ"

This reverts commit 59b9a6bd22c0a5236b291ad7a50395032d600739.

4 years agoRevert "QoS: Suppress an error message when cleaning up from previous runs"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:19:58 +0000 (20:19 +0000)] 
Revert "QoS: Suppress an error message when cleaning up from previous runs"

This reverts commit cebad6e2b938071e1da2bea9dfa3fe09169ee5a0.

4 years agoRevert "QoS: Move packet classification to FORWARD chain for ingress"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:19:21 +0000 (20:19 +0000)] 
Revert "QoS: Move packet classification to FORWARD chain for ingress"

This reverts commit 424a332fd38ab844094d3e978cf5e159ead64b6c.

4 years agoRevert "QoS: Use CLASSIFY iptables target instead of MARK"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:18:56 +0000 (20:18 +0000)] 
Revert "QoS: Use CLASSIFY iptables target instead of MARK"

This reverts commit 3e151d19f9b813206e36da6b66fdc8cc99cdd26f.

4 years agoRevert "QoS: Drop tc filter rules to move marked packets into the correct class"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:18:34 +0000 (20:18 +0000)] 
Revert "QoS: Drop tc filter rules to move marked packets into the correct class"

This reverts commit 63f7d7475e97d74d4bcd23bd739b6b1721e55e14.

4 years agoRevert "QoS: Drop support for subclasses"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:18:00 +0000 (20:18 +0000)] 
Revert "QoS: Drop support for subclasses"

This reverts commit bc4d4da87009ebffcd93d30dcbfffff797b92588.

4 years agoRevert "QoS: Drop support for setting TOS bits per class"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:17:18 +0000 (20:17 +0000)] 
Revert "QoS: Drop support for setting TOS bits per class"

This reverts commit 3174d9c6b610c1f1ce1e7a8828a4575def2e2392.

4 years agoRevert "QoS: No longer set TOS bits for ACK packets"
Arne Fitzenreiter [Sun, 20 Oct 2019 20:16:05 +0000 (20:16 +0000)] 
Revert "QoS: No longer set TOS bits for ACK packets"

This reverts commit b1c695e872f0b1968dadee7fc38cf3258423c3ac.

4 years agocore137: don't start QoS
Arne Fitzenreiter [Sun, 20 Oct 2019 09:51:04 +0000 (09:51 +0000)] 
core137: don't start QoS

QoS need to load kernel modules but the currect kernel
was removed so it cannot correct start without a reboot.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore137: Remove imq0 and unload imq module after QoS has been stopped
Daniel Weismüller [Fri, 18 Oct 2019 14:59:49 +0000 (16:59 +0200)] 
core137: Remove imq0 and unload imq module after QoS has been stopped

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agokernel: update to 4.14.150
Arne Fitzenreiter [Fri, 18 Oct 2019 21:07:44 +0000 (23:07 +0200)] 
kernel: update to 4.14.150

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "suricata: Enable rust support"
Arne Fitzenreiter [Fri, 18 Oct 2019 18:39:47 +0000 (20:39 +0200)] 
Revert "suricata: Enable rust support"

This reverts commit 5b87687cb1d37d81dbc701706e40f40f2cb16348.

4 years agorust: disabled build
Arne Fitzenreiter [Fri, 18 Oct 2019 18:37:50 +0000 (20:37 +0200)] 
rust: disabled build

rust build code with illegal instructions on armv5tel
so this need more checking

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore137: add path of qosctrl
Arne Fitzenreiter [Fri, 18 Oct 2019 14:19:59 +0000 (16:19 +0200)] 
core137: add path of qosctrl

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore137: erase lm_sensors config after collectd start
Arne Fitzenreiter [Fri, 18 Oct 2019 14:16:35 +0000 (16:16 +0200)] 
core137: erase lm_sensors config after collectd start

this is needed to research the sensors with updated kernel
after next reboot.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "firewall: always allow outgoing DNS traffic to root servers"
Arne Fitzenreiter [Fri, 18 Oct 2019 14:13:49 +0000 (16:13 +0200)] 
Revert "firewall: always allow outgoing DNS traffic to root servers"

This reverts commit 70cd5c42f003292bd1ecb9e38018782679dbd01e.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoRevert "dhcpcd: Update to 8.0.2"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:50:12 +0000 (07:50 +0000)] 
Revert "dhcpcd: Update to 8.0.2"

This reverts commit 0184e5806da57226bbe24dbcbf11b093299cb9f4.

4 years agoRevert "dhcpcd: Update to 8.0.3"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:49:31 +0000 (07:49 +0000)] 
Revert "dhcpcd: Update to 8.0.3"

This reverts commit 8a001e556c02af3f34eacead4e8a44f482a67509.

4 years agoRevert "dhcpcd: Update to 8.0.6"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:48:56 +0000 (07:48 +0000)] 
Revert "dhcpcd: Update to 8.0.6"

This reverts commit a4bb11243f0d43b7e95ec0195879aa0dd6a94b9e.

4 years agoRevert "dhcpcd: Update to 8.1.0"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:48:12 +0000 (07:48 +0000)] 
Revert "dhcpcd: Update to 8.1.0"

This reverts commit 4863f2096cde6fd93618d1f774c6d16499ee3f63.

4 years agoRevert "bash: update to 5.0"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:38:21 +0000 (07:38 +0000)] 
Revert "bash: update to 5.0"

This reverts commit 700f11b305e941bb42b0a0b4e451af962b1bc23d.

4 years agoRevert "readline: update to 8.0"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:37:54 +0000 (07:37 +0000)] 
Revert "readline: update to 8.0"

This reverts commit 6e8e8ee41cfcec7338a5674c21c0e8aa62a59a04.

4 years agoRevert "update rootfiles for bash and readline"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:37:23 +0000 (07:37 +0000)] 
Revert "update rootfiles for bash and readline"

This reverts commit f41d936026b576ef7207754fa1d667d983fded06.

4 years agoRevert "bash: add patches 001 - 011 for 5.0 version"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:36:47 +0000 (07:36 +0000)] 
Revert "bash: add patches 001 - 011 for 5.0 version"

This reverts commit 2c0ee2b9624c4c7c3b3ce7b1deadae9df6ca9a32.

4 years agoRevert "readline: add patch 001 for version 8.0"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:36:00 +0000 (07:36 +0000)] 
Revert "readline: add patch 001 for version 8.0"

This reverts commit c5f0c44451737c543021e4ba958404a019ed7562.

4 years agoRevert "bash/readline: drop orphaned patches"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:35:22 +0000 (07:35 +0000)] 
Revert "bash/readline: drop orphaned patches"

This reverts commit 95f1c332d8c63896b540c3a07335236ef08cee01.

4 years agoRevert "ship updated bash and readline"
Arne Fitzenreiter [Tue, 15 Oct 2019 07:31:56 +0000 (07:31 +0000)] 
Revert "ship updated bash and readline"

there are missing files libs/bash/* in the rootfiles and there
are addons linked against readline-6.3 so we still need this
as readline-compat

This reverts commit 5c0345f5c1c247c8fc33c9447221caa134f27d86.

4 years agovpnmain.cgi+ovpnmain.cgi: Fix file upload with new versions of Perl
Michael Tremer [Mon, 14 Oct 2019 17:11:37 +0000 (19:11 +0200)] 
vpnmain.cgi+ovpnmain.cgi: Fix file upload with new versions of Perl

File uploads did not work since Perl was upgraded. This patch
fixes that problem by only checking if an object was returned
instead of performing a string comparison.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agocore137: add qos changes to updater
Arne Fitzenreiter [Mon, 14 Oct 2019 18:09:39 +0000 (18:09 +0000)] 
core137: add qos changes to updater

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Increase queue size and quantum for fq_codel
Michael Tremer [Mon, 14 Oct 2019 16:46:27 +0000 (16:46 +0000)] 
QoS: Increase queue size and quantum for fq_codel

This optimises the QoS to process more bandwidth.

The limit variable sets the maximum number of packets in the
queue which was regularly exceeded on fast connections with
the old setting. This now allows up to 10G of data transfer
and is set to the default of fq_codel.

Quantum sets how many bytes can be read from the queue per
iteration. This is now set to the default again, which is
the size of an Ethernet frame including its header.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: No longer set TOS bits for ACK packets
Michael Tremer [Mon, 14 Oct 2019 16:46:26 +0000 (16:46 +0000)] 
QoS: No longer set TOS bits for ACK packets

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Drop support for setting TOS bits per class
Michael Tremer [Mon, 14 Oct 2019 16:46:25 +0000 (16:46 +0000)] 
QoS: Drop support for setting TOS bits per class

This is useless since no ISP will evaluate those settings
any more and it has a rather large impact on throughput.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Drop support for subclasses
Michael Tremer [Mon, 14 Oct 2019 16:46:24 +0000 (16:46 +0000)] 
QoS: Drop support for subclasses

This feature was never properly implemented and the UI was dead

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Drop tc filter rules to move marked packets into the correct class
Michael Tremer [Mon, 14 Oct 2019 16:46:23 +0000 (16:46 +0000)] 
QoS: Drop tc filter rules to move marked packets into the correct class

This is no longer necessary since we are now using CLASSIFY

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Use CLASSIFY iptables target instead of MARK
Michael Tremer [Mon, 14 Oct 2019 16:46:22 +0000 (16:46 +0000)] 
QoS: Use CLASSIFY iptables target instead of MARK

We have been running into loads of conflicts by using MARK for
various components on the OS (suricata, IPsec, QoS, ...) which
was sometimes hard to resolve.

iptables comes with a target which directly sorts packets into
the correct class which results in less code and not using the
mark.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Move packet classification to FORWARD chain for ingress
Michael Tremer [Mon, 14 Oct 2019 16:46:21 +0000 (16:46 +0000)] 
QoS: Move packet classification to FORWARD chain for ingress

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Suppress an error message when cleaning up from previous runs
Michael Tremer [Mon, 14 Oct 2019 16:46:20 +0000 (16:46 +0000)] 
QoS: Suppress an error message when cleaning up from previous runs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agolinux+iptables: Drop support for IMQ
Michael Tremer [Mon, 14 Oct 2019 16:46:19 +0000 (16:46 +0000)] 
linux+iptables: Drop support for IMQ

This is no longer needed since we are using IFB now

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Start qosd immediately
Michael Tremer [Mon, 14 Oct 2019 16:46:17 +0000 (16:46 +0000)] 
QoS: Start qosd immediately

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Do not delete egress qdisc after classes have been created
Michael Tremer [Mon, 14 Oct 2019 16:46:18 +0000 (16:46 +0000)] 
QoS: Do not delete egress qdisc after classes have been created

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Silence RRD tool warnings
Michael Tremer [Mon, 14 Oct 2019 16:46:16 +0000 (16:46 +0000)] 
QoS: Silence RRD tool warnings

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
4 years agoQoS: Process incoming packets in PREROUTING only
Michael Tremer [Mon, 14 Oct 2019 16:46:15 +0000 (16:46 +0000)] 
QoS: Process incoming packets in PREROUTING only

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>