Skip to content

Commit

Permalink
there's overlap between ::1 and ::Framed-User
Browse files Browse the repository at this point in the history
We'll have to think about that a bit more, but "::" is still
fairly reasonable
  • Loading branch information
alandekok committed Sep 3, 2023
1 parent 008e368 commit a04f0ee
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/lib/server/tmpl_tokenize.c
Original file line number Diff line number Diff line change
Expand Up @@ -2878,20 +2878,6 @@ fr_slen_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
if (fr_sbuff_is_char(&our_in, '&')) return tmpl_afrom_attr_substr(ctx, NULL, out, in,
p_rules, t_rules);

/*
* ::value
*
* Treated as enum name.
*
* @todo - move the enum parsing here, and then unresolved tmpls _always_ become xlat references.
* and when we fix that, change the enum name to include the ::
*/
if (fr_sbuff_is_str_literal(&our_in, "::")) {
(void) fr_sbuff_advance(&our_in, 2);
goto do_enum;
}


/*
* Allow bareword xlats if we
* find a '%' prefix.
Expand Down Expand Up @@ -2973,6 +2959,20 @@ fr_slen_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
if (slen > 0) goto done_bareword;
fr_assert(!*out);

/*
* ::value
*
* Treated as enum name. Note that this check MUST be done after the test for IPv6, as
* "::1" is an allowed IPv6 address.
*
* @todo - move the enum parsing here, and then unresolved tmpls _always_ become xlat references.
* and when we fix that, change the enum name to include the ::
*/
if (fr_sbuff_is_str_literal(&our_in, "::")) {
(void) fr_sbuff_advance(&our_in, 2);
goto do_enum;
}

/*
* See if it's a integer
*/
Expand Down

0 comments on commit a04f0ee

Please sign in to comment.