The FreeRADIUS server $Id: 15bac2a4c627c01d1aa2047687b3418955ac7f00 $
Loading...
Searching...
No Matches
dict_fixup.c
Go to the documentation of this file.
1/*
2 * This program is free software; you can redistribute it and/or modify
3 * it under the terms of the GNU General Public License as published by
4 * the Free Software Foundation; either version 2 of the License, or
5 * (at your option) any later version.
6 *
7 * This program is distributed in the hope that it will be useful,
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10 * GNU General Public License for more details.
11 *
12 * You should have received a copy of the GNU General Public License
13 * along with this program; if not, write to the Free Software
14 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
15 */
16
17/** Code to apply fctx and finalisation steps to a dictionary
18 *
19 * @file src/lib/util/dict_fixup.c
20 *
21 * @copyright 2020 The FreeRADIUS server project
22 * @copyright 2020,2024 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
23 */
24RCSID("$Id: db267e02fa9e0a60d147a262f073a159de86d4e7 $")
25
26#include <freeradius-devel/util/dict.h>
27#include <freeradius-devel/util/file.h>
28#include <freeradius-devel/util/value.h>
29
30#include "dict_fixup_priv.h"
31
32/** Common fields for every fixup structure
33 *
34 */
35typedef struct {
36 fr_dlist_t entry; //!< Entry in linked list of fctx.
38
39/** Add an enumeration value to an attribute that wasn't defined at the time the value was parsed
40 *
41 */
42typedef struct {
43 dict_fixup_common_t common; //!< Common fields.
44
45 char *filename; //!< where the line being fixed up.
46 int line; //!< ditto.
47
48 char *alias; //!< we need to create.
49 fr_dict_attr_t *alias_parent; //!< Where to add the alias.
50
51 char *ref; //!< what the alias references.
52 fr_dict_attr_t *ref_parent; //!< Parent attribute to resolve the 'attribute' string in.
54
55/** Add an enumeration value to an attribute that wasn't defined at the time the value was parsed
56 *
57 */
58typedef struct {
59 dict_fixup_common_t common; //!< Common fields.
60
61 char *filename; //!< where the line being fixed up.
62 int line; //!< ditto.
63
64 char *attribute; //!< we couldn't find (and will need to resolve later).
65 char *name; //!< Raw enum name.
66 char *value; //!< Raw enum value. We can't do anything with this until
67 //!< we know the attribute type, which we only find out later.
68
69 fr_dict_attr_t const *parent; //!< Parent attribute to resolve the 'attribute' string in.
71
72/** Resolve a group reference
73 *
74 */
75typedef struct {
76 dict_fixup_common_t common; //!< Common fields.
77
78 fr_dict_attr_t *da; //!< FR_TYPE_GROUP to fix
79 char *ref; //!< the reference name
81
82/** Clone operation from one tree node to another
83 *
84 */
85typedef struct {
86 dict_fixup_common_t common; //!< Common fields.
87
88 fr_dict_attr_t *da; //!< to populate with cloned information.
89 char *ref; //!< the target attribute to clone
91
92/** Run fixup callbacks for a VSA
93 *
94 */
95typedef struct {
96 dict_fixup_common_t common; //!< Common fields.
97
98 fr_dict_attr_t *da; //!< FR_TYPE_VSA to fix
100
101/** Dictionary attribute namespaces need their hash tables finalised
102 *
103 */
104typedef struct {
105 dict_fixup_common_t common; //!< Common fields.
106
107 fr_hash_table_t *hash; //!< We need to finalise.
109
110/** Initialise common fields in fixup struct, and add it to a fixup list
111 *
112 * @param[in] fixup_list to add fixup to.
113 * @param[in] common common header to populate.
114 * @return
115 * - 0 on success.
116 * - -1 on out of memory.
117 */
118static inline CC_HINT(always_inline) int dict_fixup_common(fr_dlist_head_t *fixup_list, dict_fixup_common_t *common)
119{
120 fr_dlist_insert_tail(fixup_list, common);
121
122 return 0;
123}
124
125/** Resolve a reference string to a dictionary attribute
126 *
127 * @param[out] da_p Where the attribute will be stored
128 * @param[in] rel Relative attribute to resolve from.
129 * @param[in] in Reference string.
130 * @return
131 * - <0 on error
132 * - 0 on parse OK, but *da_p is NULL;
133 * - 1 for parse OK, and *da_p is !NULL
134 */
136{
137 fr_dict_t *dict = fr_dict_unconst(rel->dict);
138 fr_dict_attr_t const *da = rel;
139 ssize_t slen;
140
141 *da_p = NULL;
142
143 /*
144 * Are we resolving a foreign reference?
145 */
146 if (fr_sbuff_next_if_char(in, '@')) {
147 char proto_name[FR_DICT_ATTR_MAX_NAME_LEN + 1];
148 fr_sbuff_t proto_name_sbuff = FR_SBUFF_OUT(proto_name, sizeof(proto_name));
149
150 /*
151 * @.foo is "foo from the current root".
152 *
153 * This is a bit clearer than "foo".
154 */
155 if (fr_sbuff_next_if_char(in, '.')) {
156 if (fr_sbuff_is_char(in, '.')) goto above_root;
157
158 da = rel->dict->root;
159 goto more;
160 }
161
162 slen = dict_by_protocol_substr(NULL, &dict, in, NULL);
163 /* Need to load it... */
164 if (slen <= 0) {
165 /* Quiet coverity */
166 fr_sbuff_terminate(&proto_name_sbuff);
167
168 /* Fixme, probably want to limit allowed chars */
169 if (fr_sbuff_out_bstrncpy_until(&proto_name_sbuff, in, SIZE_MAX,
170 &FR_SBUFF_TERMS(L(""), L(".")), NULL) <= 0) {
171 invalid_name:
172 fr_strerror_const("Invalid protocol name");
173 return -1;
174 }
175
176 /*
177 * The filenames are lowercase. The names in the dictionaries are case-insensitive. So
178 * we mash the name to all lowercase.
179 */
180 fr_tolower(proto_name);
181
182 /*
183 * Catch this early, so people don't do stupid things
184 * like put slashes in the references and then claim
185 * it's a security issue.
186 */
187 if (fr_dict_valid_oid_str(proto_name, -1) < 0) goto invalid_name;
188
189 /*
190 * Load the new dictionary, and mark it as loaded from our dictionary.
191 */
192 if (fr_dict_protocol_afrom_file(&dict, proto_name, NULL, (rel->dict)->root->name) < 0) {
193 fr_strerror_printf_push("Perhaps there is a '.' missing before the attribute name in %.*s ?",
195 return -1;
196 }
197
198 if (!fr_hash_table_insert((rel->dict)->autoref, dict)) {
199 fr_strerror_const("Failed inserting into internal autoref table");
200 return -1;
201 }
202 }
203
204 /*
205 * Didn't stop at an attribute ref... we're done
206 */
207 if (fr_sbuff_eof(in)) {
208 *da_p = dict->root;
209 return 1;
210 }
211
212 da = dict->root;
213 }
214
215 /*
216 * ref=.foo is a ref from the current parent.
217 *
218 * ref=@foo is a ref from the root of the tree.
219 */
220
221 if (!fr_sbuff_next_if_char(in, '.')) {
222 fr_strerror_printf("Invalid reference '%s' - it should start with '@' (from the root), or '.' (from the parent)",
224 return -1;
225 }
226
227 /*
228 * First '.' makes it relative, subsequent ones traverse up the tree.
229 *
230 * No '.' means use the root.
231 */
232 while (fr_sbuff_next_if_char(in, '.')) {
233 if (!da->parent) {
234 above_root:
235 fr_strerror_const("Reference attempted to navigate above dictionary root");
236 return -1;
237 }
238 da = da->parent;
239 }
240
241 /*
242 * Look up the attribute. Note that this call will
243 * update *da_p with a partial reference if it exists.
244 */
245more:
246 slen = fr_dict_attr_by_oid_substr(NULL, da_p, da, in, NULL);
247 if (slen < 0) return -1;
248
249 if (slen == 0) {
250 *da_p = NULL;
251 return 0;
252 }
253
254 return 1;
255}
256
257/** Add an enumeration value to an attribute which has not yet been defined
258 *
259 * @param[in] fctx Holds current dictionary parsing information.
260 * @param[in] filename this fixup relates to.
261 * @param[in] line this fixup relates to.
262 * @param[in] attr The OID string pointing to the attribute
263 * to add the enumeration value to.
264 * @param[in] attr_len The length of the attr string.
265 * @param[in] name The name of the enumv.
266 * @param[in] name_len Length of the name string.
267 * @param[in] value Value string. This is kept as a string until we know
268 * what type we want to transform it into.
269 * @param[in] value_len Length of the value string.
270 * @param[in] parent of this attribute.
271 * @return
272 * - 0 on success.
273 * - -1 on out of memory.
274 */
275int dict_fixup_enumv_enqueue(dict_fixup_ctx_t *fctx, char const *filename, int line,
276 char const *attr, size_t attr_len,
277 char const *name, size_t name_len,
278 char const *value, size_t value_len,
279 fr_dict_attr_t const *parent)
280{
281 dict_fixup_enumv_t *fixup;
282
283 fixup = talloc(fctx->pool, dict_fixup_enumv_t);
284 if (!fixup) {
285 oom:
286 fr_strerror_const("Out of memory");
287 return -1;
288 }
289 *fixup = (dict_fixup_enumv_t) {
290 .attribute = talloc_bstrndup(fixup, attr, attr_len),
291 .name = talloc_bstrndup(fixup, name, name_len),
292 .value = talloc_bstrndup(fixup, value, value_len),
293 .parent = parent
294 };
295 if (!fixup->attribute || !fixup->name || !fixup->value) goto oom;
296
297 fixup->filename = talloc_strdup(fixup, filename);
298 if (!fixup->filename) goto oom;
299 fixup->line = line;
300
301 return dict_fixup_common(&fctx->enumv, &fixup->common);
302}
303
304/** Add a previously defined enumeration value to an existing attribute
305 *
306 * @param[in] fctx Holds current dictionary parsing information.
307 * @param[in] fixup Hash table to fill.
308 * @return
309 * - 0 on success.
310 * - -1 on failure.
311 */
312static inline CC_HINT(always_inline) int dict_fixup_enumv_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_enumv_t *fixup)
313{
314 fr_dict_attr_t *da;
317 int ret;
318 fr_dict_attr_t const *da_const;
319
320 da_const = fr_dict_attr_by_oid(NULL, fixup->parent, fixup->attribute);
321 if (!da_const) {
322 fr_strerror_printf_push("Failed resolving ATTRIBUTE referenced by VALUE '%s' at %s[%d]",
323 fixup->name, fr_cwd_strip(fixup->filename), fixup->line);
324 return -1;
325 }
326 da = fr_dict_attr_unconst(da_const);
327 type = da->type;
328
329 if (fr_value_box_from_str(fixup, &value, type, NULL,
330 fixup->value, talloc_array_length(fixup->value) - 1,
331 NULL) < 0) {
332 fr_strerror_printf_push("Invalid VALUE '%pV' for attribute '%s' at %s[%d]",
334 da->name,
335 fr_cwd_strip(fixup->filename), fixup->line);
336 return -1;
337 }
338
339 ret = fr_dict_enum_add_name(da, fixup->name, &value, false, false);
341 da->flags.has_fixup = false;
342
343 return ret;
344}
345
346/** Resolve a group reference
347 *
348 * This is required as the reference may point to another dictionary which
349 * hasn't been loaded yet.
350 *
351 * @param[in] fctx Holds current dictionary parsing information.
352 * @param[in] da The group dictionary attribute.
353 * @param[in] ref OID string representing what the group references.
354 * @return
355 * - 0 on success.
356 * - -1 on out of memory.
357 */
359{
360 dict_fixup_group_t *fixup;
361
362 fixup = talloc(fctx->pool, dict_fixup_group_t);
363 if (!fixup) {
364 fr_strerror_const("Out of memory");
365 return -1;
366 }
367 *fixup = (dict_fixup_group_t) {
368 .da = da,
369 .ref = talloc_strdup(fixup, ref),
370 };
371
372 da->flags.has_fixup = true;
373
374 return dict_fixup_common(&fctx->group, &fixup->common);
375}
376
377/** Resolve a group reference
378 *
379 * @param[in] fctx Holds current dictionary parsing information.
380 * @param[in] fixup Hash table to fill.
381 * @return
382 * - 0 on success.
383 * - -1 on failure.
384 */
385static inline CC_HINT(always_inline) int dict_fixup_group_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_group_t *fixup)
386{
387 fr_dict_attr_t const *da;
388
389 (void) fr_dict_protocol_reference(&da, fixup->da->parent, &FR_SBUFF_IN_STR(fixup->ref));
390 if (!da) {
391 fr_strerror_printf_push("Failed resolving reference for attribute %s at %s[%d]",
392 fixup->da->name, fr_cwd_strip(fixup->da->filename), fixup->da->line);
393 return -1;
394 }
395
396 if (da->type != FR_TYPE_TLV) {
397 fr_strerror_printf("References MUST be to attributes of type 'tlv' at %s[%d]",
398 fr_cwd_strip(fixup->da->filename), fixup->da->line);
399 return -1;
400 }
401
402 if (fr_dict_attr_ref(da)) {
403 fr_strerror_printf("References MUST NOT refer to an ATTRIBUTE which also has 'ref=...' at %s[%d]",
404 fr_cwd_strip(fixup->da->filename), fixup->da->line);
405 return -1;
406 }
407
408 fixup->da->flags.has_fixup = false;
409
410 return dict_attr_ref_resolve(fixup->da, da);
411}
412
413/** Clone one area of a tree into another
414 *
415 * These must be processed later to ensure that we've finished building an
416 * attribute by the time it has been cloned.
417 *
418 * @param[in] fctx Holds current dictionary parsing information.
419 * @param[in] da The group dictionary attribute.
420 * @param[in] ref OID string representing what the group references..
421 * @return
422 * - 0 on success.
423 * - -1 on out of memory.
424 */
426{
427 dict_fixup_clone_t *fixup;
428
429 fr_assert(!fr_type_is_leaf(da->type));
430
431 /*
432 * Delay type checks until we've loaded all of the
433 * dictionaries. This means that errors are produced
434 * later, but that shouldn't matter for the default
435 * dictionaries. They're supposed to work.
436 */
437 fixup = talloc(fctx->pool, dict_fixup_clone_t);
438 if (!fixup) {
439 fr_strerror_const("Out of memory");
440 return -1;
441 }
442 *fixup = (dict_fixup_clone_t) {
443 .da = da,
444 .ref = talloc_typed_strdup(fixup, ref)
445 };
446
447 return dict_fixup_common(&fctx->clone, &fixup->common);
448}
449
450/** Clone a dictionary attribute from a ref
451 *
452 * @param[in] dst_p will either be inserted directly, with fields from the clone, or will be
453 * cloned, and then inserted. In this case the original dst da will be freed
454 * and the new cloned attribute will be written back to dst_p.
455 * @param[in] src to clone.
456 * @return
457 * - 0 on success.
458 * - -1 on failure.
459 */
461{
462 fr_dict_attr_t *dst = *dst_p;
463 fr_dict_t *dict = fr_dict_unconst(dst->dict);
464
465 /*
466 * @todo - allow this for structural attributes, so long as they don't have a child TLV.
467 */
468 if (src->dict->proto != dst->dict->proto) {
469 fr_strerror_printf("Incompatible protocols. Referenced '%s', referencing '%s'. Defined at %s[%d]",
470 src->dict->proto->name, dst->dict->proto->name, dst->filename, dst->line);
471 return -1;
472 }
473
474 /*
475 * The referenced DA is higher than the one we're creating. Ensure it's not a parent.
476 *
477 * @todo - Do we want to require that aliases only go deeper in the tree? Otherwise aliases can
478 * make the tree a lot more complicated.
479 */
480 if (src->depth < dst->depth) {
481 fr_dict_attr_t const *parent;
482
483 for (parent = dst->parent; !parent->flags.is_root; parent = parent->parent) {
484 if (parent == src) {
485 fr_strerror_printf("References MUST NOT be to a parent attribute %s at %s[%d]",
486 parent->name, fr_cwd_strip(dst->filename), dst->line);
487 return -1;
488 }
489 }
490 }
491
492 if (fr_dict_attr_ref(src)) {
493 fr_strerror_printf("References MUST NOT refer to an ATTRIBUTE which itself has a 'ref=...' at %s[%d]",
494 fr_cwd_strip(dst->filename), dst->line);
495 return -1;
496 }
497
498 /*
499 * Leaf attributes can be cloned. TLV and STRUCT can be cloned. But all other data types cannot
500 * be cloned.
501 *
502 * And while we're at it, copy the flags over.
503 */
504 switch (src->type) {
505 default:
506 fr_strerror_printf("References MUST NOT refer to an attribute of data type '%s' at %s[%d]",
507 fr_type_to_str(src->type), fr_cwd_strip(dst->filename), dst->line);
508 return -1;
509
510 case FR_TYPE_TLV:
511 dst->flags.type_size = src->flags.type_size;
512 dst->flags.length = src->flags.length;
514
515 case FR_TYPE_STRUCT:
516 if (!dict_attr_children(src)) {
517 fr_strerror_printf_push("Reference %s has no children defined at %s[%d]",
518 src->name, fr_cwd_strip(dst->filename), dst->line);
519 return -1;
520 }
521 break;
522 }
523
524 dst->flags.array = src->flags.array;
525 dst->flags.is_known_width = src->flags.is_known_width;
526 dst->flags.internal = src->flags.internal;
527 dst->flags.name_only = src->flags.name_only;
528
529 /*
530 * Clone the children from the source to the dst.
531 *
532 * Note that the destination may already have children!
533 */
534 if (dict_attr_acopy_children(dict, dst, src) < 0) {
535 fr_strerror_printf("Failed populating attribute '%s' with children of %s - %s", dst->name, src->name, fr_strerror());
536 return -1;
537 }
538
540}
541
542/** Clone one are of a tree into another
543 *
544 * @param[in] fctx Holds current dictionary parsing information.
545 * @param[in] fixup Containing source/destination of the clone.
546 * @return
547 * - 0 on success.
548 * - -1 on failure.
549 */
550static inline CC_HINT(always_inline) int dict_fixup_clone_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_clone_t *fixup)
551{
552 fr_dict_attr_t const *src;
553
554 (void) fr_dict_protocol_reference(&src, fixup->da->parent, &FR_SBUFF_IN_STR(fixup->ref));
555 if (!src) {
556 fr_strerror_printf_push("Failed resolving reference for attribute %s at %s[%d]",
557 fixup->da->name, fr_cwd_strip(fixup->da->filename), fixup->da->line);
558 return -1;
559 }
560
561 fixup->da->flags.has_fixup = false;
562 return dict_fixup_clone(&fixup->da, src);
563}
564
565/** Clone enumeration values from one attribute to another
566 *
567 * These must be processed later to ensure that we've finished building an
568 * attribute by the time it has been cloned.
569 *
570 * @param[in] fctx Holds current dictionary parsing information.
571 * @param[in] da The group dictionary attribute.
572 * @param[in] ref OID string representing what the group references..
573 * @return
574 * - 0 on success.
575 * - -1 on out of memory.
576 */
578{
579 dict_fixup_clone_t *fixup;
580
581 fr_assert(fr_type_is_leaf(da->type));
582
583 /*
584 * Delay type checks until we've loaded all of the
585 * dictionaries. This means that errors are produced
586 * later, but that shouldn't matter for the default
587 * dictionaries. They're supposed to work.
588 */
589 fixup = talloc(fctx->pool, dict_fixup_clone_t);
590 if (!fixup) {
591 fr_strerror_const("Out of memory");
592 return -1;
593 }
594 *fixup = (dict_fixup_clone_t) {
595 .da = da,
596 .ref = talloc_typed_strdup(fixup, ref)
597 };
598
599 return dict_fixup_common(&fctx->clone_enum, &fixup->common);
600}
601
602/** Clone one are of a tree into another
603 *
604 * @param[in] fctx Holds current dictionary parsing information.
605 * @param[in] fixup Containing source/destination of the clone.
606 * @return
607 * - 0 on success.
608 * - -1 on failure.
609 */
610static inline CC_HINT(always_inline) int dict_fixup_clone_enum_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_clone_t *fixup)
611{
612 fr_dict_attr_t const *src;
613
614 /*
615 * This extension must already exist.
616 */
618
619 /*
620 * Find the referenced attribute, and validate it.
621 */
622 (void) fr_dict_protocol_reference(&src, fixup->da->parent, &FR_SBUFF_IN_STR(fixup->ref));
623 if (!src) {
624 fr_strerror_printf_push("Failed resolving reference for attribute %s at %s[%d]",
625 fixup->da->name, fr_cwd_strip(fixup->da->filename), fixup->da->line);
626 return -1;
627 }
628
630 fr_strerror_printf_push("Reference %s has no VALUEs defined at %s[%d]",
631 fixup->ref, fr_cwd_strip(fixup->da->filename), fixup->da->line);
632 return -1;
633 }
634
635 /*
636 * Allow enums to be copied from any protocol, so long as the attribute is not a key, and not of
637 * type 'attribute'.
638 */
639 if (fr_dict_attr_is_key_field(src) || fr_dict_attr_is_key_field(fixup->da) || (src->type == FR_TYPE_ATTR)) {
640 fr_strerror_printf("Cannot clone VALUEs from 'key=...' or type 'attribute' at %s[%d]",
641 fixup->da->filename, fixup->da->line);
642 return -1;
643 }
644
645 if (fr_dict_attr_ref(src)) {
646 fr_strerror_printf("References MUST NOT refer to an ATTRIBUTE which itself has a 'ref=...' at %s[%d]",
647 fr_cwd_strip(fixup->da->filename), fixup->da->line);
648 return -1;
649 }
650
651 if (!dict_attr_ext_copy(&fixup->da, src, FR_DICT_ATTR_EXT_ENUMV)) {
652 fr_strerror_printf("Reference copied no VALUEs from type type '%s' at %s[%d]",
653 fr_type_to_str(fixup->da->type),
654 fr_cwd_strip(fixup->da->filename), fixup->da->line);
655 return -1;
656 }
657
658 fixup->da->flags.has_fixup = false;
659 return 0;
660}
661
662/** Push a fixup for a VSA.
663 *
664 * This is required so that we can define VENDORs for all VSAs, even
665 * if the dictionary doesn't contain VENDOR children for that VSA.
666 * This fixup means that we can define VENDORs elsewhere, and then
667 * use them in all VSA definitions. It means that we don't have to
668 * do these lookups at run-time.
669 *
670 * @param[in] fctx Holds current dictionary parsing information.
671 * @param[in] da The group dictionary attribute.
672 * @return
673 * - 0 on success.
674 * - -1 on out of memory.
675 */
677{
678 dict_fixup_vsa_t *fixup;
679
680 fixup = talloc(fctx->pool, dict_fixup_vsa_t);
681 if (!fixup) {
682 fr_strerror_const("Out of memory");
683 return -1;
684 }
685 *fixup = (dict_fixup_vsa_t) {
686 .da = da,
687 };
688
689 return dict_fixup_common(&fctx->vsa, &fixup->common);
690}
691
692/** Run VSA fixups
693 *
694 * @param[in] fctx Holds current dictionary parsing information.
695 * @param[in] fixup entry for fixup
696 * @return
697 * - 0 on success.
698 * - -1 on failure.
699 */
700static inline CC_HINT(always_inline) int dict_fixup_vsa_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_vsa_t *fixup)
701{
703 fr_dict_t *dict = fr_dict_unconst(fr_dict_by_da(fixup->da));
704 fr_hash_iter_t iter;
705
706 if (!dict->vendors_by_num) return 0;
707
708 for (dv = fr_hash_table_iter_init(dict->vendors_by_num, &iter);
709 dv;
710 dv = fr_hash_table_iter_next(dict->vendors_by_num, &iter)) {
711 if (dict_attr_child_by_num(fixup->da, dv->pen)) continue;
712
713 if (fr_dict_attr_add(dict, fixup->da, dv->name, dv->pen, FR_TYPE_VENDOR, NULL) < 0) return -1;
714 }
715
716 fixup->da->flags.has_fixup = false;
717 return 0;
718}
719
720
721/** Resolve a group reference
722 *
723 * This is required as the reference may point to another dictionary which
724 * hasn't been loaded yet.
725 *
726 * @param[in] fctx Holds current dictionary parsing information.
727 * @param[in] filename this fixup relates to.
728 * @param[in] line this fixup relates to.
729 * @param[in] alias_parent where to add the alias.
730 * @param[in] alias alias to add.
731 * @param[in] ref_parent attribute that should contain the reference.
732 * @param[in] ref OID string representing what the group references.
733 * @return
734 * - 0 on success.
735 * - -1 on out of memory.
736 */
737int dict_fixup_alias_enqueue(dict_fixup_ctx_t *fctx, char const *filename, int line,
738 fr_dict_attr_t *alias_parent, char const *alias,
739 fr_dict_attr_t *ref_parent, char const *ref)
740{
741 dict_fixup_alias_t *fixup;
742
743 fixup = talloc(fctx->pool, dict_fixup_alias_t);
744 if (!fixup) {
745 oom:
746 fr_strerror_const("Out of memory");
747 return -1;
748 }
749 *fixup = (dict_fixup_alias_t) {
750 .alias = talloc_typed_strdup(fixup, alias),
751 .alias_parent = alias_parent,
752 .ref = talloc_typed_strdup(fixup, ref),
753 .ref_parent = ref_parent
754 };
755
756 fixup->filename = talloc_strdup(fixup, filename);
757 if (!fixup->filename) goto oom;
758 fixup->line = line;
759
760 return dict_fixup_common(&fctx->alias, &fixup->common);
761}
762
763static inline CC_HINT(always_inline) int dict_fixup_alias_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_alias_t *fixup)
764{
765 fr_dict_attr_t const *da;
766
767 /*
768 * The <ref> can be a name.
769 */
770 da = fr_dict_attr_by_oid(NULL, fixup->ref_parent, fixup->ref);
771 if (!da) {
772 fr_strerror_printf("Attribute '%s' aliased by '%s' doesn't exist in namespace '%s', at %s[%d]",
773 fixup->ref, fixup->alias, fixup->ref_parent->name, fixup->filename, fixup->line);
774 return -1;
775 }
776
777 fr_dict_attr_unconst(da)->flags.has_fixup = false;
778 return dict_attr_alias_add(fixup->alias_parent, fixup->alias, da);
779}
780
781/** Initialise a fixup ctx
782 *
783 * @param[in] ctx to allocate the fixup pool in.
784 * @param[in] fctx to initialise.
785 * @return
786 * - 0 on success.
787 * - -1 on failure.
788 */
789int dict_fixup_init(TALLOC_CTX *ctx, dict_fixup_ctx_t *fctx)
790{
791 if (fctx->pool) return 0;
792
793 fr_dlist_talloc_init(&fctx->enumv, dict_fixup_enumv_t, common.entry);
794 fr_dlist_talloc_init(&fctx->group, dict_fixup_group_t, common.entry);
795 fr_dlist_talloc_init(&fctx->clone, dict_fixup_clone_t, common.entry);
797 fr_dlist_talloc_init(&fctx->vsa, dict_fixup_vsa_t, common.entry);
798 fr_dlist_talloc_init(&fctx->alias, dict_fixup_alias_t, common.entry);
799
800 fctx->pool = talloc_pool(ctx, DICT_FIXUP_POOL_SIZE);
801 if (!fctx->pool) return -1;
802
803 return 0;
804}
805
806/** Apply all outstanding fixes to a set of dictionaries
807 *
808 */
810{
811
812#define APPLY_FIXUP(_fctx, _list, _func, _type) \
813do { \
814 _type *_fixup; \
815 while ((_fixup = fr_dlist_head(&(_fctx)->_list))) { \
816 if (_func(_fctx, _fixup) < 0) return -1; \
817 fr_dlist_remove(&(_fctx)->_list, _fixup); \
818 talloc_free(_fixup); \
819 } \
820} while (0)
821
822 /*
823 * Apply all the fctx in order
824 *
825
826 * - Enumerations first as they have no dependencies
827 * - Group references next, as group attributes may be cloned.
828 * - Clones last as all other references and additions should
829 * be applied before cloning.
830 * - Clone enum clones the enumeration values from a dedicated
831 * enum, or another attribute with enumerations.
832 * - VSAs
833 * - Aliases last as all attributes need to be defined.
834 */
841
842 TALLOC_FREE(fctx->pool);
843
844 return 0;
845}
846
847/** Fixup all hash tables in the dictionary so they're suitable for threaded access
848 *
849 */
850static int _dict_attr_fixup_hash_tables(fr_dict_attr_t const *da, UNUSED void *uctx)
851{
852 {
854
856 if (ext) {
859 }
860 }
861
862 {
864
867 }
868
869 return 0;
870}
871
872/** Walk a dictionary finalising the hash tables in all attributes with a distinct namespace
873 *
874 * @param[in] dict to finalise namespaces for.
875 */
877{
879
880 (void)_dict_attr_fixup_hash_tables(root, NULL);
881
883
884 /*
885 * Walk over all of the hash tables to ensure they're
886 * initialized. We do this because the threads may perform
887 * lookups, and we don't want multi-threaded re-ordering
888 * of the table entries. That would be bad.
889 */
890 fr_hash_table_fill(dict->vendors_by_name);
891 fr_hash_table_fill(dict->vendors_by_num);
892}
int const char int line
Definition acutest.h:704
#define RCSID(id)
Definition build.h:485
#define L(_str)
Helper for initialising arrays of string literals.
Definition build.h:209
#define FALL_THROUGH
clang 10 doesn't recognised the FALL-THROUGH comment anymore
Definition build.h:324
#define UNUSED
Definition build.h:317
int dict_attr_acopy_children(fr_dict_t *dict, fr_dict_attr_t *dst, fr_dict_attr_t const *src)
Copy the children of an existing attribute.
Definition dict_util.c:1232
int fr_dict_attr_add_initialised(fr_dict_attr_t *da)
A variant of fr_dict_attr_t that allows a pre-allocated, populated fr_dict_attr_t to be added.
Definition dict_util.c:1894
ssize_t fr_dict_valid_oid_str(char const *name, ssize_t len)
Definition dict_util.c:5013
int fr_dict_enum_add_name(fr_dict_attr_t *da, char const *name, fr_value_box_t const *value, bool coerce, bool replace)
Add a value name.
Definition dict_util.c:2266
char const * name
Vendor name.
Definition dict.h:275
fr_dict_t * fr_dict_unconst(fr_dict_t const *dict)
Coerce to non-const.
Definition dict_util.c:4935
fr_dict_t const * fr_dict_by_da(fr_dict_attr_t const *da)
Attempt to locate the protocol dictionary containing an attribute.
Definition dict_util.c:2913
int fr_dict_walk(fr_dict_attr_t const *da, fr_dict_walk_t callback, void *uctx)
Definition dict_util.c:5127
fr_dict_attr_t * fr_dict_attr_unconst(fr_dict_attr_t const *da)
Coerce to non-const.
Definition dict_util.c:4947
fr_slen_t fr_dict_attr_by_oid_substr(fr_dict_attr_err_t *err, fr_dict_attr_t const **out, fr_dict_attr_t const *parent, fr_sbuff_t *in, fr_sbuff_term_t const *tt))
Resolve an attribute using an OID string.
Definition dict_util.c:2631
int fr_dict_protocol_afrom_file(fr_dict_t **out, char const *proto_name, char const *proto_dir, char const *dependent)
(Re)-initialize a protocol dictionary
fr_dict_attr_t const * fr_dict_root(fr_dict_t const *dict)
Return the root attribute of a dictionary.
Definition dict_util.c:2707
uint32_t pen
Private enterprise number.
Definition dict.h:271
@ FR_DICT_ATTR_EXT_ENUMV
Enumeration values.
Definition dict.h:189
int fr_dict_attr_add(fr_dict_t *dict, fr_dict_attr_t const *parent, char const *name, unsigned int attr, fr_type_t type, fr_dict_attr_flags_t const *flags))
Add an attribute to the dictionary.
Definition dict_util.c:2016
fr_dict_attr_t const * fr_dict_attr_by_oid(fr_dict_attr_err_t *err, fr_dict_attr_t const *parent, char const *oid))
Resolve an attribute using an OID string.
Definition dict_util.c:2680
#define fr_dict_attr_is_key_field(_da)
Definition dict.h:170
static fr_slen_t in
Definition dict.h:887
#define FR_DICT_ATTR_MAX_NAME_LEN
Maximum length of a attribute name.
Definition dict.h:502
Private enterprise.
Definition dict.h:270
fr_hash_table_t * name_by_value
Lookup a name by value.
Definition dict_ext.h:111
static void * fr_dict_attr_ext(fr_dict_attr_t const *da, fr_dict_attr_ext_t ext)
Definition dict_ext.h:134
fr_hash_table_t * value_by_name
Lookup an enumeration value by name.
Definition dict_ext.h:110
static fr_dict_attr_t const * fr_dict_attr_ref(fr_dict_attr_t const *da)
Return the reference associated with a group type attribute.
Definition dict_ext.h:178
Attribute extension - Holds enumeration values.
Definition dict_ext.h:108
static fr_hash_table_t * dict_attr_namespace(fr_dict_attr_t const *da)
Return the namespace hash table associated with the attribute.
static int dict_attr_ref_resolve(fr_dict_attr_t const *da, fr_dict_attr_t const *ref)
static void * dict_attr_ext_copy(fr_dict_attr_t **da_out_p, fr_dict_attr_t const *da_in, fr_dict_attr_ext_t ext)
Copy a single attribute extension from one attribute to another.
static fr_dict_attr_t const ** dict_attr_children(fr_dict_attr_t const *da)
fr_dict_attr_t * da
FR_TYPE_GROUP to fix.
Definition dict_fixup.c:78
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:59
int dict_fixup_apply(dict_fixup_ctx_t *fctx)
Apply all outstanding fixes to a set of dictionaries.
Definition dict_fixup.c:809
char * ref
the target attribute to clone
Definition dict_fixup.c:89
char * attribute
we couldn't find (and will need to resolve later).
Definition dict_fixup.c:64
static int dict_fixup_clone_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_clone_t *fixup)
Clone one are of a tree into another.
Definition dict_fixup.c:550
char * value
Raw enum value.
Definition dict_fixup.c:66
char * alias
we need to create.
Definition dict_fixup.c:48
char * ref
what the alias references.
Definition dict_fixup.c:51
static int dict_fixup_common(fr_dlist_head_t *fixup_list, dict_fixup_common_t *common)
Initialise common fields in fixup struct, and add it to a fixup list.
Definition dict_fixup.c:118
char * filename
where the line being fixed up.
Definition dict_fixup.c:61
int dict_fixup_enumv_enqueue(dict_fixup_ctx_t *fctx, char const *filename, int line, char const *attr, size_t attr_len, char const *name, size_t name_len, char const *value, size_t value_len, fr_dict_attr_t const *parent)
Add an enumeration value to an attribute which has not yet been defined.
Definition dict_fixup.c:275
int dict_fixup_alias_enqueue(dict_fixup_ctx_t *fctx, char const *filename, int line, fr_dict_attr_t *alias_parent, char const *alias, fr_dict_attr_t *ref_parent, char const *ref)
Resolve a group reference.
Definition dict_fixup.c:737
int dict_fixup_clone_enqueue(dict_fixup_ctx_t *fctx, fr_dict_attr_t *da, char const *ref)
Clone one area of a tree into another.
Definition dict_fixup.c:425
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:96
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:76
static int dict_fixup_clone_enum_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_clone_t *fixup)
Clone one are of a tree into another.
Definition dict_fixup.c:610
int dict_fixup_init(TALLOC_CTX *ctx, dict_fixup_ctx_t *fctx)
Initialise a fixup ctx.
Definition dict_fixup.c:789
int dict_fixup_clone_enum_enqueue(dict_fixup_ctx_t *fctx, fr_dict_attr_t *da, char const *ref)
Clone enumeration values from one attribute to another.
Definition dict_fixup.c:577
static int dict_fixup_vsa_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_vsa_t *fixup)
Run VSA fixups.
Definition dict_fixup.c:700
fr_dict_attr_t * alias_parent
Where to add the alias.
Definition dict_fixup.c:49
fr_dlist_t entry
Entry in linked list of fctx.
Definition dict_fixup.c:36
fr_dict_attr_t const * parent
Parent attribute to resolve the 'attribute' string in.
Definition dict_fixup.c:69
static int _dict_attr_fixup_hash_tables(fr_dict_attr_t const *da, UNUSED void *uctx)
Fixup all hash tables in the dictionary so they're suitable for threaded access.
Definition dict_fixup.c:850
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:105
char * filename
where the line being fixed up.
Definition dict_fixup.c:45
fr_hash_table_t * hash
We need to finalise.
Definition dict_fixup.c:107
int dict_fixup_vsa_enqueue(dict_fixup_ctx_t *fctx, fr_dict_attr_t *da)
Push a fixup for a VSA.
Definition dict_fixup.c:676
int dict_fixup_clone(fr_dict_attr_t **dst_p, fr_dict_attr_t const *src)
Clone a dictionary attribute from a ref.
Definition dict_fixup.c:460
static int dict_fixup_group_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_group_t *fixup)
Resolve a group reference.
Definition dict_fixup.c:385
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:43
int dict_fixup_group_enqueue(dict_fixup_ctx_t *fctx, fr_dict_attr_t *da, char const *ref)
Resolve a group reference.
Definition dict_fixup.c:358
char * ref
the reference name
Definition dict_fixup.c:79
int fr_dict_protocol_reference(fr_dict_attr_t const **da_p, fr_dict_attr_t const *rel, fr_sbuff_t *in)
Resolve a reference string to a dictionary attribute.
Definition dict_fixup.c:135
static int dict_fixup_enumv_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_enumv_t *fixup)
Add a previously defined enumeration value to an existing attribute.
Definition dict_fixup.c:312
#define APPLY_FIXUP(_fctx, _list, _func, _type)
fr_dict_attr_t * ref_parent
Parent attribute to resolve the 'attribute' string in.
Definition dict_fixup.c:52
char * name
Raw enum name.
Definition dict_fixup.c:65
void dict_hash_tables_finalise(fr_dict_t *dict)
Walk a dictionary finalising the hash tables in all attributes with a distinct namespace.
Definition dict_fixup.c:876
fr_dict_attr_t * da
FR_TYPE_VSA to fix.
Definition dict_fixup.c:98
static int dict_fixup_alias_apply(UNUSED dict_fixup_ctx_t *fctx, dict_fixup_alias_t *fixup)
Definition dict_fixup.c:763
fr_dict_attr_t * da
to populate with cloned information.
Definition dict_fixup.c:88
dict_fixup_common_t common
Common fields.
Definition dict_fixup.c:86
Add an enumeration value to an attribute that wasn't defined at the time the value was parsed.
Definition dict_fixup.c:42
Clone operation from one tree node to another.
Definition dict_fixup.c:85
Common fields for every fixup structure.
Definition dict_fixup.c:35
Add an enumeration value to an attribute that wasn't defined at the time the value was parsed.
Definition dict_fixup.c:58
Resolve a group reference.
Definition dict_fixup.c:75
Dictionary attribute namespaces need their hash tables finalised.
Definition dict_fixup.c:104
Run fixup callbacks for a VSA.
Definition dict_fixup.c:95
Functions to finalise and fixup dictionaries.
fr_dlist_head_t clone_enum
Clone enum operation to apply.
fr_dlist_head_t alias
Aliases that can't be resolved immediately.
fr_dlist_head_t group
Group references to resolve.
fr_dlist_head_t clone
Clone operation to apply.
fr_dlist_head_t vsa
VSAs to add vendors for.
fr_dlist_head_t enumv
Raw enumeration values to add.
TALLOC_CTX * pool
Temporary pool for fixups, reduces holes.
fr_slen_t dict_by_protocol_substr(fr_dict_attr_err_t *err, fr_dict_t **out, fr_sbuff_t *name, fr_dict_t const *dict_def)
Definition dict_util.c:2722
#define DICT_FIXUP_POOL_SIZE
Definition dict_priv.h:38
fr_dict_attr_t * dict_attr_child_by_num(fr_dict_attr_t const *parent, unsigned int attr)
Internal version of fr_dict_attr_child_by_num.
Definition dict_util.c:3588
int dict_attr_alias_add(fr_dict_attr_t const *parent, char const *alias, fr_dict_attr_t const *ref)
Add an alias to an existing attribute.
Definition dict_util.c:1445
Test enumeration values.
Definition dict_test.h:92
static int fr_dlist_insert_tail(fr_dlist_head_t *list_head, void *ptr)
Insert an item into the tail of a list.
Definition dlist.h:378
#define fr_dlist_talloc_init(_head, _type, _field)
Initialise the head structure of a doubly linked list.
Definition dlist.h:275
Head of a doubly linked list.
Definition dlist.h:51
Entry in a doubly linked list.
Definition dlist.h:41
char const * fr_cwd_strip(char const *filename)
Intended to be used in logging functions to make output more readable.
Definition file.c:384
void * fr_hash_table_iter_next(fr_hash_table_t *ht, fr_hash_iter_t *iter)
Iterate over entries in a hash table.
Definition hash.c:625
void * fr_hash_table_iter_init(fr_hash_table_t *ht, fr_hash_iter_t *iter)
Initialise an iterator.
Definition hash.c:677
bool fr_hash_table_insert(fr_hash_table_t *ht, void const *data)
Insert data into a hash table.
Definition hash.c:467
void fr_hash_table_fill(fr_hash_table_t *ht)
Ensure all buckets are filled.
Definition hash.c:718
Stores the state of the current iteration operation.
Definition hash.h:41
fr_type_t
@ FR_TYPE_TLV
Contains nested attributes.
@ FR_TYPE_STRUCT
like TLV, but without T or L, and fixed-width children
@ FR_TYPE_VENDOR
Attribute that represents a vendor in the attribute tree.
long int ssize_t
size_t fr_sbuff_out_bstrncpy_until(fr_sbuff_t *out, fr_sbuff_t *in, size_t len, fr_sbuff_term_t const *tt, fr_sbuff_unescape_rules_t const *u_rules)
char * fr_tolower(char *str)
Definition misc.c:226
#define fr_assert(_expr)
Definition rad_assert.h:38
static unsigned int hash(char const *username, unsigned int tablesize)
Definition rlm_passwd.c:132
static char const * name
bool fr_sbuff_next_if_char(fr_sbuff_t *sbuff, char c)
Return true if the current char matches, and if it does, advance.
Definition sbuff.c:2116
#define fr_sbuff_start(_sbuff_or_marker)
#define FR_SBUFF_TERMS(...)
Initialise a terminal structure with a list of sorted strings.
Definition sbuff.h:193
#define fr_sbuff_is_char(_sbuff_or_marker, _c)
#define fr_sbuff_eof(_x)
#define FR_SBUFF_IN_STR(_start)
#define FR_SBUFF_OUT(_start, _len_or_end)
#define fr_sbuff_used(_sbuff_or_marker)
fr_aka_sim_id_type_t type
char * talloc_bstrndup(TALLOC_CTX *ctx, char const *in, size_t inlen)
Binary safe strndup function.
Definition talloc.c:586
char * talloc_typed_strdup(TALLOC_CTX *ctx, char const *p)
Call talloc_strdup, setting the type on the new chunk correctly.
Definition talloc.c:467
static fr_slen_t parent
Definition pair.h:855
char const * fr_strerror(void)
Get the last library error.
Definition strerror.c:553
#define fr_strerror_printf(_fmt,...)
Log to thread local error buffer.
Definition strerror.h:64
#define fr_strerror_printf_push(_fmt,...)
Add a message to an existing stack of messages at the tail.
Definition strerror.h:84
#define fr_strerror_const(_msg)
Definition strerror.h:223
@ FR_TYPE_ATTR
A contains an attribute reference.
Definition types.h:84
#define fr_type_is_leaf(_x)
Definition types.h:394
static char const * fr_type_to_str(fr_type_t type)
Return a static string containing the type name.
Definition types.h:455
ssize_t fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_type_t dst_type, fr_dict_attr_t const *dst_enumv, char const *in, size_t inlen, fr_sbuff_unescape_rules_t const *erules)
Definition value.c:5782
void fr_value_box_clear(fr_value_box_t *data)
Clear/free any existing value and metadata.
Definition value.c:4159
#define fr_box_strvalue_buffer(_val)
Definition value.h:311
#define FR_VALUE_BOX_INITIALISER_NULL(_vb)
A static initialiser for stack/globally allocated boxes.
Definition value.h:510