This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 0a09da4497 Make error if remap ACL has more than one @action (#11911)
(#11925)
0a09da4497 is described below
commit 0a09da449778b0fa6bec03ff2f7e4ebe1c7cbcbd
Author: Masaori Koshiba <[email protected]>
AuthorDate: Tue Jan 7 00:57:11 2025 +0900
Make error if remap ACL has more than one @action (#11911) (#11925)
For 10.0.x, making Warning instead of Error.
(cherry picked from commit a69662cfde90877ba9bb6049c7ec0f0730abf157)
---
src/proxy/http/remap/RemapConfig.cc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/proxy/http/remap/RemapConfig.cc
b/src/proxy/http/remap/RemapConfig.cc
index f26177f363..aa49a4b931 100644
--- a/src/proxy/http/remap/RemapConfig.cc
+++ b/src/proxy/http/remap/RemapConfig.cc
@@ -471,6 +471,7 @@ remap_validate_filter_args(acl_filter_rule **rule_pp, const
char **argv, int arg
Dbg(dbg_ctl_url_rewrite, "[validate_filter_args] new acl_filter_rule class
was created during remap rule processing");
}
+ bool action_flag = false;
bool ip_is_listed = false;
for (i = 0; i < argc; i++) {
unsigned long ul;
@@ -632,6 +633,13 @@ remap_validate_filter_args(acl_filter_rule **rule_pp,
const char **argv, int arg
}
if (ul & REMAP_OPTFLG_ACTION) { /* "action=" option */
+ if (action_flag) {
+ std::string_view err = "Only one @action= is allowed per remap ACL";
+ Dbg(dbg_ctl_url_rewrite, "%s", err.data());
+ // For 10.0.x, making Warning instead of Error for compatibility
+ Warning("%s", err.data());
+ }
+ action_flag = true;
if (behavior_policy == ACLBehaviorPolicy::ACL_BEHAVIOR_MODERN) {
// With the new matching policy, we don't allow the legacy "allow" and
// "deny" actions. Users must transition to either add_allow/add_deny
or
