From f84c7d0bdac38fb6ed7105a21c1f2422ddbcd656 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 25 Apr 2024 12:57:08 +0200 Subject: [PATCH] wireguard.cgi: Add client pool config option Signed-off-by: Michael Tremer --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 16 ++++++++++++++++ html/cgi-bin/wireguard.cgi | 16 +++++++++++++++- langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 51 insertions(+), 1 deletion(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 53540a0b8..b45fd1778 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1034,8 +1034,10 @@ WARNING: untranslated string: show tls-auth key = Show tls-auth key WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: subscription code = Subscription code WARNING: untranslated string: user management = User Management +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.en b/doc/language_issues.en index 1d39d085c..cc6c3de56 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2141,8 +2141,10 @@ WARNING: untranslated string: web server = Web Server WARNING: untranslated string: website = Website WARNING: untranslated string: wednesday = Wednesday WARNING: untranslated string: weeks = Weeks +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.es b/doc/language_issues.es index 8b591e379..4ca0d4fd9 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1101,8 +1101,10 @@ WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z WARNING: untranslated string: total = Total WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6d32700c5..3e3b6096e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1041,8 +1041,10 @@ WARNING: untranslated string: system time = System Time (as of last page load) WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z WARNING: untranslated string: total = Total WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.it b/doc/language_issues.it index f0e1a2e0c..30226d1a1 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1387,8 +1387,10 @@ WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.nl b/doc/language_issues.nl index e136e5e48..14f92a8f1 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1408,8 +1408,10 @@ WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.pl b/doc/language_issues.pl index b7bc9972e..7d92546b4 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1650,8 +1650,10 @@ WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 12b7a642e..4e6b60db8 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1643,8 +1643,10 @@ WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 59f5cf651..4feea2d53 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1270,8 +1270,10 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable WARNING: untranslated string: warning = Warning +WARNING: untranslated string: wg client pool = Client Pool WARNING: untranslated string: wg create peer = Create A New Peer WARNING: untranslated string: wg edit peer = Edit Peer +WARNING: untranslated string: wg invalid client pool = Invalid client pool WARNING: untranslated string: wg invalid endpoint address = Invalid endpoint address WARNING: untranslated string: wg invalid endpoint port = Invalid endpoint port WARNING: untranslated string: wg invalid keepalive interval = Invalid Keepalive Interval (Must be between 0 and 65535) diff --git a/doc/language_missings b/doc/language_missings index cb46f879a..6a6226cc5 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -115,8 +115,10 @@ < user management < vpn configuration main < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -200,8 +202,10 @@ < transport mode does not support vti < warning < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -263,8 +267,10 @@ < upload fcdsl.o < warning < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -780,8 +786,10 @@ < warning < Weekly < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -1373,8 +1381,10 @@ < warning < Weekly < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -2382,8 +2392,10 @@ < warning < Weekly < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -3428,8 +3440,10 @@ < week-graph < Weekly < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval @@ -3851,8 +3865,10 @@ < warning < Weekly < wg +< wg client pool < wg create peer < wg edit peer +< wg invalid client pool < wg invalid endpoint address < wg invalid endpoint port < wg invalid keepalive interval diff --git a/html/cgi-bin/wireguard.cgi b/html/cgi-bin/wireguard.cgi index f691ff007..a85fb05f3 100644 --- a/html/cgi-bin/wireguard.cgi +++ b/html/cgi-bin/wireguard.cgi @@ -71,8 +71,15 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{'save'}) { push(@errormessages, $Lang::tr{'invalid port'}); } + # Check client pool + if (&Network::check_subnet($cgiparams{'CLIENT_POOL'})) { + $settings{'CLIENT_POOL'} = $cgiparams{'CLIENT_POOL'}; + } else { + push(@errormessages, $Lang::tr{'wg invalid client pool'}); + } + # Don't continue on error - goto MAIN if (@errormessages); + goto MAIN if (scalar @errormessages); # Store the configuration file &General::writehash("/var/ipfire/wireguard/settings", \%settings); @@ -403,6 +410,13 @@ MAIN: + + $Lang::tr{'wg client pool'} + + + + + diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 613a5e147..0567e4dc8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -3038,8 +3038,10 @@ 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'Weeks', 'wg' => 'WireGuard', +'wg client pool' => 'Client Pool', 'wg create peer' => 'Create A New Peer', 'wg edit peer' => 'Edit Peer', +'wg invalid client pool' => 'Invalid client pool', 'wg invalid endpoint address' => 'Invalid endpoint address', 'wg invalid endpoint port' => 'Invalid endpoint port', 'wg invalid keepalive interval' => 'Invalid Keepalive Interval (Must be between 0 and 65535)', -- 2.39.5