Commit Graph

2976 Commits

Author SHA1 Message Date
Adolf Belka
9d8d74e8e7 vpnmain.cgi: Fix for bug13029 - add base64 encoding to IPSec cgi page
- This adds the base64 encoded PSK into the config file and when the ipsec.secrets file
   is created the PSK is base64 decoded to write it to the file. The ipsec.secrets file
   surrounds the PSK with single quotation marks so that character is not allowed to be
   used in the PSK but anything else can be.
- Tested out on my vm system and shown to be working. New PSK with various characters
   characters including commas was base64 encoded before putting into the config file
   and therefore was accepted by the code. If a single quotation mark was used in the
   PSK then the error message about invalid characters was shown.

Fixes: Bug13029
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-22 14:21:53 +00:00
Adolf Belka
90227a65b4 log.dat: Fix bug13762 - ssh logins not shown in system logs
- With the update of openssh to version 9.8 in CU187 the daemon was changed from sshd to
   sshd-session. Therefore the log.dat no longer finds any info related to the logins.
- This updates the section regex to look for both sshd and sshd-session.
- Tested out on my vm system and confirmed to work.
- This fix will make available all previous log info for sshd-session in the messages log
   as it continued to be stored, just could not be read by the WUI system log.

Fixes: bug13762
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-22 14:16:43 +00:00
Michael Tremer
bbfa373e84 wlanap.cgi: Fix listing channels
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-21 12:27:54 +00:00
Michael Tremer
c027d3a410 wlanap.cgi: Fix copying configuration
This allows to uncheck checkboxes again.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 14:12:07 +02:00
Michael Tremer
9f30d83f50 wlanap.cgi: Change broadcast SSID to hide SSID
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:55:40 +02:00
Michael Tremer
65ec7b9d83 index.cgi: Update wireless functions to use iw instead of iwconfig
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:42:05 +02:00
Michael Tremer
67597f2643 wlanap.cgi: Default to channel 0 for ACS
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:19:10 +02:00
Michael Tremer
dc2d68858d wlanap.cgi: Enable Neighbourhood Scan by default
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:17:59 +02:00
Michael Tremer
58a5aaeec9 wlanap.cgi: Don't try to show status if there is no interface
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:16:44 +02:00
Michael Tremer
3c5b638400 wlanap.cgi: Correctly show broadcast SSID status
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 13:13:41 +02:00
Michael Tremer
fc4ba90b43 wlanap.cgi: Disable generating Perl warnings
Reported-by: Waynie <waynet@ucpix.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-20 11:30:52 +01:00
Michael Tremer
a45828d2ca make.sh: Run "update-contributors"
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-16 14:48:50 +00:00
Michael Tremer
d7eb312d0f guardian.cgi: Use the new service widget
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 16:14:40 +02:00
Michael Tremer
cc0304b7bd index.cgi: Improve the warning box
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 15:47:08 +02:00
Michael Tremer
590dcf8703 samba.cgi: Fix styling of the configuration form
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 15:25:13 +02:00
Michael Tremer
0a8800657d samba.cgi: Use the new service status widget
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 15:20:51 +02:00
Michael Tremer
9984ed3d5a firewall.cgi: Fix messy table striping
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 15:11:59 +02:00
Michael Tremer
3fb7849c21 services.cgi: Search for suricata by its PID
suricata renames itself and therefore we cannot find the process by its
name.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 12:24:24 +02:00
Michael Tremer
234fd050d4 vpnmain.cgi: Fix colouring of the connection status when disconnected
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 12:22:40 +02:00
Michael Tremer
f00b2fa778 wlanap.cgi: Always advertise TPC, support UTF-8 SSIDs
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-16 15:18:18 +00:00
Michael Tremer
9b1225603f wlanap.cgi: Refactor the entire thing
This went really bad with the latest CSS changes. So this is a
refactor/rewrite of the CGI without many modifications.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-16 15:10:29 +00:00
Michael Tremer
9f3c37ab0c ovpnmain.cgi: Unify the error message box
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-14 16:53:54 +00:00
Michael Tremer
b058000c23 Merge remote-tracking branch 'ms/unbound-socket' into next 2024-08-13 09:27:25 +00:00
Michael Tremer
a68afb6b7b extrahd.cgi: Make table use the full width
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:36:24 +02:00
Michael Tremer
a0d7f366c9 qos.cgi: Make all tables use the full width
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:35:02 +02:00
Michael Tremer
005efd4e29 firewall.cgi: Merge the ID and policy columns
This saves us a little bit of space and looks tidier to me.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:29:23 +02:00
Michael Tremer
75732eb180 firewall.cgi: Fix policy colours for rules
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:24:48 +02:00
Michael Tremer
f73de15117 firewall.cgi: Remove box around top buttons
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:20:30 +02:00
Michael Tremer
06345fbc0d firewall.cgi: Fix colouring of the rule actions
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:18:01 +02:00
Michael Tremer
824f4c9709 firewall.cgi: Fix colouring of the default firewall policy
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 16:10:48 +02:00
Michael Tremer
21cef19975 ovpnmain.cgi: Fix connection status colours
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:45:24 +02:00
Michael Tremer
3cfe40fa65 vpnmain.cgi: Fix connection status colours
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:39:40 +02:00
Michael Tremer
4f0f0a9d2a services.cgi: Remove showing the PIDs for add-on services
This was only showing one PID and I don't see any reason why anyone
would need this.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:31:11 +02:00
Michael Tremer
6fa4cdf7e3 services.cgi: Use new functions to figure out memory usage
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:29:57 +02:00
Michael Tremer
1392ccfe30 services.cgi: Fix colouring of the add-on status
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:27:22 +02:00
Michael Tremer
094b9c66de services.cgi: Remove manual table striping
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:24:14 +02:00
Michael Tremer
33e76e6e2c services.cgi: Remove excessive styling that has no effect
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:20:56 +02:00
Michael Tremer
b66718b334 connections.cgi: Only evaluate value networks
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 15:14:14 +02:00
Michael Tremer
4d0a12624d connections.cgi: Remove country headline
This takes way more space than the actual flag and therefore makes the
table wider which we don't want.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:28:52 +02:00
Michael Tremer
0221bacb74 connections.cgi: Refactor reading networks
This is still a total nightmare because we are yet again writing
functions that read the same configuration files all over again.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:28:42 +02:00
Michael Tremer
81784657c9 connections.cgi: Remove the extra box
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:28:28 +02:00
Michael Tremer
aaa9c561c1 connections.cgi: Use &General::format_time()
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:28:19 +02:00
Michael Tremer
dd66b39d6b connections.cgi: Make it clearer which direction traffic is flowing
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:28:03 +02:00
Michael Tremer
69dcb9bd65 connections.cgi: Use &General::formatBytes() for format usage
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:27:12 +02:00
Michael Tremer
0e8bb539ce connections.cgi: Use the .tbl class for the main table
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:27:02 +02:00
Michael Tremer
60d9097511 connections.cgi: Parse conntrack table without loading it all first
We used to load the entire table into memory which is very unnecessary
because we can parse it one line at a time.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:26:53 +02:00
Michael Tremer
7f2fbf2767 connections.cgi: Remove sorting
This has first of all very little benefit and the code is too messy. Why
would anyone want to sort by port? I think we might want a search here.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:26:34 +02:00
Michael Tremer
8e59261446 connections.cgi: Define colours for WG address space
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:26:28 +02:00
Michael Tremer
2682a1d17a ids.cgi: Use the PID file to find suricata
The process changes it name to "Suricata-Main" which is why the previous
method did not work.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:16:43 +02:00
Michael Tremer
3fb09506ae ids.cgi: Use new services function
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-07 14:11:40 +02:00