Re-enable testing of nested attributes from Perl

FreeRADIUS · Sep 23, 2024 · 8e0c6d7 · 8e0c6d7
1 parent ba9d4c2
commit 8e0c6d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/tests/modules/perl/auth.unlang b/src/tests/modules/perl/auth.unlang
@@ -25,10 +25,9 @@ if (!ok) {
     test_fail
 }
 
-# TODO: Re-enable when nested attributes are handled
-#if !(&reply.Vendor-Specific.Cisco.h323-credit-amount == 100) {
-#    test_fail
-#}
+if (&reply.Vendor-Specific.Cisco.h323-credit-amount != 100) {
+    test_fail
+}
 if (&reply.Filter-Id != 'Hello 127.0.0.1 172.16.1.1') {
 	test_fail
 }
@@ -41,7 +40,7 @@ if (&control.NAS-Identifier) {
 	test_fail
 }
 
-&reply -= &Vendor-Specific.Cisco.h323-credit-amount[*]
+&reply -= &Vendor-Specific[*]
 &reply -= &Filter-Id[*]
 
 test_pass
diff --git a/src/tests/modules/perl/test.pl b/src/tests/modules/perl/test.pl
@@ -73,8 +73,7 @@ sub authenticate {
 		# Accept user and set some attribute
 		if (&radiusd::xlat("%client(group)") eq 'UltraAllInclusive') {
 			# User called from NAS with unlim plan set, set higher limits
-# TODO - re-enabled when nested attributes are handled
-#			$RAD_REPLY{'Vendor-Specific.Cisco.h323-credit-amount'} = "1000000";
+			$RAD_REPLY{'Vendor-Specific'}{'Cisco'}{'h323-credit-amount'} = "1000000";
 			$RAD_REPLY{'Filter-Id'} = 'Everything'
 		} else {
 			# Check we received two values for Cisco.AVPair
@@ -84,7 +83,7 @@ sub authenticate {
 			if ($RAD_REQUEST{'Class'} ne 'abcdef') {
 				return RLM_MODULE_REJECT;
 			}
-#			$RAD_REPLY{'Vendor-Specific.Cisco.h323-credit-amount'} = "100";
+			$RAD_REPLY{'Vendor-Specific'}{'Cisco'}{'h323-credit-amount'} = "100";
 			$RAD_REPLY{'Filter-Id'} = 'Hello '.$RAD_REQUEST{'Net'}{'Src'}{'IP'}.' '.$RAD_REQUEST{'Vendor-Specific'}{'3GPP2'}{'Remote-IP'}[1]{'Address'};
 			$RAD_REQUEST{'User-Name'} = 'tim';
 			$RAD_CONFIG{'NAS-Identifier'} = 'dummy';