From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 13/20] suricata: Add option to scan WireGuard
Date: Tue, 10 Sep 2024 14:37:26 +0000
Message-ID: <20240910143748.3469271-14-michael.tremer@ipfire.org>
In-Reply-To: <20240910143748.3469271-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0158665054186972017=="
List-Id: <development.lists.ipfire.org>

--===============0158665054186972017==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 doc/language_missings                        | 8 ++++++++
 html/cgi-bin/ids.cgi                         | 6 +++++-
 langs/en/cgi-bin/en.pl                       | 1 +
 src/initscripts/networking/functions.network | 6 ++++++
 src/initscripts/system/suricata              | 2 +-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/doc/language_missings b/doc/language_missings
index 98856b0e8..94adb28d8 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -103,6 +103,7 @@
 < upload fcdsl.o
 < user management
 < vpn configuration main
+< wg
 < winbind daemon
 < wireguard
 < wlanap 802.11w disabled
@@ -156,6 +157,7 @@
 < timeformat
 < transport mode does not support vti
 < warning
+< wg
 < wireguard
 < wlanap
 < wlanap psk
@@ -185,6 +187,7 @@
 < timeformat
 < upload fcdsl.o
 < warning
+< wg
 < wireguard
 < wlanap psk
 < wlanap wireless mode
@@ -668,6 +671,7 @@
 < vulnerable
 < warning
 < Weekly
+< wg
 < whois results from
 < winbind daemon
 < wireguard
@@ -1229,6 +1233,7 @@
 < vulnerable
 < warning
 < Weekly
+< wg
 < whois results from
 < winbind daemon
 < wireguard
@@ -2205,6 +2210,7 @@
 < vulnerable
 < warning
 < Weekly
+< wg
 < whois results from
 < winbind daemon
 < wireguard
@@ -3218,6 +3224,7 @@
 < warning
 < week-graph
 < Weekly
+< wg
 < whois results from
 < winbind daemon
 < wireguard
@@ -3608,6 +3615,7 @@
 < vulnerable
 < warning
 < Weekly
+< wg
 < whois results from
 < winbind daemon
 < wireguard
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 502e2a125..00cc502f1 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -53,6 +53,9 @@ my %ignored=3D();
 # the list of zones in an array.
 my @network_zones =3D &Network::get_available_network_zones();
=20
+# Always show Wireguard
+push(@network_zones, "wg");
+
 # Check if openvpn is started and add it to the array of network zones.
 if ( -e "/var/run/openvpn.pid") {
 	push(@network_zones, "ovpn");
@@ -69,7 +72,8 @@ my %colourhash =3D (
 	'green' =3D> $Header::colourgreen,
 	'blue' =3D> $Header::colourblue,
 	'orange' =3D> $Header::colourorange,
-	'ovpn' =3D> $Header::colourovpn
+	'ovpn' =3D> $Header::colourovpn,
+	'wg' =3D> $Header::colourwg,
 );
=20
 &Header::showhttpheaders();
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index dca9f1645..6a455ab6d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3020,6 +3020,7 @@
 'week-graph' =3D> 'Week',
 'weekly firewallhits' =3D> 'weekly firewallhits',
 'weeks' =3D> 'Weeks',
+'wg' =3D> 'WireGuard',
 'whois results from' =3D> 'WHOIS results from',
 'wildcards' =3D> 'Wildcards',
 'winbind daemon' =3D> 'Winbind Daemon',
diff --git a/src/initscripts/networking/functions.network b/src/initscripts/n=
etworking/functions.network
index c189c2fbc..02ac6b8fe 100644
--- a/src/initscripts/networking/functions.network
+++ b/src/initscripts/networking/functions.network
@@ -92,9 +92,15 @@ network_get_intf() {
 			fi
 			;;
=20
+		WIREGUARD|WG)
+			echo "wg+"
+			return 0
+			;;
+
 		OPENVPN|OVPN)
 			# OpenVPN is using all tun devices
 			echo "tun+"
+			return 0
 			;;
 	esac
=20
diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index 0447b7e8c..6990b79ca 100644
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -41,7 +41,7 @@ IPS_SCAN_MARK=3D"0x10000000"
 IPS_SCAN_MASK=3D"0x10000000"
=20
 # Supported network zones
-NETWORK_ZONES=3D( "RED" "GREEN" "ORANGE" "BLUE" "OVPN" )
+NETWORK_ZONES=3D( "RED" "GREEN" "ORANGE" "BLUE" "WG" "OVPN" )
=20
 # Optional options for the Netfilter queue.
 NFQ_OPTS=3D(
--=20
2.39.2


--===============0158665054186972017==--