Skip to content

Fix lexer rejection of '@' in ctl:ruleRemoveTarget actions (#3565) #3566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jitterx69 wants to merge 5 commits into
base: v3/master
Choose a base branch
from
Open

Fix lexer rejection of '@' in ctl:ruleRemoveTarget actions (#3565) #3566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28f6c07
Fix lexer rejection of '@' in ctl:ruleRemoveTarget actions (#3565)
Jitterx69 May 14, 2026
20cfd71
Add regression tests for ctl:ruleRemoveTarget with '@' (#3565)
Jitterx69 May 14, 2026
93cd1a2
Regenerate seclang-scanner.cc with updated regex
Jitterx69 May 14, 2026
b463b1a
Add more comprehensive tests for special characters in rule targets
Jitterx69 May 15, 2026
497df63
fix: improve ctl action parsing by replacing static offsets with dyna…
Jitterx69 May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/actions/ctl/rule_remove_by_id.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ namespace ctl {


bool RuleRemoveById::init(std::string *error) {
std::string what(m_parser_payload, 15, m_parser_payload.size() - 15);
size_t pos = m_parser_payload.find("=");
if (pos == std::string::npos) {
error->assign(m_parser_payload + " is not a valid ID or range");
return false;
}
std::string what = m_parser_payload.substr(pos + 1);
bool added = false;
std::vector<std::string> toRemove = utils::string::ssplit(what, ' ');
for (const std::string &a : toRemove) {
Expand Down
7 changes: 6 additions & 1 deletion src/actions/ctl/rule_remove_by_tag.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ namespace ctl {


bool RuleRemoveByTag::init(std::string *error) {
std::string what(m_parser_payload, 16, m_parser_payload.size() - 16);
size_t pos = m_parser_payload.find("=");
if (pos == std::string::npos) {
error->assign(m_parser_payload + " is not a valid tag");
return false;
}
std::string what = m_parser_payload.substr(pos + 1);
m_tag = what;

return true;
Expand Down
7 changes: 6 additions & 1 deletion src/actions/ctl/rule_remove_target_by_id.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ namespace ctl {


bool RuleRemoveTargetById::init(std::string *error) {
std::string what(m_parser_payload, 21, m_parser_payload.size() - 21);
size_t pos = m_parser_payload.find("=");
if (pos == std::string::npos) {
error->assign(m_parser_payload + " is not a valid `ID;VARIABLE'");
return false;
}
std::string what = m_parser_payload.substr(pos + 1);
std::vector<std::string> param = utils::string::split(what, ';');

if (param.size() < 2) {
Expand Down
7 changes: 6 additions & 1 deletion src/actions/ctl/rule_remove_target_by_tag.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ namespace ctl {


bool RuleRemoveTargetByTag::init(std::string *error) {
std::string what(m_parser_payload, 22, m_parser_payload.size() - 22);
size_t pos = m_parser_payload.find("=");
if (pos == std::string::npos) {
error->assign(m_parser_payload + " is not a valid `TAG;VARIABLE'");
return false;
}
std::string what = m_parser_payload.substr(pos + 1);
std::vector<std::string> param = utils::string::split(what, ';');

if (param.size() < 2) {
Expand Down
6,344 changes: 3,167 additions & 3,177 deletions src/parser/seclang-scanner.cc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/parser/seclang-scanner.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ FREE_TEXT_COMMA_QUOTE [^,\"\\n\\r]+
NEW_LINE_FREE_TEXT [^, \t\"\n\r]+
NOT !
FREE_TEXT ([^\"]|([^\\]\\\"))+
REMOVE_RULE_BY [0-9A-Za-z_\/\.\-\*\:\;\]\[\$]+
REMOVE_RULE_BY [a-zA-Z0-9_\-\.\*\/\:\;\$@\=\(\)\[\]\']+

VAR_FREE_TEXT_QUOTE ([^\']|([^\\]\\\'))+
VAR_FREE_TEXT_SPACE [^ \t\"]+
Expand Down
128 changes: 127 additions & 1 deletion test/test-cases/regression/action-ctl_rule_remove_target_by_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,5 +219,131 @@
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:1,phase:1,pass,t:none,ctl:ruleRemoveTargetById=2;REQUEST_HEADERS:referer\"",
"SecRule REQUEST_HEADERS:Referer \"@contains attack\" \"id:2,phase:1,deny,t:none,log\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetById with @ character (Issue 3565)",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*",
"Content-Type": "application/x-www-form-urlencoded"
},
"uri": "/index.html?@foo=attack",
"method": "GET",
"body": [
""
]
},
"response": {
"headers": {},
"body": [
""
]
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@endsWith /index.html\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetById=1;ARGS:@foo\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,t:none,status:403,block,deny\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetById with = character",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo=bar=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetById=1;ARGS:foo=bar\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetById with ( and ) characters",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo(bar)=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetById=1;ARGS:foo(bar)\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetById with ' character",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo'bar=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetById=1;ARGS:foo'bar\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny\""
]
}
]
]
128 changes: 127 additions & 1 deletion test/test-cases/regression/action-ctl_rule_remove_target_by_tag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,131 @@
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS\"",
"SecRule ARGS_NAMES \"@contains whee\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetByTag with @ character (Issue 3565)",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*",
"Content-Type": "application/x-www-form-urlencoded"
},
"uri": "/index.html?@foo=attack",
"method": "GET",
"body": [
""
]
},
"response": {
"headers": {},
"body": [
""
]
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@endsWith /index.html\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS:@foo\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,t:none,status:403,block,deny,tag:'CRS'\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetByTag with = character",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo=bar=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS:foo=bar\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny,tag:'CRS'\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetByTag with ( and ) characters",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo(bar)=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS:foo(bar)\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny,tag:'CRS'\""
]
},
{
"enabled": 1,
"version_min": 300000,
"title": "Testing CtlRuleRemoveTargetByTag with ' character",
"client": {
"ip": "200.249.12.31",
"port": 123
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "localhost",
"Accept": "*/*"
},
"uri": "/index.html?foo'bar=attack",
"method": "GET"
},
"expected": {
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_FILENAME \"@unconditionalMatch\" \"id:9002100,phase:2,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS:foo'bar\"",
"SecRule ARGS \"@contains attack\" \"id:1,phase:3,status:403,block,deny,tag:'CRS'\""
]
}
]
]