Commit Graph

2897 Commits

Author SHA1 Message Date
Peter Müller
818dde8e8b IPsec/OpenVPN: Use 4,096-bit RSA for host certificates as well
We already moved away from 2048-MODP in Core Update 170. Similarly,
German Federal Office for Information Security (BSI) recommends shifting
away from RSA keys below 3,000 bits by the end of 2022 at the latest.

The only place left in IPFire 2.x where we generate such keys is for
IPsec and OpenVPN host certificates. This patch increases their key
sizes to 4,096 bits as well - CA certificates already have this length.

Existing VPN connections cannot be migrated automatically. However, only
the respective host certificate has to be regenerated - thanks to the CA
certificates' key length being sufficient, there is no need to replace
the entire VPN CA.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-11-03 16:49:51 +00:00
Robin Roevens
8ed997102e services.cgi: add link to addon config if ui exists for it
* If a cgi file exists with the same name as an addon, the
  displayed service will be a link to that cgi file.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-10-29 08:56:48 +00:00
Robin Roevens
4f205b5442 services.cgi: add restart action and restrict action usage
* Add restart action to services.
* Only display available actions for a service:
  Start when service is stopped or Stop and Restart when a service
  is running.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-10-29 08:56:48 +00:00
Robin Roevens
207ca1141c services.cgi: minor cosmetics
* Singular 'Service' instead of plural 'Services' as column header of
  services table
* Sort list of services

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-10-29 08:56:48 +00:00
Robin Roevens
2b9b31b71d services.cgi: Fix status/actions on services with name != addon name
* addonctrl's new functionality to control explicit addon services was
  implemented.
* Change 'Addon' column header to 'Addon Service' to be clear that
  it's not addons but services listed here.
* Services not matching the name of the addon now display the addon
  name between parentheses, so the user knows where the service comes
  from.
* When no valid runlevel symlink is found by addonctrl for a service,
  the 'enable on boot' checkbox is replaced by a small exclamation point
  with alt-text "No valid runlevel symlink was found for the initscript of
  this service." to inform user why a service can't be enabled.
* Added German and Dutch translation for above message.

Fixes: Bug#12935
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-10-29 08:56:48 +00:00
Peter Müller
c480cb54f0 Update contributor list
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-10-03 10:07:49 +00:00
Matthias Fischer
e0be9eab47 proxy.cgi: Fix for Bug #12826 'squid >=5 crashes on literal IPv6 addresses'
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
2022-10-02 08:50:39 +00:00
Adolf Belka
a15c20fde9 log.dat: Add NUT entry for System Logs - Fixes bug#12921
- Also aligned all the code entries in %sections and %trsections

Suggested-by: Michael <ip.fire@die-fritzens.de>
Tested-by: Michael <ip.fire@die-fritzens.de>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
2022-09-23 10:36:33 +00:00
Peter Müller
bd94d36335 Update contributors
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-09-17 09:45:30 +00:00
Jon Murphy
3da3c1848e urlfilter.dat: change ipcop to ipfire
- Removed remnant from IPCop on URL Filter Logs Export page.

Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
2022-09-11 08:48:00 +00:00
Peter Müller
ce455a00a6 Merge branch 'next' into temp-c171-development 2022-09-11 08:20:29 +00:00
Michael Tremer
ba4f53c565 proxy.cgi: Correctly validate domain lists
Fixes: #12925 - JVN#15411362 Inquiry on vulnerability found in IPFire
Reported-by: Noriko Totsuka <vuls@jpcert.or.jp>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-09-11 08:12:00 +00:00
Michael Tremer
7cb63527d9 mail.cgi: Validate email recipient
The email recipient was not correctly validated which allowed for some
stored cross-site scripting vulnerability.

Fixes: #12925 - JVN#15411362 Inquiry on vulnerability found in IPFire
Reported-by: Noriko Totsuka <vuls@jpcert.or.jp>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-09-11 08:11:56 +00:00
Michael Tremer
a61509b995 index.cgi: Show deprecation warning for armv6l
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
2022-09-01 21:15:47 +00:00
Michael Tremer
69d4453e08 IPsec: Enable ECP-521/384 by default for new connections
https://lists.ipfire.org/pipermail/development/2022-August/014129.html

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
2022-08-11 18:32:27 +00:00
Peter Müller
46803376d5 vpnmain.cgi: Mark MODP-1536 as broken, phase out MODP-2048
https://weakdh.org/imperfect-forward-secrecy-ccs15.pdf (released in
2015) recommends "to use primes of 2048 bits or larger", to which BSI's
techical guideline BSI-TR-02102 (https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR02102/BSI-TR-02102.pdf?__blob=publicationFile&v=5)
concurs. The latter also recommends not to use DH groups comprising of
less than 2000 bits after 2022, and shift to 3000 bit DH groups earlier
as a precaution.

