ensure that groups have a ref extension

diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index 0400252ccb70f0975140d8cc0fb51991a342a211..fcf06c662e081352e8e7b435e6a1e25d321bf31f 100644 (file)
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -532,6 +532,8 @@ int                 fr_dict_enum_add_name_next(fr_dict_attr_t *da, char const *name) CC_HINT(n
 int                    fr_dict_str_to_argv(char *str, char **argv, int max_argc);
 
 int                    fr_dict_attr_acopy_local(fr_dict_attr_t const *dst, fr_dict_attr_t const *src) CC_HINT(nonnull);
+
+int                    fr_dict_attr_set_group(fr_dict_attr_t **da_p) CC_HINT(nonnull);
 /** @} */
 
 /** @name Dict accessors

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index 8d117a53d03c129fecaeffa7621dea2c5dbc7ca6..06e59c30594ba21fc6001d6a8fcf8f5119a23799 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -4972,3 +4972,22 @@ fr_dict_attr_t const *fr_dict_unlocal(fr_dict_attr_t const *da)
 
        return da;
 }
+
+int fr_dict_attr_set_group(fr_dict_attr_t **da_p)
+{
+       if ((*da_p)->type == FR_TYPE_GROUP) {
+               fr_assert(fr_dict_attr_ext(*da_p, FR_DICT_ATTR_EXT_REF) != NULL);
+               return 0;
+       }
+
+       (*da_p)->type = FR_TYPE_GROUP;
+
+       fr_assert(fr_dict_attr_ext(*da_p, FR_DICT_ATTR_EXT_REF) == NULL);
+
+       if (!dict_attr_ext_alloc(da_p, FR_DICT_ATTR_EXT_REF)) {
+               return -1;
+       }
+
+       return 0;
+}
+

diff --git a/src/protocols/der/base.c b/src/protocols/der/base.c
index 79c17616d0cbddab26288538aaae78870a3b8922..e6f4d1491f0e27410a9dfa01e14d0130c87f87d4 100644 (file)
--- a/src/protocols/der/base.c
+++ b/src/protocols/der/base.c
@@ -29,19 +29,22 @@ RCSID("$Id$")
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/table.h>
+#include <freeradius-devel/util/dict_ext_priv.h>
 
 #include "der.h"
 
 static uint32_t instance_count = 0;
 
 fr_dict_t const *dict_der;
+//fr_dict_attr_t const *attr_oid_tree;
 
 extern fr_dict_autoload_t libfreeradius_der_dict[];
 fr_dict_autoload_t       libfreeradius_der_dict[] = { { .out = &dict_der, .proto = "der" }, { NULL } };
 
 extern fr_dict_attr_autoload_t libfreeradius_der_dict_attr[];
 fr_dict_attr_autoload_t               libfreeradius_der_dict_attr[] = {
-              { NULL }
+//     { .out = &attr_oid_tree, .name = "OID-Tree", .type = FR_TYPE_TLV, .dict = &dict_der },
+       { NULL }
 };
 
 static fr_table_num_sorted_t const tag_name_to_number[] = {
@@ -274,9 +277,8 @@ static int dict_flag_sequence_of(fr_dict_attr_t **da_p, char const *value, UNUSE
        }
 
        if (strcmp(value, "oid_and_value") == 0) {
-               (*da_p)->type = FR_TYPE_GROUP;
                flags->is_pair = true;
-               return 0;
+               return fr_dict_attr_set_group(da_p);
        }
 
        type = fr_table_value_by_str(tag_name_to_number, value, FR_DER_TAG_INVALID);
@@ -307,9 +309,8 @@ static int dict_flag_set_of(fr_dict_attr_t **da_p, char const *value, UNUSED fr_
        }
 
        if (strcmp(value, "oid_and_value") == 0) {
-               (*da_p)->type = FR_TYPE_GROUP;
                flags->is_pair = true;
-               return 0;
+               return fr_dict_attr_set_group(da_p);
        }
 
        type = fr_table_value_by_str(tag_name_to_number, value, FR_DER_TAG_INVALID);
@@ -692,14 +693,6 @@ static bool attr_valid(fr_dict_attr_t *da)
 {
        fr_der_attr_flags_t *flags = fr_dict_attr_ext(da->parent, FR_DICT_ATTR_EXT_PROTOCOL_SPECIFIC);
 
-       /*
-        *      sequence_of=oid_and_value has to have a reference to the OID tree.
-        */
-       if (flags->is_pair && !fr_dict_attr_ref(da)) {
-               fr_strerror_const("Flag has 'oid_and_value' set, but is missing 'ref=OID-Tree'");
-               return false;
-       }
-
        if (flags->is_sequence_of || flags->is_set_of) {
                fr_der_tag_t of_type = (flags->is_sequence_of ?
                                        flags->sequence_of :
@@ -716,6 +709,26 @@ static bool attr_valid(fr_dict_attr_t *da)
 
        flags = fr_dict_attr_ext(da, FR_DICT_ATTR_EXT_PROTOCOL_SPECIFIC);
 
+       /*
+        *      sequence_of=oid_and_value has to have a reference to the OID tree.
+        *
+        *      Group refs are added as unresolved refs, see dict_flag_ref(), and are resolved later
+        *      in dict_fixup_group_apply().
+        *
+        *      @todo - have a function called from dict_attr_finalize() ?
+        */
+#if 0
+       if (flags->is_pair) {
+               fr_dict_attr_t const *ref;
+
+               fr_assert(da->type == FR_TYPE_GROUP);
+
+               if (!fr_dict_attr_ref(da)) {
+                       (void) dict_attr_ref_set(da, attr_oid_tree, FR_DICT_ATTR_REF_ALIAS);
+               }
+       }
+#endif
+
        if (flags->is_choice && unlikely(!fr_type_is_tlv(da->type))) {
                fr_strerror_printf("Attribute %s of type %s is not allowed represent a collection of choices.",
                                   da->name, fr_type_to_str(da->type));