alex
/
gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gluon-web-private-wifi: enable WPA3 configuration 

This allows a user to enable WPA3-Personal and WPA2-WPA3-MM for the
private WiFi in case it is supported by the platform.
This commit is contained in:
David Bauer 2019-09-23 23:31:37 +02:00 committed by David Bauer
parent 86b5104790
commit c7fa1927aa
4 changed files with 102 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/gluon-web-private-wifi/i18n/de.po
View File

@ -13,18 +13,42 @@ msgstr ""
msgid "8-63 characters"
msgstr "8-63 Zeichen"
msgid "Disabled"
msgstr "Deaktiviert"
msgid "Enabled"
msgstr "Aktiviert"
msgid "Encryption"
msgstr "Verschlüsselung"
msgid "Key"
msgstr "Schlüssel"
msgid "Management Frame Protection"
msgstr ""
msgid "Name (SSID)"
msgstr "Name (SSID)"
msgid "Optional"
msgstr ""
msgid "Private WLAN"
msgstr "Privates WLAN"
msgid "Required"
msgstr "Aktiviert"
msgid "WPA2"
msgstr ""
msgid "WPA2 / WPA3"
msgstr ""
msgid "WPA3"
msgstr ""
msgid ""
"Your node can additionally extend your private network by bridging the WAN "
"interface with a separate WLAN. This feature is completely independent of "

24
package/gluon-web-private-wifi/i18n/fr.po
View File

@ -13,18 +13,42 @@ msgstr ""
msgid "8-63 characters"
msgstr "8-63 charactères"
msgid "Disabled"
msgstr ""
msgid "Enabled"
msgstr "Activé"
msgid "Encryption"
msgstr ""
msgid "Key"
msgstr "Clé"
msgid "Management Frame Protection"
msgstr ""
msgid "Name (SSID)"
msgstr "Nom (SSID)"
msgid "Optional"
msgstr ""
msgid "Private WLAN"
msgstr "Wi-Fi privé"
msgid "Required"
msgstr ""
msgid "WPA2"
msgstr ""
msgid "WPA2 / WPA3"
msgstr ""
msgid "WPA3"
msgstr ""
msgid ""
"Your node can additionally extend your private network by bridging the WAN "
"interface with a separate WLAN. This feature is completely independent of "

24
package/gluon-web-private-wifi/i18n/gluon-web-private-wifi.pot
View File

@ -4,18 +4,42 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "8-63 characters"
msgstr ""
msgid "Disabled"
msgstr ""
msgid "Enabled"
msgstr ""
msgid "Encryption"
msgstr ""
msgid "Key"
msgstr ""
msgid "Management Frame Protection"
msgstr ""
msgid "Name (SSID)"
msgstr ""
msgid "Optional"
msgstr ""
msgid "Private WLAN"
msgstr ""
msgid "Required"
msgstr ""
msgid "WPA2"
msgstr ""
msgid "WPA2 / WPA3"
msgstr ""
msgid "WPA3"
msgstr ""
msgid ""
"Your node can additionally extend your private network by bridging the WAN "
"interface with a separate WLAN. This feature is completely independent of "

33
package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
View File

@ -1,5 +1,6 @@
local uci = require("simple-uci").cursor()
local util = require 'gluon.util'
local platform = require 'gluon.platform'
-- where to read the configuration from
local primary_iface = 'wan_radio0'
@ -26,6 +27,25 @@ key:depends(enabled, true)
key.datatype = "wpakey"
key.default = uci:get('wireless', primary_iface, "key")
local encryption = s:option(ListValue, "encryption", translate("Encryption"))
encryption:depends(enabled, true)
encryption:value("psk2", translate("WPA2"))
if platform.device_supports_wpa3() then
encryption:value("psk3-mixed", translate("WPA2 / WPA3"))
encryption:value("psk3", translate("WPA3"))
end
encryption.default = uci:get('wireless', primary_iface, 'encryption') or "psk2"
local mfp = s:option(ListValue, "mfp", translate("Management Frame Protection"))
mfp:depends(enabled, true)
mfp:value("0", translate("Disabled"))
if platform.device_supports_mfp(uci) then
mfp:value("1", translate("Optional"))
mfp:value("2", translate("Required"))
end
mfp.default = uci:get('wireless', primary_iface, 'ieee80211w') or "0"
function f:write()
util.foreach_radio(uci, function(radio, index)
local radio_name = radio['.name']
@ -34,16 +54,23 @@ function f:write()
if enabled.data then
local macaddr = util.get_wlan_mac(uci, radio, index, 4)
uci:section('wireless', "wifi-iface", name, {
uci:section('wireless', 'wifi-iface', name, {
device = radio_name,
network = "wan",
network = 'wan',
mode = 'ap',
encryption = 'psk2',
encryption = encryption.data,
ssid = ssid.data,
key = key.data,
macaddr = macaddr,
disabled = false,
})
-- hostapd-mini won't start in case 802.11w is configured
if platform.device_supports_mfp(uci) then
uci:set('wireless', name, 'ieee80211w', mfp.data)
else
uci:delete('wireless', name, 'ieee80211w')
end
else
uci:set('wireless', name, "disabled", true)
end