From 455009a606e56e9955f798d73af389b88f9ff79e Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt Date: Fri, 16 Mar 2018 18:58:09 +0100 Subject: [PATCH 1/2] gluon-core: check mesh-ID and ibss ssid length to be in range of 1-32 --- package/gluon-core/check_site.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua index 6c074c34..ab4c5358 100644 --- a/package/gluon-core/check_site.lua +++ b/package/gluon-core/check_site.lua @@ -48,7 +48,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do need_array_of({config, 'basic_rate'}, supported_rates or rates, supported_rates ~= nil) if need_table({config, 'ibss'}, nil, false) then - need_string(in_domain({config, 'ibss', 'ssid'})) + need_string_match(in_domain({config, 'ibss', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') 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_number({config, 'ibss', 'vlan'}, false) @@ -56,7 +56,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do end if need_table({config, 'mesh'}, nil, false) then - need_string(in_domain({config, 'mesh', 'id'})) + need_string_match(in_domain({config, 'mesh', 'id'}), '^.' .. ('.?'):rep(31) .. '$') need_one_of({config, 'mesh', 'mcast_rate'}, supported_rates or rates, false) need_boolean({config, 'mesh', 'disabled'}, false) end From 901b455db10857e7cde6d278e08b428937b7bf33 Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt Date: Sat, 17 Mar 2018 15:14:14 +0100 Subject: [PATCH 2/2] gluon-client-bridge: check ap SSID length to be in range of 1-32 chracters --- package/gluon-client-bridge/check_site.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-client-bridge/check_site.lua b/package/gluon-client-bridge/check_site.lua index bc812b3f..ea733a95 100644 --- a/package/gluon-client-bridge/check_site.lua +++ b/package/gluon-client-bridge/check_site.lua @@ -9,7 +9,7 @@ need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false) for _, config in ipairs({'wifi24', 'wifi5'}) do if need_table({config, 'ap'}, nil, false) then - need_string(in_domain({config, 'ap', 'ssid'})) + need_string_match(in_domain({config, 'ap', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') need_boolean({config, 'ap', 'disabled'}, false) end end