From: Michael Tremer Date: Mon, 22 Sep 2025 10:53:01 +0000 (+0200) Subject: wlanap.cgi: Validate and store BAND & MODE X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=483f519f96e8f86f1f53ac6eea3c44fc605eddbc;p=ipfire-2.x.git wlanap.cgi: Validate and store BAND & MODE Signed-off-by: Michael Tremer --- diff --git a/doc/language_issues.en b/doc/language_issues.en index 6dfada328..478ae7c10 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2405,6 +2405,8 @@ WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap encryption = Encryption WARNING: untranslated string: wlanap hide ssid = Hide SSID WARNING: untranslated string: wlanap interface = Select Interface +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA passphrase. Must be between 8 and 63 characters. WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan diff --git a/doc/language_issues.es b/doc/language_issues.es index cadfaf5d6..b840671df 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1235,3 +1235,5 @@ WARNING: untranslated string: wio_wanname = unknown string WARNING: untranslated string: wio_webinterface = unknown string WARNING: untranslated string: wio_webinterface_link = unknown string WARNING: untranslated string: wlanap clients = unknown string +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode diff --git a/doc/language_issues.fr b/doc/language_issues.fr index a03241bce..f91041f73 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1287,5 +1287,7 @@ WARNING: untranslated string: wio_webinterface_link = unknown string WARNING: untranslated string: wireguard = WireGuard WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap psk = Pre-Shared Key WARNING: untranslated string: wlanap wireless mode = Wireless Mode diff --git a/doc/language_issues.it b/doc/language_issues.it index d5fdcd55e..4ee44147c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1645,6 +1645,8 @@ WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 72af4fba5..efe660d13 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1666,6 +1666,8 @@ WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c89dd9966..4a9924c39 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1914,6 +1914,8 @@ WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2377115ab..68332200d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1913,6 +1913,8 @@ WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap configuration = Wireless Access Point Configuration WARNING: untranslated string: wlanap country = Country Code WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules diff --git a/doc/language_issues.tr b/doc/language_issues.tr index dfabd029e..597839c99 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1515,6 +1515,8 @@ WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap clients = unknown string WARNING: untranslated string: wlanap hide ssid = Hide SSID +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood Scan WARNING: untranslated string: wlanap neighbor scan warning = Warning: Disabling may violate regulatory rules diff --git a/doc/language_issues.tw b/doc/language_issues.tw index 2745a25ba..2df562184 100644 --- a/doc/language_issues.tw +++ b/doc/language_issues.tw @@ -1253,3 +1253,5 @@ WARNING: untranslated string: wio_wanname = unknown string WARNING: untranslated string: wio_webinterface = unknown string WARNING: untranslated string: wio_webinterface_link = unknown string WARNING: untranslated string: wlanap clients = unknown string +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode diff --git a/doc/language_issues.zh b/doc/language_issues.zh index 2745a25ba..2df562184 100644 --- a/doc/language_issues.zh +++ b/doc/language_issues.zh @@ -1253,3 +1253,5 @@ WARNING: untranslated string: wio_wanname = unknown string WARNING: untranslated string: wio_webinterface = unknown string WARNING: untranslated string: wio_webinterface_link = unknown string WARNING: untranslated string: wlanap clients = unknown string +WARNING: untranslated string: wlanap invalid band = Invalid band +WARNING: untranslated string: wlanap invalid mode = Invalid mode diff --git a/doc/language_missings b/doc/language_missings index 03c286f5a..3dfa01337 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -196,6 +196,8 @@ < rss < rss long < transient sheduler attacks +< wlanap invalid band +< wlanap invalid mode ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ @@ -340,6 +342,8 @@ < whitelisted < wireguard < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap psk < wlanap wireless mode < wlanap wlan clients @@ -952,6 +956,8 @@ < wlanap client isolation < wlanap configuration < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning @@ -1630,6 +1636,8 @@ < wlanap client isolation < wlanap configuration < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning @@ -2723,6 +2731,8 @@ < wlanap configuration < wlanap country < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning @@ -3853,6 +3863,8 @@ < wlanap configuration < wlanap country < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning @@ -4358,6 +4370,8 @@ < wlanap auto < wlanap client isolation < wlanap hide ssid +< wlanap invalid band +< wlanap invalid mode < wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning @@ -4450,6 +4464,8 @@ < rss < rss long < transient sheduler attacks +< wlanap invalid band +< wlanap invalid mode ############################################################################ # Checking cgi-bin translations for language: zh # ############################################################################ @@ -4513,3 +4529,5 @@ < rss < rss long < transient sheduler attacks +< wlanap invalid band +< wlanap invalid mode diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 9b2358044..2b19e5857 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -96,13 +96,24 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { } } + # Validate BAND + unless ($cgiparams{'BAND'} =~ m/^[25]g$/) { + $errormessage .= "$Lang::tr{'wlanap invalid band'}
"; + } + + # Validate MODE + unless ($cgiparams{'MODE'} =~ m/^(HT|HE|VHT|EHT)(20|40|80|160|320)$/) { + $errormessage .= "$Lang::tr{'wlanap invalid mode'}
"; + } + # XXX This needs validation $wlanapsettings{'INTERFACE'} = $cgiparams{'INTERFACE'}; $wlanapsettings{'SSID'} = $cgiparams{'SSID'}; $wlanapsettings{'HIDESSID'} = ($cgiparams{'HIDESSID'} eq 'on') ? 'on' : 'off'; $wlanapsettings{'CLIENTISOLATION'} = ($cgiparams{'CLIENTISOLATION'} eq 'on') ? 'on' : 'off'; $wlanapsettings{'COUNTRY'} = $cgiparams{'COUNTRY'}; - $wlanapsettings{'HW_MODE'} = $cgiparams{'HW_MODE'}; + $wlanapsettings{'MODE'} = $cgiparams{'MODE'}; + $wlanapsettings{'BAND'} = $cgiparams{'BAND'}; $wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'}; $wlanapsettings{'NOSCAN'} = ($cgiparams{'NOSCAN'} eq 'on') ? 'on' : 'off'; $wlanapsettings{'ENC'} = $cgiparams{'ENC'}; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b997ff9a7..204b842bd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -3078,6 +3078,8 @@ 'wlanap hide ssid' => 'SSID verbergen', 'wlanap informations' => 'Informationen', 'wlanap interface' => 'Interface übernehmen', +'wlanap invalid band' => 'Ungültiges Band', +'wlanap invalid mode' => 'Ungültiger Modus', 'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.', 'wlanap link dhcp' => 'Wireless Lan DHCP-Einstellungen', 'wlanap link wireless' => 'Wireless Lan Clients freischalten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 35e9da184..ba82c94e6 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -3199,6 +3199,8 @@ 'wlanap hide ssid' => 'Hide SSID', 'wlanap informations' => 'Information', 'wlanap interface' => 'Select Interface', +'wlanap invalid band' => 'Invalid band', +'wlanap invalid mode' => 'Invalid mode', 'wlanap invalid wpa' => 'Invalid length in WPA passphrase. Must be between 8 and 63 characters.', 'wlanap link dhcp' => 'Wireless LAN DHCP configuration', 'wlanap link wireless' => 'Activate wireless lan clients',