wireguard.cgi: Add client pool config option

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 53540a0b805e573a17cc0eda59aeeff0ebe50b2b..b45fd17782bb6fdfa46d069ed906e05b5e4f975d 100644 (file)
--- 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 1d39d085c2b3dc623e3352db98d4e45bf35acf7e..cc6c3de56353a4f1a54c7bb9e4bd6fefdc8b93c4 100644 (file)
--- 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 8b591e379b5e60a88ff5c1b09641110b21ead0fd..4ca0d4fd923cfd74c3fefe304d670b556e15e75b 100644 (file)
--- 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 6d32700c5bc2c7985385b8798c46a43581240329..3e3b6096ea1fa26b7da3a45e3d9e10061d7b75da 100644 (file)
--- 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 f0e1a2e0c01e6830ae066ff1437f2f3cb8224839..30226d1a18d6c6da4d5c333364ba69dd97ddea53 100644 (file)
--- 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 e136e5e48697353dd9ce90cd757f1c3aa488fede..14f92a8f10eabfde18e9797df7daceec0e354125 100644 (file)
--- 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 b7bc9972e70e1fa94cd700c680b0feb3486f4963..7d92546b4be76c5bf0162592f75190a04bad4d65 100644 (file)
--- 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 12b7a642e7bade70eab1996c520ed47d0842f0f0..4e6b60db8b9d7b9330a919d07418e9d7a2cb815e 100644 (file)
--- 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 59f5cf651c4388831e5859f1e204619906bd0fa9..4feea2d53a3885e5d59832de3bca4b6323afb96b 100644 (file)
--- 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 cb46f879ad0fd35ab9e293e8b415700ae52c4ed8..6a6226cc56f8631c78c32db54747986f26acc377 100644 (file)
--- 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 f691ff007f17ff92906c635315a5f21ddac432f1..a85fb05f3d3732dc9d9999f00f7e213a10d3a083 100644 (file)
--- 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:
                                        </td>
                                </tr>
 
+                               <tr>
+                                       <td>$Lang::tr{'wg client pool'}</td>
+                                       <td>
+                                               <input type="text" name="CLIENT_POOL" value="$settings{'CLIENT_POOL'}" />
+                                       </td>
+                               </tr>
+
                                <tr class="action">
                                        <td colspan="2">
                                                <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 613a5e1472f0bac3090223b6ec811fa37ea286a3..0567e4dc82be022639315d80c0ed00080a6380ce 100644 (file)
--- 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)',