[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-development
Subject:    [PATCH] wireless-networks: validate priority
From:       Jonatan Schlag <jonatan.schlag () ipfire ! org>
Date:       2017-08-24 9:46:36
Message-ID: 1503567996-3839-1-git-send-email-jonatan.schlag () ipfire ! org
[Download RAW message or body]

Fixes: #11469

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 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 c1cf06a..8d2a32d 100644
--- a/src/functions/functions.wireless-networks
+++ b/src/functions/functions.wireless-networks
@@ -315,6 +315,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"
@@ -324,8 +336,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.6.3

[prev in list] [next in list] [prev in thread] [next in thread]