wireguard.cgi: Implement deleting peers

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

diff --git a/doc/language_issues.de b/doc/language_issues.de
index aab299e46a87671be40f548f9a90129248daa23e..72f926b64f6556ae1ab5b3e1fcd68bebe75db659 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1045,6 +1045,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string

diff --git a/doc/language_issues.en b/doc/language_issues.en
index e02932ddf9e19afff429345dfee24800ea8f2d45..52e2b00f0d08760d4b030490f15bb3a3b0abf6ad 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2152,6 +2152,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 27a9e70ffda14b2adb3c314979374faf4b55e0a5..be5eca549d345847cc3252de1d08cc0bcfb44542 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1112,6 +1112,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 71ce590f6b6ceb8a491d88a349bf83bea488e966..9559a95edc8d0831e1810ff7fd56af35b021a8e3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1052,6 +1052,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 75805257591fa63ee6f4c144b1329599c55ac612..b6a3d5bd548c4b989480b9bf7fe9bf0ef28bb6f3 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1398,6 +1398,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 3db8614722534425a7fe54313b587f3c85ad2bfa..b77ea2fef43a3fcd46ea0008355577c13c844c68 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1419,6 +1419,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 5674d7be19356423791d8a30d95094c139aded6a..c8a289b6fd52c238a509c45be0931a3c775c0438 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1661,6 +1661,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 795bfe79f6b85d1bab9dd95e93cf55e51ed86625..39e48fdfe2e72f4440558c4377efc00ceafdff97 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1654,6 +1654,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index c515f0af3360c3ab3698b41f238abac09f0cc0d4..e05c2bee36089532728fe11b48427437e08d8fe7 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1281,6 +1281,7 @@ WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg name is already used = The name is already in use
 WARNING: untranslated string: wg no local subnets = No local subnets given
 WARNING: untranslated string: wg no remote subnets = No remote subnets given
+WARNING: untranslated string: wg peer does not exist = Peer does not exist
 WARNING: untranslated string: whitelisted = Whitelisted
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon

diff --git a/doc/language_missings b/doc/language_missings
index 2c4b864aeb0b8418ce81c3a8f75b92c6db684c81..797b72348810a08a677ac0c94fb7a6c9c21c84b5 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -126,6 +126,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < winbind daemon
 < wireguard
 < wlanap 802.11w disabled
@@ -206,6 +207,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < wireguard
 < wlanap
@@ -264,6 +266,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < wireguard
 < wlanap hide ssid
@@ -776,6 +779,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < whois results from
 < winbind daemon
@@ -1364,6 +1368,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < whois results from
 < winbind daemon
@@ -2368,6 +2373,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < whois results from
 < winbind daemon
@@ -3409,6 +3415,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < whois results from
 < winbind daemon
@@ -3827,6 +3834,7 @@
 < wg name is already used
 < wg no local subnets
 < wg no remote subnets
+< wg peer does not exist
 < whitelisted
 < whois results from
 < winbind daemon

diff --git a/html/cgi-bin/wireguard.cgi b/html/cgi-bin/wireguard.cgi
index 40ff611d7207d28bca2f82b32bb8e33299c67495..fb0fcd5ded47efaa47c2f09057c2d090eb265c14 100644 (file)
--- a/html/cgi-bin/wireguard.cgi
+++ b/html/cgi-bin/wireguard.cgi
@@ -83,12 +83,34 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{'save'}) {
                &General::system("/usr/local/bin/wireguardctrl", "stop");
        }
 
+# Delete an existing peer
+} elsif ($cgiparams{"ACTION"} eq $Lang::tr{'remove'}) {
+       my $key = $cgiparams{'KEY'};
+
+       # Fail if the peer does not exist
+       unless (exists $peers{$key}) {
+               push(@errormessages, $Lang::tr{'wg peer does not exist'});
+               goto MAIN;
+       }
+
+       # Delete the peer
+       delete($peers{$key});
+
+       # Store the configuration
+       &General::writehasharray("/var/ipfire/wireguard/peers", \%peers);
+
+       # Reload if enabled
+       if ($settings{'ENABLED'} eq "on") {
+               &General::system("/usr/local/bin/wireguardctrl", "reload");
+       }
+
 # Edit an existing peer
 } elsif ($cgiparams{"ACTION"} eq $Lang::tr{'edit'}) {
        my $key = $cgiparams{'KEY'};
 
        # Fail if the peer does not exist
        unless (exists $peers{$key}) {
+               push(@errormessages, $Lang::tr{'wg peer does not exist'});
                goto MAIN;
        }
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7b836f07a858b5d67b7514f810e4840e80ae7a73..35fe20c10fe94b4737d6a7b36d3805413171bdf7 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3049,6 +3049,7 @@
 'wg name is already used' => 'The name is already in use',
 'wg no local subnets' => 'No local subnets given',
 'wg no remote subnets' => 'No remote subnets given',
+'wg peer does not exist' => 'Peer does not exist',
 'whitelisted' => 'Whitelisted',
 'whois results from' => 'WHOIS results from',
 'wildcards' => 'Wildcards',