Commit Graph

20489 Commits

Author SHA1 Message Date
Michael Tremer
2a0d7a03d7 clwarn.cgi: Remove XSS
Fixes: #12966
Fixes: CVE-2022-44392
Reported-by: Arthur Naullet <arthur.naullet@epita.fr>
Reported-by: Rafael Lima <isec-researcher@protonmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2023-05-24 08:22:14 +00:00
Adolf Belka
c847846c4c ovpnmain.cgi: Fixes Bug#13117 - adds legacy option to openssl commands for cert & key extraction
- Any insecure connections made with openssl-3.x can have the cert and key extracted but
   if the insecure connection was made from prior to CU175 Testing then it used
   openssl-1.1.1 which causes an error under openssl-3.x due to the old version being able
   to accept older ciphers no longer accepted by openssl-3.x
- Adding the -legacy option to the openssl commands enables openssl-3.x to successfully
   open them and extract the cert and key
- Successfully tested on a vm system. Confirmed that the downloaded version under
   openssl-3.x worked exactly the same as the version downloaded under openssl-1.1.1

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-22 22:08:11 +00:00
Adolf Belka
416f317376 openssl: Fix for Bug#13117 - adds legacy option in for openssl extraction of cert & key
- OpenSSL-3.x gives an error when trying to open insecure .p12 files to extract the cert
   and key for the insecure package download option.
- To make this work the -legacy option is needed in the openssl command, which requires
   the legacy.so library to be available.
- Successfully tested on a vm system.
- Patch set built on Master (CU175 Testing)

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-22 22:08:11 +00:00
Arne Fitzenreiter
c6c78f8e11 kernel: update to 6.1.29
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2023-05-19 12:05:52 +00:00
Jon Murphy
f23508b724 rsnapshot: New addon
- What is it?
	rsnapshot is a filesystem snapshot utility based on
	rsync. rsnapshot makes it easy to make periodic snapshots of the
	ipfire device. The code makes extensive use of hard links whenever
	possible, to greatly reduce the disk space required.  See:
	https://rsnapshot.org

- Why is it needed?
	Rsnapshot backups run multiple times per day
	(e.g., once per day up to 24 times per day). Rsnapshot is much easier
	to configure, setup and use than the borg backup add-on.  (I found
	borg somewhat confusing). Rsnapshot completes each backup very fast.
	Unlike borg, rsnapshot does not compress each backup before storage.
	During a complete rebuild, borg backup need installation of the borg
	add-on to recover archived files.  Rsnapshot backups can be copied
	directly from the backup drive. Current backups (backup.pl or borg)
	could corrupt sqlite3 databases by running a backup during a database
	write.  This add-on includes a script specifically for sqlite backups.

- IPFire Wiki
	In process at: https://wiki.ipfire.org/addons/rsnapshot

Thanks to Gerd for creating a first build and a nice template for me!

Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
2023-05-18 11:24:29 +00:00
Peter Müller
1d5b66b145 Core Update 175: Ship harfbuzz
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 10:55:30 +00:00
Peter Müller
de5d9c9b47 Core Update 175: Merely reload firewall engine, instead of restart it
The latter will not work until a reboot due to the Core Update featuring
a new kernel, and will instead result in the following error:

modprobe: FATAL: Module nf_log_ipv4 not found in directory /lib/modules/6.1.27-ipfire

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 10:01:39 +00:00
Peter Müller
e5632e6697 Core Update 175: Ship necessary files for OpenVPN CGI changes
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 09:53:37 +00:00
Adolf Belka
9cac1034bc update.sh: Adds code to update an existing ovpnconfig with pass or no-pass
- The code checks first if ovpnconfig exists and is not empty.
- Then it makes all net2net connections no-pass since they do not use encryption
- Then it cycles through all .p12 files and checks with openssl if a password exists or not.
   If a password is present then pass is added to index 41 and if not then no-pass is added
   to index 41
- This code should be left in update.sh for future Core Updates in case people don't update
   with Core Update 175 but leave it till later. This code works fine on code that already
   has pass or no-pass entered into index 41 in ovpnconfig

