wireguard-functions.pl: Complain if required fields are missing

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

diff --git a/config/cfgroot/wireguard-functions.pl b/config/cfgroot/wireguard-functions.pl
index e9dc667472a1f77c61186bfe2262289d4998c3f4..909b33a29096d53b361fbccbde87c14e38bcc5f3 100644 (file)
--- a/config/cfgroot/wireguard-functions.pl
+++ b/config/cfgroot/wireguard-functions.pl
@@ -599,6 +599,31 @@ sub parse_configuration($$) {
                }
        }
 
+       # Check if we have all required properties
+       unless (exists $peer{"PRIVATE_KEY"}) {
+               push(@errormessages, $Lang::tr{'wg missing private key'});
+       }
+
+       unless (exists $peer{"PUBLIC_KEY"}) {
+               push(@errormessages, $Lang::tr{'wg missing public key'});
+       }
+
+       unless (exists $peer{"REMOTE_SUBNETS"}) {
+               push(@errormessages, $Lang::tr{'wg missing allowed ips'});
+       }
+
+       unless (exists $peer{"PORT"}) {
+               push(@errormessages, $Lang::tr{'wg missing port'});
+       }
+
+       unless (exists $peer{"ENDPOINT_ADDRESS"}) {
+               push(@errormessages, $Lang::tr{'wg missing endpoint address'});
+       }
+
+       unless (exists $peer{"ENDPOINT_PORT"}) {
+               push(@errormessages, $Lang::tr{'wg missing endpoint port'});
+       }
+
        return \%peer, @errormessages;
 }
 

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 39e934047172cff902e95db810c8a620ebdfaa7b..c61a886e9c7a1ec1130ac3df9f424d0e78d4c7f8 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -417,7 +417,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1060,6 +1059,12 @@ WARNING: untranslated string: wg invalid psk = Invalid pre-shared key
 WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 834ffa13b8e7e621f052b19dd9cfeb11e2244b1b..1fdb40a87788e465267c8c580a46b4fc859191ef 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1079,6 +1079,7 @@ WARNING: untranslated string: iface = Iface
 WARNING: untranslated string: ignore filter = Ignore filter
 WARNING: untranslated string: ike lifetime should be between 1 and 24 hours = IKE lifetime should be between 1 and 24 hours.
 WARNING: untranslated string: imei = IMEI
+WARNING: untranslated string: import = Import
 WARNING: untranslated string: import connection = Import a Connection
 WARNING: untranslated string: imsi = IMSI
 WARNING: untranslated string: include logfiles = Include logfiles
@@ -2178,6 +2179,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.es b/doc/language_issues.es
index ae41466216303489278dd0bfee7e3601e50b5e32..6ff02aa04289743d49945a71dd5fc35738f9d9f8 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -458,7 +458,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1136,6 +1135,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index ad26957a665a2035ddc1339734735f481614ff54..2b9cd9d50432d066830e34d4b9dc72efd2a46ffd 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -443,7 +443,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1076,6 +1075,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.it b/doc/language_issues.it
index bf4b2a302d8cf37f0ab87686e6437f15c29886a0..445a1a76c71e43828b9f41593cb0abbf5a19b35f 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -409,7 +409,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1422,6 +1421,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 6fcfa82bc1a20acd54a661a7e4d61e7e198e46d5..055d8e98d33b3dcfa7059158e731c73a5edef696 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -411,7 +411,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1443,6 +1442,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index c5346243a9096c41e3f126c8ac95ca351c92ca9d..e0a57174d818641db3bacba60ea7cde8a76cd8d8 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -350,7 +350,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1685,6 +1684,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 4798572d6701bb101e608315c5dd1b60dd8b945e..5745996bc6f23c214ad6259ef3bc8ef3eabe8de7 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -346,7 +346,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1678,6 +1677,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 5878f55fa488082fecf2d8cab17ed711e0ad09b1..833d450ab58ad001b439936c8905532eadd13d70 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -435,7 +435,6 @@ WARNING: translation string unused: ike encryption
 WARNING: translation string unused: ike grouptype
 WARNING: translation string unused: ike integrity
 WARNING: translation string unused: ike lifetime
-WARNING: translation string unused: import
 WARNING: translation string unused: importkey
 WARNING: translation string unused: in
 WARNING: translation string unused: inactive
@@ -1305,6 +1304,12 @@ WARNING: untranslated string: wg invalid public key = Invalid public key
 WARNING: untranslated string: wg invalid remote subnet = Invalid remote subnet
 WARNING: untranslated string: wg keepalive interval = Keepalive Interval
 WARNING: untranslated string: wg leave empty to automatically select = Leave empty to automatically select
+WARNING: untranslated string: wg missing allowed ips = Missing AllowedIPs
+WARNING: untranslated string: wg missing endpoint address = Missing Endpoint Address
+WARNING: untranslated string: wg missing endpoint port = Missing Endpoint Port
+WARNING: untranslated string: wg missing port = Missing Port
+WARNING: untranslated string: wg missing private key = Missing Private Key
+WARNING: untranslated string: wg missing public key = Missing Public Key
 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 more free addresses in pool = No more free addresses in pool

diff --git a/doc/language_missings b/doc/language_missings
index 6c96352c8ab0e250589a0fd31a438d949ebbbe0f..fe53a80999251793fe8e795ade098e9adf7e3d3e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -142,6 +142,12 @@
 < wg invalid public key
 < wg invalid remote subnet
 < wg keepalive interval
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -262,6 +268,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -361,6 +373,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -914,6 +932,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -1543,6 +1567,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -2588,6 +2618,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -3670,6 +3706,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool
@@ -4129,6 +4171,12 @@
 < wg invalid remote subnet
 < wg keepalive interval
 < wg leave empty to automatically select
+< wg missing allowed ips
+< wg missing endpoint address
+< wg missing endpoint port
+< wg missing port
+< wg missing private key
+< wg missing public key
 < wg name is already used
 < wg no local subnets
 < wg no more free addresses in pool

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 1d4a03914782745343ba476ac3c79e06b92bd87b..87e59ad164b535aa2aaf0335c0c04b6783717a7d 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3079,6 +3079,12 @@
 'wg invalid remote subnet' => 'Invalid remote subnet',
 'wg keepalive interval' => 'Keepalive Interval',
 'wg leave empty to automatically select' => 'Leave empty to automatically select',
+'wg missing allowed ips' => 'Missing AllowedIPs',
+'wg missing endpoint address' => 'Missing Endpoint Address',
+'wg missing endpoint port' => 'Missing Endpoint Port',
+'wg missing port' => 'Missing Port',
+'wg missing private key' => 'Missing Private Key',
+'wg missing public key' => 'Missing Public Key',
 'wg name is already used' => 'The name is already in use',
 'wg no local subnets' => 'No local subnets given',
 'wg no more free addresses in pool' => 'No more free addresses in pool',