nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-core, gluon-client-bridge: allow 0-character ESSIDs/mesh IDs

Browse Source
This commit is contained in:
Matthias Schiffer 2018-03-17 15:38:24 +01:00
parent dda1b2a127
commit 532b57011f
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-client-bridge/check_site.lua
View File

@ -9,7 +9,7 @@ need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false)
for _, config in ipairs({'wifi24', 'wifi5'}) do for _, config in ipairs({'wifi24', 'wifi5'}) do
if need_table({config, 'ap'}, nil, false) then if need_table({config, 'ap'}, nil, false) then
need_string_match(in_domain({config, 'ap', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') need_string_match(in_domain({config, 'ap', 'ssid'}), '^' .. ('.?'):rep(32) .. '$')
need_boolean({config, 'ap', 'disabled'}, false) need_boolean({config, 'ap', 'disabled'}, false)
end end
end end

4
package/gluon-core/check_site.lua
View File

@ -48,7 +48,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
need_array_of({config, 'basic_rate'}, supported_rates or rates, supported_rates ~= nil) need_array_of({config, 'basic_rate'}, supported_rates or rates, supported_rates ~= nil)
if need_table({config, 'ibss'}, nil, false) then if need_table({config, 'ibss'}, nil, false) then
need_string_match(in_domain({config, 'ibss', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') need_string_match(in_domain({config, 'ibss', 'ssid'}), '^' .. ('.?'):rep(32) .. '$')
need_string_match(in_domain({config, 'ibss', 'bssid'}), '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$') need_string_match(in_domain({config, 'ibss', 'bssid'}), '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
need_one_of({config, 'ibss', 'mcast_rate'}, supported_rates or rates, false) need_one_of({config, 'ibss', 'mcast_rate'}, supported_rates or rates, false)
need_number({config, 'ibss', 'vlan'}, false) need_number({config, 'ibss', 'vlan'}, false)
@ -56,7 +56,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
end end
if need_table({config, 'mesh'}, nil, false) then if need_table({config, 'mesh'}, nil, false) then
need_string_match(in_domain({config, 'mesh', 'id'}), '^.' .. ('.?'):rep(31) .. '$') need_string_match(in_domain({config, 'mesh', 'id'}), '^' .. ('.?'):rep(32) .. '$')
need_one_of({config, 'mesh', 'mcast_rate'}, supported_rates or rates, false) need_one_of({config, 'mesh', 'mcast_rate'}, supported_rates or rates, false)
need_boolean({config, 'mesh', 'disabled'}, false) need_boolean({config, 'mesh', 'disabled'}, false)
end end