Fixes: Bug#11048
Suggested-by: Erik Kapfer <ummeegge@ipfire.org>
Suggested-by: Adolf Belka <adolf.belka@ipfire.org>
Tested-by: Erik Kapfer <ummeegge@ipfire.org>
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:51:09 +00:00
Adolf Belka
18bece0edb web-user-interface: Addition of new icon for secure connection certificate download
- This uses a padlock icon from https://commons.wikimedia.org/wiki/File:Encrypted.png
- The license for this image is the following:-
   This library is free software; you can redistribute it and/or modify it under the terms
   of the GNU Lesser General Public License as published by the Free Software Foundation;
   either version 2.1 of the License, or (at your option) any later version. This library
   is distributed in the hope that it will be useful, but without any warranty; without
   even the implied warranty of merchantability or fitness for a particular purpose. See
   version 2.1 and version 3 of the GNU Lesser General Public License for more details.
- Based on the above license I believe it can be used by IPFire covered by the GNU General
   Public License that is used for it.
- The icon image was made by taking the existing openvpn.png file and superimposing the
   padlock icon on top of it at a 12x12 pixel format and naming it openvpn_encrypted.png

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:51:09 +00:00
Adolf Belka
070abb0d01 en.pl: Update to language wording for secure connection icon
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:51:09 +00:00
Adolf Belka
82822934ba de.pl: Change language text for secure icon wording
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:51:09 +00:00
Adolf Belka
762c88ec4d ovpnmain.cgi: Fix for bug#11048 - insecure download icon shown for connections with a password
- The insecure package download icon is shown if entry 41 in /var/ipfire/ovpn/ovpnconfig
   is set to no-pass. The code block on ovpnmain.cgi that deals with this checks if the
   connection is a host and if the first password entry is a null. Then it adds no-pass
   to ovpnconfig.
- The same block of code is also used for when he connection is edited. However at this
   stage the password entry is back to null because the password value is only kept until
   the connection has been saved. Therefore doing an edit results in the password value
   being taken as null even for connections with a password.
- This fix enters no-pass if the connection type is host and the password is null, pass if
   the connection type is host and the password has characters. If the connection type is
   net then no-pass is used as net2net connections dop not have encrypted certificates.
- The code has been changed to show a different icon for unencrypted and encrypted
   certificates.
- Separate patches are provided for the language file change, the provision of a new icon
   and the code for the update.sh script for the Core Update to update all existing
   connections, if any exist, to have either pass or no-pass in index 41.
- This patch set was a joint collaboration between Erik Kapfer and Adolf Belka
- Patch set, including the code for the Core Update 175 update.sh script has been tested
   on a vm testbed

Fixes: Bug#11048
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Tested-by: Erik Kapfer <ummeegge@ipfire.org>
Suggested-by: Adolf Belka <adolf.belka@ipfire.org>
Suggested-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:51:09 +00:00
Adolf Belka
745fd50e66 wio: remove unneeded or incorrect commands
- the helper programs in misc-progs get the correct permissions and ownerships
   automatically so adjustment not required in this script.
- permissions of menus in menu.d are provided automatically. Historically, these were
   root:root but were changed a while back but did not get applied to wio as it was
   modified by this script.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:47 +00:00
Adolf Belka
f9e2cd1c0b wio: add references to wio cgi and image files
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:47 +00:00
Adolf Belka
b6b59014a3 wio: add reference to wio menu
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:47 +00:00
Adolf Belka
b1584da093 wio: moved files from src/wio directory to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:47 +00:00
Adolf Belka
1ee6f37fb4 wio: move files from src/wio/main/ to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
b637cb23c8 wio: move addon language files to standard IPFire location
- This location used by guardian addon

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
5a6134e2a6 wio: move cgi files to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
1d666a6b3b wio: relocate wio menu item to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
4e908f84c7 wio: images moved to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
addb1b2fe1 wio: Move backup/includes file to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Adolf Belka
21d0be64d9 wio: This is a patch series relocating wio into the standard ipfire directories
- This patch is the changes to the wio lfs file related to the relocations
- The modified patch series was built and the generated wio-1.3.2-17.ipfire file was
   used to install wio on a testbed vm system. Everything worked. Tested out with various
   hosts on the system, tested the graphs, tested adding hosts from a network scan and
   from the arp table and everything worked fine. So all the relocations look to have
   worked.
