Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-network: fix disabling 11w MFP for WPA3

Browse source 
Fixes: #5394
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0b49ed45c6)
This commit is contained in:
Jo-Philipp Wich 2021-09-27 10:03:59 +02:00
parent 3a8af31ffa
commit 48b829616e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -1677,7 +1677,7 @@ return view.extend({
if (hwtype == 'mac80211') { if (hwtype == 'mac80211') {
// ieee802.11w options // ieee802.11w options
o = ss.taboption('encryption', form.ListValue, 'ieee80211w', _('802.11w Management Frame Protection'), _("Note: Some wireless drivers do not fully support 802.11w. E.g. mwlwifi may have problems")); o = ss.taboption('encryption', form.ListValue, 'ieee80211w', _('802.11w Management Frame Protection'), _("Note: Some wireless drivers do not fully support 802.11w. E.g. mwlwifi may have problems"));
o.value('', _('Disabled')); o.value('0', _('Disabled'));
o.value('1', _('Optional')); o.value('1', _('Optional'));
o.value('2', _('Required')); o.value('2', _('Required'));
add_dependency_permutations(o, { mode: ['ap', 'ap-wds', 'sta', 'sta-wds'], encryption: ['owe', 'psk2', 'psk-mixed', 'sae', 'sae-mixed', 'wpa2', 'wpa3', 'wpa3-mixed'] }); add_dependency_permutations(o, { mode: ['ap', 'ap-wds', 'sta', 'sta-wds'], encryption: ['owe', 'psk2', 'psk-mixed', 'sae', 'sae-mixed', 'wpa2', 'wpa3', 'wpa3-mixed'] });
@ -1685,7 +1685,14 @@ return view.extend({
o.defaults = { o.defaults = {
'2': [{ encryption: 'sae' }, { encryption: 'owe' }, { encryption: 'wpa3' }, { encryption: 'wpa3-mixed' }], '2': [{ encryption: 'sae' }, { encryption: 'owe' }, { encryption: 'wpa3' }, { encryption: 'wpa3-mixed' }],
'1': [{ encryption: 'sae-mixed'}], '1': [{ encryption: 'sae-mixed'}],
'': [] '0': []
};
o.write = function(section_id, value) {
if (value != this.default)
return form.ListValue.prototype.write.call(this, section_id, value);
else
return form.ListValue.prototype.remove.call(this, section_id);
}; };
o = ss.taboption('encryption', form.Value, 'ieee80211w_max_timeout', _('802.11w maximum timeout'), _('802.11w Association SA Query maximum timeout')); o = ss.taboption('encryption', form.Value, 'ieee80211w_max_timeout', _('802.11w maximum timeout'), _('802.11w Association SA Query maximum timeout'));