From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 8 Jan 2018 20:54:31 +0000 (-0500)
Subject: clean up code to parse tags
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e985f55c91b54d4289b162cd00de24faa0de5bf;p=thirdparty%2Ffreeradius-server.git

clean up code to parse tags
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index ef50c6da2fe..689df2a0575 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -366,46 +366,52 @@ VALUE_PAIR *fr_pair_make(TALLOC_CTX *ctx, VALUE_PAIR **vps,
 {
 	fr_dict_attr_t const *da;
 	VALUE_PAIR	*vp;
-	char		*tc, *ts;
+	char		*p;
 	int8_t		tag;
-	bool		found_tag;
-	char		buffer[256];
 	char const	*attrname = attribute;
 
 	/*
 	 *    Check for tags in 'Attribute:Tag' format.
 	 */
-	found_tag = false;
-	tag = TAG_ANY;
+	tag = TAG_NONE;
 
-	ts = strrchr(attribute, ':');
-	if (ts && !ts[1]) {
-		fr_strerror_printf("Invalid tag for attribute %s", attribute);
-		return NULL;
-	}
+	p = strchr(attribute, ':');
+	if (p) {
+		char *end;
+		char buffer[FR_DICT_ATTR_MAX_NAME_LEN + 1 + 32];
+
+		if (!p[1]) {
+			fr_strerror_printf("Invalid tag for attribute %s", attribute);
+			return NULL;
+		}
 
-	if (ts && ts[1]) {
 		strlcpy(buffer, attribute, sizeof(buffer));
+
+		p = buffer + (p - attrname);
 		attrname = buffer;
-		ts = strrchr(attrname, ':');
-		if (!ts) return NULL;
-
-		 /* Colon found with something behind it */
-		 if (ts[1] == '*' && ts[2] == 0) {
-			 /* Wildcard tag for check items */
-			 tag = TAG_ANY;
-			 *ts = '\0';
-		 } else if ((ts[1] >= '0') && (ts[1] <= '9')) {
-			 /* It's not a wild card tag */
-			 tag = strtol(ts + 1, &tc, 0);
-			 if (tc && !*tc && TAG_VALID_ZERO(tag))
-				 *ts = '\0';
-			 else tag = TAG_ANY;
-		 } else {
-			 fr_strerror_printf("Invalid tag for attribute %s", attribute);
-			 return NULL;
-		 }
-		 found_tag = true;
+
+		/* Colon found with something behind it */
+		if ((p[1] == '*') && !p[2]) {
+			/* Wildcard tag for check items */
+			tag = TAG_ANY;
+		} else {
+			/* It's not a wild card tag */
+			tag = strtol(p + 1, &end, 10);
+			if (*end) {
+				fr_strerror_printf("Unexpected text after tag for attribute %s", attribute);
+				return NULL;
+			}
+
+			if (!TAG_VALID_ZERO(tag)) {
+				fr_strerror_printf("Invalid tag for attribute %s", attribute);
+				return NULL;
+			}
+		}
+
+		/*
+		 *	Leave only the attribute name in the buffer.
+		 */
+		*p = '\0';
 	}
 
 	/*
@@ -414,6 +420,11 @@ VALUE_PAIR *fr_pair_make(TALLOC_CTX *ctx, VALUE_PAIR **vps,
 	 */
 	da = fr_dict_attr_by_name(NULL, attrname);
 	if (!da) {
+		if (tag != TAG_NONE) {
+			fr_strerror_printf("Invalid tag for attribute %s", attribute);
+			return NULL;
+		}
+
 		vp = fr_pair_make_unknown(ctx, attrname, value, op);
 		if (!vp) return NULL;
 
@@ -421,6 +432,14 @@ VALUE_PAIR *fr_pair_make(TALLOC_CTX *ctx, VALUE_PAIR **vps,
 		return vp;
 	}
 
+	/*
+	 *	Untagged attributes can't have a tag.
+	 */
+	if (!da->flags.has_tag && (tag != TAG_NONE)) {
+		fr_strerror_printf("Invalid tag for attribute %s", attribute);
+		return NULL;
+	}
+
 	vp = fr_pair_afrom_da(ctx, da);
 	if (!vp) return NULL;
 	vp->op = (op == 0) ? T_OP_EQ : op;