- Files were only relocated, the wio code was not modified in any way.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:47:46 +00:00
Peter Müller
e8a73cfe94 initscripts: Remove re-added lvmetad initscript from rootfiles
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 09:46:41 +00:00
Jonatan Schlag
3a96d482f6 initscripts: Sort rootfiles
This simply sorts the rootfiles. Everything should be sorted :-).

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2023-05-18 09:43:23 +00:00
Jonatan Schlag
95dc3f86d8 initscript: sort by startup
As the list of symbolic links was not sorted at all I sorted it now by
the order of start or stop.
This seems to be the most useful way as you can now understand the
startup sequence from this file and add/remove scripts at a useful
place.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2023-05-18 09:43:22 +00:00
Jonatan Schlag
3c90d6432f lfs/initscripts: improve indention
As some lines are already now to long, this increase the indention to
improve readablitity.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2023-05-18 09:43:22 +00:00
Peter Müller
94d883abe7 Core Update 175: Remove any dropped add-ons, if installed
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 09:37:00 +00:00
Adolf Belka
9fe8af1019 make.sh: Fixes Bug#13076
- Adds borgbackup run time dependency - python3-exceptiongroup
- Adds python3-exceptiongroup build time dependency - python3-flit_scm
- Removes python3-attr that is no longer required in borgbackup dependency chain

Fixes: Bug#13076
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
b84d82176b borgbackup: Removed python3-pkgconfig as run time dependency
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
0a54896b20 python3-pkgconfig: Identified that this module is only required as a build time dependency
- Moved rootfile from common to packages and commented out all entries.
- Updated lfs file from addon to core package that is only used for build

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
e6cfa25714 python3-flit_scm: Fixes Bug#13076 - Build time dependency for python3-exceptiongroup
Fixes: Bug#13076
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
1da6cbf79f python3-exceptiongroup: Fixes Bug#13076 - New run time dependency for borgbackup fuse mount
Fixes: Bug#13076
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
ad4df98d7f python3-attr: Module no longer needed in the borgbackup dependency chain
- Previous update of python3-trio to 0.22.0 removed this dependency.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Adolf Belka
eaa557233e python3-trio: Fixes Bug#13076 - allows fuse mount to work again
- In Core 173 python3-trio was updated to version 0.22.0 when python was upgraded to 3.10.8
   Although the build of python3-trio was successful it was missed that there was a new
   run-time dependency of python3-exceptiongroup for python3-pyfuse3 to work.
   python2-flit_scm is required as a build dependency for python3-exceptiongroup.
- The modified packages were installed in my vm testbed and confirmed that borg mount then
   worked again.
- It was also noted that python3-attr was no longer needed neither as a runtime
   dependency nor as a build time dependency.
- Dependencies line of python3-trio updated for these two changes.

Fixes: Bug#13076
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-18 09:31:12 +00:00
Peter Müller
d69370d304 Revert "Revert "zabbix_agentd: Update to 6.0.16 (LTS)""
This reverts commit 3737b8e98e.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-18 09:23:25 +00:00
Arne Fitzenreiter
6a005bd9aa kernel: update to 6.1.28
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2023-05-16 18:53:01 +00:00
Arne Fitzenreiter
7939a65ff8 checkrootfiles: fix checks on hosts with newer grep
newer grep versions ignore * in --exclude
work around this by excluding all arch specific directories with
--exclude-dir

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2023-05-16 18:52:50 +00:00
Arne Fitzenreiter
a211d45238 dracut: lower ram usage at compression
this lower the compression ratio sligtly (the ramdlisk is 100kb
larger) and use only a single thread now. (it's still faster than
before on a dual core.)