According to RFC 3526, section 8, MODP-1536 provides an estimated
security between 90 and 120 bits, a value that can be reasonably
considered broken today, as it has been so for other types of
cryptographic algorithms already, and per section 2.4 in the
aforementioned paper, breaking 1024-bit DH is considered feasible for
the NSA in 2015, which does not inspire confidence for MODP-1536 in
2022.

Therefore, this patch suggests to mark MODP-1536 as broken, since it
de facto is, and tag MODP-2048 as weak. The latter is also removed from
the default selection, so newly created VPN connections won't use it
anymore, to follow BSI's recommendations of using DH groups >= 3000 bits
in 2022 and later.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
2022-08-11 18:30:49 +00:00
Peter Müller
d52d6f0cbe Update contributor list
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-08-06 07:58:03 +00:00
Peter Müller
7ee2eec3a2 vulnerabilities.cgi: Add Retbleed (CVE-2022-29900, CVE-2022-29901)
Please refer to https://comsec.ethz.ch/research/microarch/retbleed/ for
further details on this vulnerability.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-08-01 10:19:19 +00:00
Robin Roevens
5cc18f9c12 pakfire: Replace getmetadata duplicate code
- Use getmetadata function in services.cgi to determine installed
  addon services to display. Removing code duplication and intel that
  should only be known by pakfire itself.
- Removed hardcoded exclusions:
  - squid should show up correctly using the new metadata info
  - mdadm is part of core and will never show up here
  - alsa, unknown if this problem still exists, but if it is, this
    should be handled somewhere else.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-28 13:44:29 +00:00
Robin Roevens
e360a9cb13 pakfire: Replace status duplicate code
- Make use of renewed status function in pakfire.cgi removing duplicate
  code

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-28 13:44:29 +00:00
Robin Roevens
2b25c02932 pakfire: Translate WUI header/footer text
Add en/nl/fr/de translations for:
  - Traffic: In XXX bit/s Out XXX bit/s
  - IPFire X.XX (xxx) - Core Update XXX ...

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-28 13:44:29 +00:00
Robin Roevens
0bd5b13195 pakfire: Refactor dblist seperating UI and logic
- Removed UI code from dblist function and refactor it making it return
  a hash representing the pak db for easier handling of this data.
- Moved core update check in dblist to new seperate dbcoreinfo function
  making it return a hash with current and possibly available core
  version info.
