minor cleanups to remove xlat_func_bare_words

and add name to node which previously didn't have it.  That
changed the test output (for the better), so we update it, too

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index eaf678adf1492074b9dea0a98bec218a5ab45b79..d3493bff53f35d10ec60c5722408223df9f14b0a 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -2441,8 +2441,6 @@ static size_t command_max_buffer_size(command_result_t *result, command_file_ctx
        RETURN_OK(snprintf(data, COMMAND_OUTPUT_MAX, "%ld", size));
 }
 
-extern bool xlat_func_bare_words;
-
 /** Set or clear migration flags.
  *
  */
@@ -3858,14 +3856,6 @@ int main(int argc, char *argv[])
        default_log.fd = STDOUT_FILENO;
        default_log.print_level = false;
 
-       /*
-        *      Migration option - it's enabled by default in
-        *      src/lib/server/main_config.c, until we have time to
-        *      update all of the default configuration files and
-        *      tests.
-        */
-       xlat_func_bare_words = false;
-
        while ((c = getopt(argc, argv, "cd:D:F:fxMhpr:S:w:")) != -1) switch (c) {
                case 'c':
                        do_commands = true;

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index cbb588dc49058ad5bc5728ae97bde9bd0ac57154..bc03aed813ea0783779718d1c97257d265b4c2d1 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -250,25 +250,23 @@ static int xlat_validate_function_arg(xlat_arg_parser_t const *arg_p, xlat_exp_t
        }
 
        /*
-        *      @todo - if arg->group->flags.constant AND there is more than one child, then concat in place,
-        *      etc.
+        *      The argument is either ONE tmpl / value-box, OR is an
+        *      xlat group which contains a double-quoted string.
         */
+       fr_assert(fr_dlist_num_elements(&arg->group->dlist) == 1);
 
        /*
         *      Do at least somewhat of a pass of normalizing the nodes, even if there are more than one.
         */
-       xlat_exp_foreach(arg->group, child) {
-               if (child->type != XLAT_TMPL) continue;
-
-               if (xlat_tmpl_normalize(child) < 0) return -1;
+       if (node->type == XLAT_TMPL) {
+               return xlat_tmpl_normalize(node);
        }
 
        /*
-        *      @todo - These checks are relatively basic.  We should do better checks, such as if the
-        *      expected type is not string/octets, and the passed arguments are multiple things, then die?
-        *
-        *      If the node is pure, then we should arguably try to purify it now.
+        *      @todo - probably move the double-quoted string "node->flags.constant" check here, to more
+        *      clearly separate parsing from normalization.
         */
+
        if (node->type != XLAT_BOX) {
                return 0;
        }
@@ -1326,9 +1324,7 @@ fr_slen_t xlat_tokenize_word(TALLOC_CTX *ctx, xlat_exp_t **out, fr_sbuff_t *in,
        ssize_t         slen;
        fr_sbuff_t      our_in = FR_SBUFF(in);
        xlat_exp_t      *node;
-#ifdef HAVE_REGEX
-       fr_sbuff_marker_t m_exp;
-#endif
+       fr_sbuff_marker_t m;
 
        /*
         *      Triple-quoted strings have different terminal conditions.
@@ -1346,7 +1342,7 @@ fr_slen_t xlat_tokenize_word(TALLOC_CTX *ctx, xlat_exp_t **out, fr_sbuff_t *in,
 
        case T_BARE_WORD:
 #ifdef HAVE_REGEX
-               fr_sbuff_marker(&m_exp, &our_in);
+               fr_sbuff_marker(&m, &our_in);
 
                /*
                 *      Regular expression expansions are %{...}
@@ -1362,7 +1358,7 @@ fr_slen_t xlat_tokenize_word(TALLOC_CTX *ctx, xlat_exp_t **out, fr_sbuff_t *in,
 
                        if (ret == 1) goto done;
 
-                       fr_sbuff_set(&our_in, &m_exp);
+                       fr_sbuff_set(&our_in, &m);
                }
 #endif /* HAVE_REGEX */
 
@@ -1455,12 +1451,14 @@ fr_slen_t xlat_tokenize_word(TALLOC_CTX *ctx, xlat_exp_t **out, fr_sbuff_t *in,
                MEM(node = xlat_exp_alloc(ctx, XLAT_GROUP, NULL, 0));
                node->quote = quote;
 
+               fr_sbuff_marker(&m, &our_in);
                XLAT_DEBUG("ARGV double quotes <-- %.*s", (int) fr_sbuff_remaining(&our_in), fr_sbuff_current(&our_in));
 
                if (xlat_tokenize_input(node->group, &our_in, p_rules, t_rules) < 0) goto error;
 
                node->flags = node->group->flags;
                node->hoist = true;
+               xlat_exp_set_name(node, fr_sbuff_current(&m), fr_sbuff_behind(&m));
 
                /*
                 *      There's no expansion in the string.  Hoist the value-box.
@@ -1476,6 +1474,7 @@ fr_slen_t xlat_tokenize_word(TALLOC_CTX *ctx, xlat_exp_t **out, fr_sbuff_t *in,
                                xlat_exp_set_type(node, XLAT_BOX);
 
                                fr_value_box_init(&node->data, FR_TYPE_STRING, NULL, false);
+                               fr_value_box_strdup(node, &node->data, NULL, "", false);
 
                        } else {
                                fr_assert(fr_dlist_num_elements(&node->group->dlist) == 1);
@@ -1650,6 +1649,7 @@ fr_slen_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t
                node->quote = quote;
 
                if ((quote == T_BARE_WORD) && (spaces || xlat_func_bare_words)) {
+
                        /*
                         *      Spaces - each argument is a bare word all by itself, OR an xlat thing all by itself.
                         *
@@ -1677,20 +1677,7 @@ fr_slen_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t
 
                        slen = xlat_tokenize_word(node->group, &child, &our_in, quote, our_p_rules, &arg_t_rules);
                        if ((slen > 0) && child) {
-                               if (child->type != XLAT_GROUP) {
-                                       xlat_exp_insert_tail(node->group, child);
-                               } else {
-                                       xlat_exp_head_t *child_head = child->group;
-
-                                       /*
-                                        *      Hoist the child, so we don't have groups of groups.
-                                        *
-                                        *      @todo - this is perhaps wrong?
-                                        */
-                                       (void) talloc_steal(node, child_head);
-                                       talloc_free(node->group);
-                                       node->group = child_head;
-                               }
+                               xlat_exp_insert_tail(node->group, child);
                        }
                }
 
@@ -1724,6 +1711,8 @@ fr_slen_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t
                        goto error;
                }
 