fixes: #13091

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2023-05-16 18:52:08 +00:00
Peter Müller
ccd793b360 linux: Update rootfiles
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-12 18:29:27 +00:00
Peter Müller
ca9b4dec63 Zut alors, archive.files needs to be executable
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-12 14:47:28 +00:00
Peter Müller
3737b8e98e Revert "zabbix_agentd: Update to 6.0.16 (LTS)"
This reverts commit 2c21437bef.

https://lists.ipfire.org/pipermail/development/2023-May/015885.html -
reverting this temporarily to ensure the nightly builds will run
through.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-12 08:47:59 +00:00
Peter Müller
15d8e278ba Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-11 20:34:43 +00:00
Peter Müller
30b904fb80 Core Update 175: Remove orphaned qpdf libraries, if present
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-11 20:29:21 +00:00
Peter Müller
31620ed428 Core Update 175: Ship more files dependant on OpenSSL
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-11 20:28:45 +00:00
Peter Müller
3486440720 Housekeeping: Only mark files as executable if they have to be
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-11 20:19:20 +00:00
Peter Müller
cf1b407f05 Core Update 175: Ship mpfr
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2023-05-11 20:11:04 +00:00
Adolf Belka
b2e7b0a28b mpfr: Update to include the latest four bug patches
- The base version has not changed but patches to fix 4 bugs have been released.
- Update to rootfile not required.
- Bug fix changelog
	1    A test of the thousands separator in tsprintf.c is based on the output from
              the GNU C Library up to 2.36, which is incorrect. The output has changed in
              2.37 (partly fixed), so that tsprintf fails with glibc 2.37. The
              tsprintf-thousands patch modifies the test to conform to POSIX and also
              avoid the buggy case in 2.36 and below. However, this new test, which was
              expected to succeed, triggers a serious bug in 2.37
              (bug 30068 / CVE-2023-25139). We did not modify the test again since this
              bug affects MPFR's mpfr_sprintf function, with a possible buffer overflow
              in particular cases. This bug has been fixed in the 2.37 branch. In short,
              this patch is useful (and needed) for a fixed glibc 2.37 and some other
              libraries, depending on the current locales.
	     Corresponding changesets in the 4.2 branch: 4f03d40b5, 78ff7526d, e66bb7121.
	2    The mpfr_ui_pow_ui function has infinite loop in case of overflow. This can
              affect mpfr_log10, which uses this function (this is how this bug was
              found). This bug is fixed by the ui_pow_ui-overflow patch (with testcases).
	     Corresponding changeset in the 4.2 branch: 0216f40ed.
	3    The tfprintf and tprintf tests may fail in locales where decimal_point has
              several bytes, such as ps_AF. This is fixed by the multibyte-decimal_point
              patch, which makes the tests aware of the length of decimal_point.
	     Corresponding changeset in the 4.2 branch: 0383bea85.
	4    In particular cases that are very hard to round, mpfr_rec_sqrt may yield a
              stack overflow due to many small allocations in the stack, based on alloca().
              This is due to the fact that the working precision is increased each step
              (Ziv loop) by 32 or 64 bits only, until the approximate result can be
              rounded (thus we have an arithmetic progression here, while a geometric
              progression is used for the other functions), and that at each iteration,
              the previous allocations in the stack cannot be freed. Individual
              allocations in the stack are limited to 16384 bytes, so that the issue can
              occur only when there are many iterations in working precisions that are
              not too large, which is possible with an arithmetic progression. This bug
              is fixed by the rec_sqrt-zivloop patch, which changes the Ziv loop to use
              the standard MPFR_ZIV_* macros; the patch also provides a testcase obtained
              by a function that constructs a hard-to-round case involving large enough
              precisions (this function is commonly used in the MPFR testsuite, but not
              with so large precisions). This bug was originally reported by Fredrik
              Johansson.
	     Corresponding changeset in the 4.2 branch: 934dd8842.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-11 20:10:38 +00:00
Adolf Belka
3e501253bd lvm2: housekeeping - remove invalid configure option
- Since lvmetad was removed then the configure option --enable-lvmetad is no longer valid.
   A warning is now shown - configure: WARNING: unrecognized options: --enable-lvmetad

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2023-05-11 20:10:25 +00:00