- Update existing calls to dblist
- Bring UI parts previously in dblist to pakfire program itself,
  pakfire.cgi and index.cgi with a few small enhancements:
  - Translations for 'Core-Update', 'Release', 'Update' and 'Version'
  - Add currently installed version numbers to installed paks list in
    pakfire.cgi
  - Add 'Installed: yes/no' to pakfire list output so people not using
    colors have this information too. (Partly fixes Bug #12868)
  - Add update available details to pakfire list output if package has
    updates available.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-28 13:44:29 +00:00
Stefan Schantl
d0ee27149d logs.cgi/ids.dat: Proper display logged events.
Fix the regular expression to proper display the logged IDS events.

Fixes #12899.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-07-27 07:11:04 +00:00
Matthias Fischer
8aab72f01b services.cgi: Add link to DNS settings
This just came to my view...

I know its not *actually* a link to a "DNS-Proxyserver", but I find it
nice that I can change to the page containing some of the main DNS settings
in just one click. I thought it could be useful.

JM2C

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-07-27 07:09:48 +00:00
Matthias Fischer
bda851172f ipblocklist.cgi: Theme fix
Themes have been dropped - 'ipblocklist.cgi' refused to start.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Acked-by: Stefan Schantl  <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-07-19 07:49:28 +00:00
Peter Müller
4794ebdedd Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-07-10 08:34:45 +00:00
Stefan Schantl
2493c9eabb ipblocklist.cgi: Display reload request as notice instead of error.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:28:06 +02:00
Stefan Schantl
77af89e59f ipblocklist.cgi: Use changed fw reload language string.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:28:05 +02:00
Stefan Schantl
6223e2b498 showrequestfromblocklist.dat: Fix silly typos.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:26:14 +02:00
Rob Brewer
3e0cb28fc6 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>
2022-07-07 17:26:14 +02:00
Rob Brewer
98d50c03e7 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>
2022-07-07 17:26:14 +02:00
Stefan Schantl
3b114903aa ipblocklist.cgi: Mark and display a notice about a required reload of
the firewall.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:26:14 +02:00
Stefan Schantl
a72c2458c4 ipblocklist.cgi: Add better messages in error case.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:26:14 +02:00
Tim FitzGeorge
c0472dcf2a 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>
2022-07-07 17:26:14 +02:00
Rob Brewer
d6b0613744 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>
2022-07-07 17:26:14 +02:00
Tim FitzGeorge
cd07e6c659 ipblacklist: WUI Log details page
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:26:14 +02:00
Tim FitzGeorge
09a8d6127a ipblocklist: WUI Log page
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-07-07 17:26:14 +02:00
Stefan Schantl
8f49b75b08 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>
2022-07-07 17:26:14 +02:00
Tim FitzGeorge
5d24215341 ipblocklist: WUI Settings page
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
2022-07-07 17:26:13 +02:00
Peter Müller
20d4c7293a Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-07-06 12:37:29 +00:00
Michael Tremer
6395bed8a4 aliases: Add support to assign aliases to multiple RED interfaces
This is a little patch which will extend the aliases page to offer an
interface selection if there are more than one RED interfaces.

This is a little hack to make configuration easier for users who have
manually set up more than one RED interface (e.g. for load balancing or
fail-over) and want to use the UI to configure firewall rules.

As a little benefit on the side, I had to rewrite setaliases.c to use
ip(8) instead of ifconfig(8).

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
2022-07-06 10:01:50 +00:00
Peter Müller
8000bc0a43 Core Update 169: Drop entropy.cgi
Since the kernel now always reports 256 bits of entropy to be available,
this CGI does not show any useful information anymore. To avoid
confusions, it will hereby be removed entirely.

Fixes: #12893
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-06-29 20:28:38 +00:00
Adolf Belka
dcc2f7e0f2 ovpnmain.cgi: Fix for bug #12865 - Static IP address pools - Add network - Name with space
- The fix for bug #12428 removed spaces from the validhostname subroutine as hostnames are
   not supposed to have spaces
- This resulted in spaces no longer being allowed for the Static IP Address Pools names
- New subroutine created called validccdname in general-functions.pl

Fixes: Bug #12865
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2022-06-25 09:14:22 +00:00
Adolf Belka
f158e71e20 ovpnmain.cgi: Fix for bug #12883 - separate .p12 file corrupted
- Patch https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=2feacd989823aa1dbd5844c315a9abfd49060487
   from May 2021 put the variable containing the .p12 content into double quotes which
   causes the contents to be treated as text whereas the .p12 file is an application file.
- Most people must be downloading the zip package of .p12, ovpn.conf and ta.key files so
   the problem was not noticed till now and flagged up in the forum.
   https://community.ipfire.org/t/openvpn-p12-password-on-android-problem/8127
- The problem does not occur for the .p12 file in the zip file as the downloading of the
   zip file does not have the variable name in double quotes.
- Putting the zip file variable into double quotes caused the downloaded zip file to be
   corrupt and not able to be opened as an archive.
- Removing the double quotes from the .p12 variable name caused the separate .p12 file
   download to be able to be correctly opened.
- The same quoted variable name is used also for the cacert.pem, cert.pem, servercert.pem
   and ta.key file downloads. To be consistent the same change has been applied to these.

Fixes: Bug #2883
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2022-06-23 13:24:03 +00:00
Peter Müller
34798dcd50 vulnerabilities.cgi: Add MMIO Stale Data
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-06-22 18:11:11 +00:00
Peter Müller
39c9a69406 Run ./make.sh update-contributors
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-06-17 16:49:57 +00:00
Timo Eissler
3740b7ad3a ovpnmain.cgi: URI encode OTPAuth String in QRCode
Signed-off-by: Timo Eissler <timo.eissler@ipfire.org>
2022-06-17 10:22:31 +00:00
Timo Eissler
209d62f005 ovpnmain.cgi: Remove trailing newline from OTP secret
Signed-off-by: Timo Eissler <timo.eissler@ipfire.org>
2022-06-17 10:22:31 +00:00
Timo Eissler
10b32d3895 ovpnmain.cgi: Fix OTP secret handling
Convert stored hex OTP secret to binary prior to converting to base32.
2022-06-17 10:20:19 +00:00
Timo Eissler
16d4a5c264 ovpnmain.cgi: Fix comparison operators 2022-06-17 10:20:18 +00:00