Skip to content

Commit c1a5e02

Browse files
alandekokalandekok
committed
remove '&' again
now that the server and tmpl code have been double checked
1 parent fa62479 commit c1a5e02

File tree

9 files changed

+254
-254
lines changed

9 files changed

+254
-254
lines changed

‎src/modules/rlm_json/rlm_json.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static xlat_action_t json_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
243243
.attr = {
244244
.list_def = request_attr_request,
245245
.allow_wildcard = true,
246-
.dict_def = request->dict
246+
.dict_def = request->dict,
247247
}
248248
});
249249
if (slen <= 0) {

‎src/tests/modules/json/encode.unlang‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,152 +6,152 @@ string test_string5
66
#
77
# json.encode tests
88
#
9-
&request -= &Packet-Type[*]
9+
request -= Packet-Type[*]
1010

1111
#
1212
# HACK: the edit code does not currently support deleted by parent
13-
# when doing &request -= &Net[*]
14-
# or even &request -= &Net.[*]
13+
# when doing request -= Net[*]
14+
# or even request -= Net.[*]
1515
# which returns an error?
1616
#
17-
&request -= &Net.Src.IP
18-
&request -= &Net.Src.Port
19-
&request -= &Net.Dst.IP
20-
&request -= &Net.Dst.Port
21-
&request -= &Net.Timestamp
22-
&request -= &Net[*]
17+
request -= Net.Src.IP
18+
request -= Net.Src.Port
19+
request -= Net.Dst.IP
20+
request -= Net.Dst.Port
21+
request -= Net.Timestamp
22+
request -= Net[*]
2323

2424
# 0. Check basic xlat parsing
25-
&test_string1 := %json.encode("&request.[*]")
26-
&test_string2 := %json.encode("&request.[*] ")
27-
&test_string3 := %json.encode(" &request.[*]")
28-
&test_string4 := %json.encode(" &request.[*] ")
25+
test_string1 := %json.encode("request.[*]")
26+
test_string2 := %json.encode("request.[*] ")
27+
test_string3 := %json.encode(" request.[*]")
28+
test_string4 := %json.encode(" request.[*] ")
2929

30-
if (!(&test_string1 == '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}')) {
30+
if (!(test_string1 == '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}')) {
3131
test_fail
3232
}
3333

3434
# Check xlat input formats
35-
if (!(&test_string1 == &test_string2) ||
36-
!(&test_string1 == &test_string3) ||
37-
!(&test_string1 == &test_string4)) {
35+
if (!(test_string1 == test_string2) ||
36+
!(test_string1 == test_string3) ||
37+
!(test_string1 == test_string4)) {
3838
test_fail
3939
}
4040

4141
# Check defaults are the same as output_mode "object":
42-
&test_string2 := %json_object.encode("&request.[*]")
43-
&test_string3 := %json_object_no.encode("&request.[*]")
44-
if (!(&test_string1 == &test_string2) ||
45-
!(&test_string1 == &test_string3)) {
42+
test_string2 := %json_object.encode("request.[*]")
43+
test_string3 := %json_object_no.encode("request.[*]")
44+
if (!(test_string1 == test_string2) ||
45+
!(test_string1 == test_string3)) {
4646
test_fail
4747
}
4848

49-
&test_string1 := %json.encode(" &request.[*] !&Filter-Id ")
50-
if !(&test_string1 == '{"User-Name":{"type":"string","value":"john"},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
49+
test_string1 := %json.encode(" request.[*] !Filter-Id ")
50+
if !(test_string1 == '{"User-Name":{"type":"string","value":"john"},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
5151
test_fail
5252
}
5353

54-
&test_string1 := %json.encode("&request.[*] ! ")
55-
if &test_string1 {
54+
test_string1 := %json.encode("request.[*] ! ")
55+
if test_string1 {
5656
test_fail
5757
}
5858

5959
# 1a. Output mode "object" tests
6060

6161
# These are unsorted dictionaries. Hopefully json-c doesn't suddenly
6262
# decide that it's going to use a different ordering of the keys...
63-
&test_string1 := %json_object.encode("&request.[*]")
64-
&test_string2 := %json_object_ex.encode("&request.[*]")
63+
test_string1 := %json_object.encode("request.[*]")
64+
test_string2 := %json_object_ex.encode("request.[*]")
6565

66-
if !(&test_string1 == '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
66+
if !(test_string1 == '{"User-Name":{"type":"string","value":"john"},"Filter-Id":{"type":"string","value":["f1","f2"]},"NAS-Port":{"type":"uint32","value":999},"Service-Type":{"type":"uint32","value":"Login-User"}}') {
6767
test_fail
6868
}
6969

7070
"%{test_string2}"
71-
if !(&test_string2 == '{"pf:User-Name":{"type":"string","value":["john"]},"pf:Filter-Id":{"type":"string","value":["f1","f2"]},"pf:NAS-Port":{"type":"uint32","value":["999"]},"pf:Service-Type":{"type":"uint32","value":["1"]}}') {
71+
if !(test_string2 == '{"pf:User-Name":{"type":"string","value":["john"]},"pf:Filter-Id":{"type":"string","value":["f1","f2"]},"pf:NAS-Port":{"type":"uint32","value":["999"]},"pf:Service-Type":{"type":"uint32","value":["1"]}}') {
7272
test_fail
7373
}
7474

7575
# 1b. "object" empty inputs
76-
&test_string1 := %json_object.encode("!&request.[*]")
76+
test_string1 := %json_object.encode("!request.[*]")
7777

78-
if !(&test_string1 == '{}') {
78+
if !(test_string1 == '{}') {
7979
test_fail
8080
}
8181

8282
# 2a. Output mode "object_simple" tests
83-
&test_string1 := %json_object_simple.encode("&request.[*]")
84-
&test_string2 := %json_object_simple_ex.encode("&request.[*]")
83+
test_string1 := %json_object_simple.encode("request.[*]")
84+
test_string2 := %json_object_simple_ex.encode("request.[*]")
8585

86-
if !(&test_string1 == '{"User-Name":"john","Filter-Id":["f1","f2"],"NAS-Port":999,"Service-Type":"Login-User"}') {
86+
if !(test_string1 == '{"User-Name":"john","Filter-Id":["f1","f2"],"NAS-Port":999,"Service-Type":"Login-User"}') {
8787
test_fail
8888
}
8989

90-
if !(&test_string2 == '{"pf:User-Name":["john"],"pf:Filter-Id":["f1","f2"],"pf:NAS-Port":["999"],"pf:Service-Type":["1"]}') {
90+
if !(test_string2 == '{"pf:User-Name":["john"],"pf:Filter-Id":["f1","f2"],"pf:NAS-Port":["999"],"pf:Service-Type":["1"]}') {
9191
test_fail
9292
}
9393

9494
# 2b. "object_simple" empty inputs
95-
&test_string1 := %json_object_simple.encode("!&request.[*]")
95+
test_string1 := %json_object_simple.encode("!request.[*]")
9696

97-
if !(&test_string1 == '{}') {
97+
if !(test_string1 == '{}') {
9898
test_fail
9999
}
100100

101101
# 3a. Output mode "array" tests
102-
&test_string1 := %json_array.encode("&request.[*]")
103-
&test_string2 := %json_array_ex.encode("&request.[*]")
102+
test_string1 := %json_array.encode("request.[*]")
103+
test_string2 := %json_array_ex.encode("request.[*]")
104104

105-
if !(&test_string1 == '[{"name":"User-Name","type":"string","value":"john"},{"name":"Filter-Id","type":"string","value":"f1"},{"name":"Filter-Id","type":"string","value":"f2"},{"name":"NAS-Port","type":"uint32","value":999},{"name":"Service-Type","type":"uint32","value":"Login-User"}]') {
105+
if !(test_string1 == '[{"name":"User-Name","type":"string","value":"john"},{"name":"Filter-Id","type":"string","value":"f1"},{"name":"Filter-Id","type":"string","value":"f2"},{"name":"NAS-Port","type":"uint32","value":999},{"name":"Service-Type","type":"uint32","value":"Login-User"}]') {
106106
test_fail
107107
}
108108

109-
if !(&test_string2 == '[{"name":"pf:User-Name","type":"string","value":["john"]},{"name":"pf:Filter-Id","type":"string","value":["f1","f2"]},{"name":"pf:NAS-Port","type":"uint32","value":["999"]},{"name":"pf:Service-Type","type":"uint32","value":["1"]}]') {
109+
if !(test_string2 == '[{"name":"pf:User-Name","type":"string","value":["john"]},{"name":"pf:Filter-Id","type":"string","value":["f1","f2"]},{"name":"pf:NAS-Port","type":"uint32","value":["999"]},{"name":"pf:Service-Type","type":"uint32","value":["1"]}]') {
110110
test_fail
111111
}
112112

113113
# 3b. "array" empty inputs
114-
&test_string1 := %json_array.encode("!&request.[*]")
114+
test_string1 := %json_array.encode("!request.[*]")
115115

116-
if !(&test_string1 == '[]') {
116+
if !(test_string1 == '[]') {
117117
test_fail
118118
}
119119

120120
# 4a. Output mode "array_of_names" tests
121-
&test_string1 := %json_array_names.encode("&request.[*]")
122-
&test_string2 := %json_array_names_ex.encode("&request.[*]")
121+
test_string1 := %json_array_names.encode("request.[*]")
122+
test_string2 := %json_array_names_ex.encode("request.[*]")
123123

124-
if !(&test_string1 == '["User-Name","Filter-Id","Filter-Id","NAS-Port","Service-Type"]') {
124+
if !(test_string1 == '["User-Name","Filter-Id","Filter-Id","NAS-Port","Service-Type"]') {
125125
test_fail
126126
}
127127

128-
if !(&test_string2 == '["pf:User-Name","pf:Filter-Id","pf:Filter-Id","pf:NAS-Port","pf:Service-Type"]') {
128+
if !(test_string2 == '["pf:User-Name","pf:Filter-Id","pf:Filter-Id","pf:NAS-Port","pf:Service-Type"]') {
129129
test_fail
130130
}
131131

132132
# 4b. "array_of_names" empty inputs
133-
&test_string1 := %json_array_names.encode("!&request.[*]")
133+
test_string1 := %json_array_names.encode("!request.[*]")
134134

135-
if !(&test_string1 == '[]') {
135+
if !(test_string1 == '[]') {
136136
test_fail
137137
}
138138

139139
# 5a. Output mode "array_of_values" tests
140-
&test_string1 := %json_array_values.encode("&request.[*]")
141-
&test_string2 := %json_array_values_ex.encode("&request.[*]")
140+
test_string1 := %json_array_values.encode("request.[*]")
141+
test_string2 := %json_array_values_ex.encode("request.[*]")
142142

143-
if !(&test_string1 == '["john","f1","f2",999,"Login-User"]') {
143+
if !(test_string1 == '["john","f1","f2",999,"Login-User"]') {
144144
test_fail
145145
}
146146

147-
if !(&test_string2 == '["john","f1","f2","999","1"]') {
147+
if !(test_string2 == '["john","f1","f2","999","1"]') {
148148
test_fail
149149
}
150150

151151
# 5b. "array_of_values" empty inputs
152-
&test_string1 := %json_array_values.encode("!&request.[*]")
152+
test_string1 := %json_array_values.encode("!request.[*]")
153153

154-
if !(&test_string1 == '[]') {
154+
if !(test_string1 == '[]') {
155155
test_fail
156156
}
157157

‎src/tests/modules/json/encode_error.unlang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ string test_string
33
# json xlat input parsing test - error with no input
44
#
55

6-
&test_string := %json_object_ex_encode() # ERROR
7-
if (&test_string) {
6+
test_string := %json_object_ex_encode() # ERROR
7+
if (test_string) {
88
test_fail
99
}
1010

0 commit comments

Comments
 (0)