Commit Graph

3128 Commits

Author SHA1 Message Date
Michael Tremer
74218cba8c Merge branch 'master' into next 2024-09-29 11:29:11 +00:00
Michael Tremer
a7ac62f4a6 ovpnmain.cgi: Remove using dropped &General::getlastip() function
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-26 20:40:04 +00:00
Michael Tremer
d1a3fd9e0d ovpnmain.cgi: Fix IP address calculation with static pools
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-26 14:11:46 +00:00
Michael Tremer
6ca5fb74ab Merge branch 'master' into next 2024-09-24 08:54:50 +00:00
Michael Tremer
e5da7dea66 ids.cgi: Add UI to enable scanning on IPsec
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:45:35 +00:00
Michael Tremer
4efa4c4b71 ids.cgi: Don't show the graph if there is no RRD data
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:44:42 +00:00
Michael Tremer
0c5a683b7e ids.cgi: Fix empty states of tables
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:44:34 +00:00
Michael Tremer
4721fac3c8 IPS: Ada a graph that shows the IPS throughput
This graph is split into three parts. One shows bypassed packets, the
next one shows the actually scanned packets and lastly we show the total
throughput.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:44:12 +00:00
Michael Tremer
8b73307b15 suricata: Force Suricata to write a PID file again
The PID file does not get written when Suricata is not being started in
daemon mode and therefore we need to pass it as a command line
parameter.

The initscript should not deal with the PID file when starting but needs
it to terminate the process and to check the process status.

The web UI can use the PID file again.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:44:02 +00:00
Michael Tremer
2438c6c249 ids.cgi: Fix detection for the Suricata process
We don't seem to have a PID file any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:35 +00:00
Michael Tremer
d3db046570 ids.cgi: Remove box from the top section
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:30 +00:00
Michael Tremer
d2f7d18e33 ids.cgi: Sort whitelist entries
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:23 +00:00
Michael Tremer
891702cad1 ids.cgi: Use new-style table for whitelist entries
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:18 +00:00
Michael Tremer
119cb83706 ids.cgi: Use new style tables for rulesets
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:11 +00:00
Michael Tremer
50f3e2a534 suricata: Fix broken spacing in the settings section
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:43:06 +00:00
Michael Tremer
1b7d1abdf0 suricata: Add option to scan WireGuard
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-24 08:42:59 +00:00
Michael Tremer
1d66bc478b web: Fix reloading graphs
Suggested-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-23 19:44:42 +00:00
Michael Tremer
4ac5aaf635 log.dat: Remove stupid line breaks and update markup of table
Reported-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-23 14:50:32 +02:00
Michael Tremer
c55ce64de5 ovpnmain.cgi: Fix IP address calculation with static pools
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-09-22 14:33:03 +00:00
Adolf Belka
9c07eb0602 vpnmain.cgi: Add coding to differentiate old and base64 encoded PSK's
- An additional key was defined for a PSK being base64 encoded. All existing PSK's that
   are not base64 encoded will have that key empty. This enables base64 encoded PSK's and
   non base64 encoded PSK'sd to be differentiated.
- If the PSK connection is disabled and then enabled with a non base64 encoded PSK the PSK
   will be left as it is. If the edit page is selected and Save pressed, even if nothing
   has been modified, then the PSK will be converted to a base64 encoded PSK.
- The old style and new style PSK was tested out on my vm system and worked without any
   issue.
- Using an old non base64 encoded PSK the IPSec connection worked without any problems.
   If the PSK was tehn converted to basse64 encoding by saving from the Edit page without
   changing anything, then the client IPSec connection was successfully made without any
   indication of a change. The conversion from non base64 to base64 encoded PSK occurred
   seamlessly without any hiccup.

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:23:41 +00:00
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
828f2bdd44 CSS: Make the black less agressive
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-21 12:35:55 +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
fd02fb29d8 CSS: Decrease the size of h6 headlines
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-14 16:54:19 +00:00
Michael Tremer
6a47b385b7 CSS: Make form input elements use the entire width again
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-14 16:54:13 +00:00
Michael Tremer
7ee7452042 CSS: Add class to automatically style forms
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2024-08-14 16:54:06 +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