Skip to content

Adjust reference to modsecurity::utils::string::VALID_HEX #3243

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

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Adjust reference to modsecurity::utils::string::VALID_HEX #3243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cc8ed
Adjust reference to modsecurity::utils::string::VALID_HEX
eduar-hte Aug 28, 2024
a4604b6
Added new tests to op @pm
airween Aug 28, 2024
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
1 change: 1 addition & 0 deletions src/operators/pm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "src/utils/acmp.h"
#include "src/utils/string.h"

using namespace modsecurity::utils::string;

static inline std::string parse_pm_content(const std::string &op_parm) {
auto offset = op_parm.find_first_not_of(" \t");
Expand Down
80 changes: 77 additions & 3 deletions test/test-cases/regression/operator-pm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pm operator test 1/4",
"title": "pm operator test 1/6",
"client": {
"ip": "200.249.12.31",
"port": 2313
Expand Down Expand Up @@ -77,7 +77,7 @@
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pm operater test 3/4",
"title": "pm operater test 3/6",
"client": {
"ip": "200.249.12.31",
"port": 2313
Expand Down Expand Up @@ -114,7 +114,7 @@
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pm operater test 4/4",
"title": "pm operater test 4/6",
"client": {
"ip": "200.249.12.31",
"port": 2313
Expand Down Expand Up @@ -146,5 +146,79 @@
"SecRuleEngine On",
"SecRule ARGS \"@pm a ` b\" \"phase:1,id:999,deny,status:500\""
]
},
{
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pm operater test 5/6",
"client": {
"ip": "200.249.12.31",
"port": 2313
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "net.tutsplus.com"
},
"uri": "\/test.pl?param1=123",
"method": "GET",
"http_version": 1.1,
"body": ""
},
"response": {
"headers": {
"Content-Type": "text\/xml; charset=utf-8\n\r",
"Content-Length": "length\n\r"
}
},
"expected": {
"debug_log": "Rule returned 1",
"http_code": 403
},
"rules": [
"SecRuleEngine On",
"SecRule ARGS \"@pm 1 2 3\" \"phase:1,id:999,deny\""
]
},
{
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pm operater test 6/6",
"client": {
"ip": "200.249.12.31",
"port": 2313
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "net.tutsplus.com"
},
"uri": "\/test.pl?param1=abc",
"method": "GET",
"http_version": 1.1,
"body": ""
},
"response": {
"headers": {
"Content-Type": "text\/xml; charset=utf-8\n\r",
"Content-Length": "length\n\r"
}
},
"expected": {
"debug_log": "Rule returned 0",
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule ARGS \"@pm 1 2 3\" \"phase:1,id:999,deny\""
]
}
]
Loading