From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Thu, 24 Aug 2017 09:46:36 +0000 (+0200)
Subject: wireless-networks: validate priority
X-Git-Tag: 010~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a987fa6ecf36d2469a12ae028180d9acd723bfd;p=network.git

wireless-networks: validate priority

Fixes: #11469

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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