Make module instance allowed chars available

diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 3fd90e5db68f0a8cac3ea2750bab60d1ee061db8..85e61698b857f06d95cc6e5eb6dbdd3b315459a2 100644 (file)
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -209,6 +209,27 @@ static int cmd_set_module_status(UNUSED FILE *fp, FILE *fp_err, void *ctx, fr_cm
        return 0;
 }
 
+/** Chars that are allowed in a module instance name
+ *
+ */
+bool const module_instance_allowed_chars[UINT8_MAX + 1] = {
+       ['-'] = true, ['/'] = true, ['_'] = true,
+       ['0'] = true, ['1'] = true, ['2'] = true, ['3'] = true, ['4'] = true,
+       ['5'] = true, ['6'] = true, ['7'] = true, ['8'] = true, ['9'] = true,
+       ['A'] = true, ['B'] = true, ['C'] = true, ['D'] = true, ['E'] = true,
+       ['F'] = true, ['G'] = true, ['H'] = true, ['I'] = true, ['J'] = true,
+       ['K'] = true, ['L'] = true, ['M'] = true, ['N'] = true, ['O'] = true,
+       ['P'] = true, ['Q'] = true, ['R'] = true, ['S'] = true, ['T'] = true,
+       ['U'] = true, ['V'] = true, ['W'] = true, ['X'] = true, ['Y'] = true,
+       ['Z'] = true,
+       ['a'] = true, ['b'] = true, ['c'] = true, ['d'] = true, ['e'] = true,
+       ['f'] = true, ['g'] = true, ['h'] = true, ['i'] = true, ['j'] = true,
+       ['k'] = true, ['l'] = true, ['m'] = true, ['n'] = true, ['o'] = true,
+       ['p'] = true, ['q'] = true, ['r'] = true, ['s'] = true, ['t'] = true,
+       ['u'] = true, ['v'] = true, ['w'] = true, ['x'] = true, ['y'] = true,
+       ['z'] = true
+};
+
 /** dl module tracking
  *
  * This is used by all module lists, irrespecitve of their type, and is thread safe.
@@ -1358,7 +1379,7 @@ static fr_slen_t module_instance_name(TALLOC_CTX *ctx, char **out,
 {
        fr_sbuff_t *agg;
 
-       FR_SBUFF_TALLOC_THREAD_LOCAL(&agg, 64, 256);
+       FR_SBUFF_TALLOC_THREAD_LOCAL(&agg, 64, MODULE_INSTANCE_LEN_MAX);
 
        /*
         *      Parent has all of the qualifiers of its ancestors
@@ -1565,24 +1586,6 @@ void module_instance_data_alloc(module_data_pool_t *pool_out, void **out,
  */
 fr_slen_t module_instance_name_valid(char const *inst_name)
 {
-       static bool const inst_allowed_chars[UINT8_MAX + 1] = {
-               ['-'] = true, ['/'] = true, ['_'] = true,
-               ['0'] = true, ['1'] = true, ['2'] = true, ['3'] = true, ['4'] = true,
-               ['5'] = true, ['6'] = true, ['7'] = true, ['8'] = true, ['9'] = true,
-               ['A'] = true, ['B'] = true, ['C'] = true, ['D'] = true, ['E'] = true,
-               ['F'] = true, ['G'] = true, ['H'] = true, ['I'] = true, ['J'] = true,
-               ['K'] = true, ['L'] = true, ['M'] = true, ['N'] = true, ['O'] = true,
-               ['P'] = true, ['Q'] = true, ['R'] = true, ['S'] = true, ['T'] = true,
-               ['U'] = true, ['V'] = true, ['W'] = true, ['X'] = true, ['Y'] = true,
-               ['Z'] = true,
-               ['a'] = true, ['b'] = true, ['c'] = true, ['d'] = true, ['e'] = true,
-               ['f'] = true, ['g'] = true, ['h'] = true, ['i'] = true, ['j'] = true,
-               ['k'] = true, ['l'] = true, ['m'] = true, ['n'] = true, ['o'] = true,
-               ['p'] = true, ['q'] = true, ['r'] = true, ['s'] = true, ['t'] = true,
-               ['u'] = true, ['v'] = true, ['w'] = true, ['x'] = true, ['y'] = true,
-               ['z'] = true
-       };
-
        /*
         *      [] are used for dynamic module selection.
         *      . is used as a method and submodule separator.
@@ -1593,7 +1596,7 @@ fr_slen_t module_instance_name_valid(char const *inst_name)
                size_t len = strlen(inst_name);
 
                for (size_t i = 0; i < len; i++) {
-                       if (!inst_allowed_chars[(uint8_t)inst_name[i]]) {
+                       if (!module_instance_allowed_chars[(uint8_t)inst_name[i]]) {
                                fr_strerror_printf("Instance name \"%s\" contains an invalid character.  "
                                                   "Valid characters are [0-9a-zA-Z/_-]", inst_name);
                                return -(i + 1);

diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index 4b38912e6a6ba67425f69af0eacc79774b0dc808..880de8b5a98dff693f78108900ff608121ab0333 100644 (file)
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -137,6 +137,10 @@ typedef int (*module_thread_detach_t)(module_thread_inst_ctx_t const *mctx);
 extern "C" {
 #endif
 
+/** The maximum size of a module instance
+ */
+#define MODULE_INSTANCE_LEN_MAX 256
+
 /** Named methods exported by a module
  *
  */
@@ -464,6 +468,8 @@ int                 module_bootstrap(module_instance_t *mi) CC_HINT(nonnull) CC_HINT(warn_unus
 
 int                    modules_bootstrap(module_list_t const *ml) CC_HINT(nonnull) CC_HINT(warn_unused_result);
 
+extern bool const module_instance_allowed_chars[UINT8_MAX + 1];
+
 fr_slen_t              module_instance_name_valid(char const *inst_name) CC_HINT(nonnull);
 
 module_instance_t      *module_instance_copy(module_list_t *dst, module_instance_t const *src, char const *inst_name)