From: Michael Tremer Date: Sat, 26 Apr 2025 12:04:54 +0000 (+0200) Subject: wireguard-functions.pl: Complain if required fields are missing X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5abfabb8bd81ded8c01f34e71b0d01717a4952b4;p=people%2Fstevee%2Fipfire-2.x.git wireguard-functions.pl: Complain if required fields are missing Signed-off-by: Michael Tremer --- diff --git a/config/cfgroot/wireguard-functions.pl b/config/cfgroot/wireguard-functions.pl index e9dc66747..909b33a29 100644 --- 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 39e934047..c61a886e9 100644 --- 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 834ffa13b..1fdb40a87 100644 --- 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 ae4146621..6ff02aa04 100644 --- 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 ad26957a6..2b9cd9d50 100644 --- 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 bf4b2a302..445a1a76c 100644 --- 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 6fcfa82bc..055d8e98d 100644 --- 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 c5346243a..e0a57174d 100644 --- 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 4798572d6..5745996bc 100644 --- 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 5878f55fa..833d450ab 100644 --- 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 6c96352c8..fe53a8099 100644 --- 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 1d4a03914..87e59ad16 100644 --- 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',