+               if (!node->fmt) xlat_exp_set_name(node, fr_sbuff_current(&m), fr_sbuff_behind(&m));
+
                /*
                 *      Ensure that the function args are correct.
                 */
@@ -1732,8 +1721,6 @@ fr_slen_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t
                        goto error;
                }
 
-               if (!node->fmt) xlat_exp_set_name(node, fr_sbuff_current(&m), fr_sbuff_behind(&m));
-
                xlat_exp_insert_tail(head, node);
 
                /*

diff --git a/src/tests/unit/xlat/base.txt b/src/tests/unit/xlat/base.txt
index 682c834fe6a43bc20a68c0fd44c9470a3c29120d..746395a3744638505886ef944a91a5e5638073b0 100644 (file)
--- a/src/tests/unit/xlat/base.txt
+++ b/src/tests/unit/xlat/base.txt
@@ -213,23 +213,23 @@ xlat_argv /bin/sh %{User-Name}
 match [0]{ /bin/sh }, [1]{ %{User-Name} }
 
 xlat_argv /bin/sh "%{User-Name}"
-match [0]{ /bin/sh }, [1]{ %{User-Name} }
+match [0]{ /bin/sh }, [1]{ "%{User-Name}" }
 
 # with quotes
 xlat_argv /bin/sh "foo" "%{User-Name}"
-match [0]{ /bin/sh }, [1]{ "foo" }, [2]{ %{User-Name} }
+match [0]{ /bin/sh }, [1]{ "foo" }, [2]{ "%{User-Name}" }
 
 # many spaces between arguments
 xlat_argv /bin/sh         "foo"       "%{User-Name}"
-match [0]{ /bin/sh }, [1]{ "foo" }, [2]{ %{User-Name} }
+match [0]{ /bin/sh }, [1]{ "foo" }, [2]{ "%{User-Name}" }
 
 # and spaces in quotes
 xlat_argv /bin/sh "foo bar" "%{User-Name}"
-match [0]{ /bin/sh }, [1]{ "foo bar" }, [2]{ %{User-Name} }
+match [0]{ /bin/sh }, [1]{ "foo bar" }, [2]{ "%{User-Name}" }
 
 # and multiple xlats inside of quotes
 xlat_argv /bin/sh "foo bar" "%{User-Name} %{Filter-Id}"
-match [0]{ /bin/sh }, [1]{ "foo bar" }, [2]{ %{User-Name} %{Filter-Id} }
+match [0]{ /bin/sh }, [1]{ "foo bar" }, [2]{ "%{User-Name} %{Filter-Id}" }
 
 # and errors
 #