From 3a987fa6ecf36d2469a12ae028180d9acd723bfd Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Thu, 24 Aug 2017 11:46:36 +0200 Subject: [PATCH] wireless-networks: validate priority Fixes: #11469 Signed-off-by: Jonatan Schlag Signed-off-by: Michael Tremer --- src/functions/functions.wireless-networks | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/functions/functions.wireless-networks b/src/functions/functions.wireless-networks index feca20d6..4fedcb9d 100644 --- a/src/functions/functions.wireless-networks +++ b/src/functions/functions.wireless-networks @@ -393,6 +393,18 @@ wireless_network_pre_shared_key() { fi } +wireless_networks_priority_is_valid() { + assert [ $# -eq 1 ] + + local priority=${1} + + if ! isinteger priority || [ ! ${priority} -ge 0 ] || [ ! ${priority} -le 999 ]; then + return ${EXIT_FALSE} + fi + + return ${EXIT_TRUE} +} + wireless_network_priority() { if [ ! $# -eq 2 ]; then log ERROR "Not enough arguments" @@ -402,8 +414,8 @@ wireless_network_priority() { local handle="${1}" local priority=${2} - if ! isinteger priority && [ ! ${priority} -ge 0 ]; then - log ERROR "The priority must be an integer greater or eqal zero" + if ! wireless_networks_priority_is_valid ${priority}; then + error "The priority must be an integer greater or eqal zero and and less then 1000" return ${EXIT_ERROR} fi -- 2.47.2