From: Arran Cudbard-Bell Date: Sat, 8 Dec 2018 19:55:19 +0000 (-0500) Subject: Use test dictionary for more tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0215df54eba8ce91298d2ccef33df4fb69eea3c2;p=thirdparty%2Ffreeradius-server.git Use test dictionary for more tests --- diff --git a/src/tests/unit/dictionary b/src/tests/unit/dictionary index e7b883050c3..2048053922a 100644 --- a/src/tests/unit/dictionary +++ b/src/tests/unit/dictionary @@ -4,21 +4,28 @@ # We use 241-255 from the "reserved" space, which means that # these tests won't affect real attributes # -ATTRIBUTE Unit-Root-241 241 tlv -ATTRIBUTE Unit-Integer 241.241 integer -ATTRIBUTE Unit-Octets 241.242 octets -ATTRIBUTE Unit-TLV 241.243 tlv -ATTRIBUTE Unit-Byte 241.244 byte -ATTRIBUTE Unit-Short 241.245 short -ATTRIBUTE Unit-Integer64 241.246 integer64 - -ATTRIBUTE Unit-Struct1 241.247 struct + +# +# Needed for the extended tests where this dictionary is used instead +# of the standard RADIUS dictionary. +# +ATTRIBUTE Unit-String 1 string + +ATTRIBUTE Unit-Ext-241 241 extended +ATTRIBUTE Unit-Ext-241-Integer 241.241 integer +ATTRIBUTE Unit-Ext-241-Octets 241.242 octets +ATTRIBUTE Unit-Ext-241-TLV 241.243 tlv +ATTRIBUTE Unit-Ext-241-Byte 241.244 byte +ATTRIBUTE Unit-Ext-241-Short 241.245 short +ATTRIBUTE Unit-Ext-241-Integer64 241.246 integer64 + +ATTRIBUTE Unit-Ext-241-Struct1 241.247 struct ATTRIBUTE Unit-Struct1-Int1 .1 integer ATTRIBUTE Unit-Struct1-Int2 .2 integer ATTRIBUTE Unit-Struct1-Short .3 uint16 ATTRIBUTE Unit-Struct1-String .4 string -ATTRIBUTE Unit-Struct2 241.248 struct +ATTRIBUTE Unit-Ext-241-Struct2 241.248 struct ATTRIBUTE Unit-Struct2-Int1 .1 integer ATTRIBUTE Unit-Struct2-Short .2 uint16 ATTRIBUTE Unit-Struct2-TLV .3 tlv @@ -26,32 +33,32 @@ ATTRIBUTE Unit-Struct2-TLV-Int1 .3.1 integer ATTRIBUTE Unit-Struct2-TLV-Int2 .3.2 integer ATTRIBUTE Unit-Struct2-TLV-String .3.3 string -ATTRIBUTE Unit-Struct3 241.249 struct +ATTRIBUTE Unit-Ext-241-Struct3 241.249 struct ATTRIBUTE Unit-Struct3-Int .1 integer ATTRIBUTE Unit-Struct3-TLV .2 tlv ATTRIBUTE Unit-Struct3a .2.1 struct ATTRIBUTE Unit-Struct3a-Ipaddr1 .2.1.1 ipaddr ATTRIBUTE Unit-Struct3a-Ipaddr2 .2.1.2 ipaddr -ATTRIBUTE Unit-Struct4 241.250 struct +ATTRIBUTE Unit-Ext-241-Struct4 241.250 struct ATTRIBUTE Unit-Struct4-Int1 .1 integer ATTRIBUTE Unit-Struct4-Int2 .2 integer ATTRIBUTE Unit-Struct4-Short .3 uint16 -ATTRIBUTE Unit-TLV-Integer 241.243.1 integer +ATTRIBUTE Unit-TLV-Integer 241.243.1 integer -ATTRIBUTE Unit-Root-246 246 tlv -ATTRIBUTE Unit-Long-Octets 246.241 octets +ATTRIBUTE Unit-Root-246 246 tlv +ATTRIBUTE Unit-Long-Octets 246.241 octets -ATTRIBUTE Extended-Attribute-1 241 extended +ATTRIBUTE Extended-Attribute-2 242 extended ATTRIBUTE Extended-Attribute-5 245 long-extended -ATTRIBUTE Extended-Vendor-Specific-1 241.26 evs +ATTRIBUTE Extended-Vendor-Specific-2 242.26 evs ATTRIBUTE Extended-Vendor-Specific-5 245.26 evs VENDOR FreeRADIUS 11344 -BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-1 +BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-2 ATTRIBUTE Unit-EVS-Integer 1 integer ATTRIBUTE Unit-EVS-Octets 2 octets diff --git a/src/tests/unit/eap_sim_error.txt b/src/tests/unit/eap_sim_error.txt index b3cf46e7015..b415233b5f6 100644 --- a/src/tests/unit/eap_sim_error.txt +++ b/src/tests/unit/eap_sim_error.txt @@ -37,8 +37,8 @@ data Unknown (non-skippable) attribute 99 # Unknown skippable attribute (150) - Ensure the 'reserved bytes' in a normal octets # attribute are not skipped. -decode-pair.sim_tp_decode 96 02 00 00 ff ff ff ff -data Attr-1211.150 = 0x0000ffffffff +decode-pair.sim_tp_decode 97 02 00 00 ff ff ff ff +data Attr-151 = 0x0000ffffffff # Array missing length field decode-pair.sim_tp_decode 0f 01 diff --git a/src/tests/unit/radius_extended.txt b/src/tests/unit/radius_extended.txt index eb57b9fb00d..417b38ed2f1 100644 --- a/src/tests/unit/radius_extended.txt +++ b/src/tests/unit/radius_extended.txt @@ -1,6 +1,5 @@ # Load libfreeradius-radius load radius -load-dictionary radius encode-pair Unit-EVS-5-Integer = 1, Unit-EVS-5-Integer = 2 data f5 0d 1a 00 00 00 2c 50 01 00 00 00 01 f5 0d 1a 00 00 00 2c 50 01 00 00 00 02 @@ -89,7 +88,7 @@ data Attr-245.26.1.6 = 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # again, but the second one attr is not an extended attr decode-pair f5 ff 1a 80 00 00 00 01 06 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ab bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb 01 05 62 6f 62 -data Attr-245.26.1.6 = 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, User-Name = "bob" +data Attr-245.26.1.6 = 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, Unit-String = "bob" # No data means that the attribute is an "invalid attribute" decode-pair f5 04 01 00 @@ -114,19 +113,19 @@ data Attr-245.26.1.6 = 0x0101 # # And using the dictionaries # -attribute Unit-Integer = 6809 -data Unit-Integer = 6809 +attribute Unit-Ext-241-Integer = 6809 +data Unit-Ext-241-Integer = 6809 -encode-pair Unit-Integer = 6809 +encode-pair Unit-Ext-241-Integer = 6809 data f1 07 f1 00 00 1a 99 decode-pair - -data Unit-Integer = 6809 +data Unit-Ext-241-Integer = 6809 # # Encoded as two different top-level attributes. # -encode-pair Unit-Integer = 6809, Unit-Integer = 2112 +encode-pair Unit-Ext-241-Integer = 6809, Unit-Ext-241-Integer = 2112 data f1 07 f1 00 00 1a 99 f1 07 f1 00 00 08 40 # diff --git a/src/tests/unit/radius_struct.txt b/src/tests/unit/radius_struct.txt index fcaf1a64094..6911c00b12e 100644 --- a/src/tests/unit/radius_struct.txt +++ b/src/tests/unit/radius_struct.txt @@ -1,5 +1,4 @@ load radius -load-dictionary radius # # Structs in RADIUS