wlanap.cgi: Validate and store BAND & MODE

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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6dfada328b6f1fed823a2163a7ce7096a2564724..478ae7c10aee8c496ae6dada375f8431f82b1567 100644 (file)
--- 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 cadfaf5d66eb936036f8581b27502dfdc0c50f17..b840671df7c3db23f675827affd28d50ac8ad8ff 100644 (file)
--- 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 a03241bcea06cce4b9df14d32c7ca4f0d3087966..f91041f73614f82c9f061d15b77b55bee5cd6ebc 100644 (file)
--- 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 d5fdcd55e07bd81c6a446b31cea6709c7e775405..4ee44147c83a5f8691d23e2dcb967d9f6e6d9759 100644 (file)
--- 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 72af4fba506efce623806b6ae7f6fa7f7650e8c0..efe660d1358bfbd8895f64bccf014e97d88f571d 100644 (file)
--- 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 c89dd9966a453b95598e2489504072ca370cc306..4a9924c39633f66b13200a6a387057140b8ab7d9 100644 (file)
--- 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 2377115ab3ac4d9b20c5c389e8f36ca887e2d4c0..68332200d537be4c0e5897d37dd89aaa8b40124a 100644 (file)
--- 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 dfabd029eba71b6e3fa90eee70b3dc0cd5ad0a27..597839c991d0fb6aa9c30e8167b3de90dd3ac2c7 100644 (file)
--- 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 2745a25baf1e829308aac4bde49c8ac6b7a9109b..2df562184f238b2929944b54c42100513e8fd82e 100644 (file)
--- 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 2745a25baf1e829308aac4bde49c8ac6b7a9109b..2df562184f238b2929944b54c42100513e8fd82e 100644 (file)
--- 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 03c286f5a24bb9fd1982bf60ad860ec838ef66f0..3dfa0133785731a6aad7934a59330d77bfb95186 100644 (file)
--- 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 9b2358044de650e824352a7aa36e7994166b8e6f..2b19e58575c6b12c151d9efea46ca307065e3821 100644 (file)
--- 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'}<br />";
+       }
+
+       # Validate MODE
+       unless ($cgiparams{'MODE'} =~ m/^(HT|HE|VHT|EHT)(20|40|80|160|320)$/) {
+               $errormessage .= "$Lang::tr{'wlanap invalid mode'}<br />";
+       }
+
        # 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 b997ff9a7353f1cea2772d80e7a96c2237dc7d04..204b842bd48de84e450804a5bbb9ecb421aeb605 100644 (file)
--- 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 35e9da184c0d60e6127776936774fa464e8ace63..ba82c94e6b4cf067f5f6ee11458c18ead62b9ea3 100644 (file)
--- 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',