From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 20 May 2016 12:20:28 +0000 (-0400)
Subject: Ensure regex comparisons are binary safe
X-Git-Tag: release_3_0_12~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac6a4c5af2b05b989fdd7129526ddf1464af105b;p=thirdparty%2Ffreeradius-server.git

Ensure regex comparisons are binary safe
---

diff --git a/raddb/policy.d/accounting b/raddb/policy.d/accounting
index 60edfcf2781..0e3e450d2a9 100644
--- a/raddb/policy.d/accounting
+++ b/raddb/policy.d/accounting
@@ -32,7 +32,12 @@ acct_unique {
 	#  initial authentication session (Common in a
 	#  wireless environment).
 	#
-	if ("%{string:Class}" =~ /${policy.class_value_prefix}([0-9a-f]{32})/i) {
+	update request {
+	       Tmp-String-9 := "${policy.class_value_prefix}"
+	}
+
+	if (("%{hex:&Class}" =~ /^%{hex:&Tmp-String-9}/) && \
+	    ("%{string:&Class}" =~ /^${policy.class_value_prefix}([0-9a-f]{32})/i)) {
 		update request {
 			&Acct-Unique-Session-Id := "%{md5:%{1},%{Acct-Session-ID}}"
 		}