Skip to content

fix: @pmFromFile with multiple files issue #3405

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.

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 1 commit into from
Jun 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 34 additions & 24 deletions src/operators/pm_from_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
#include "src/operators/operator.h"
#include "src/utils/https_client.h"
#include "src/utils/system.h"
#include "src/utils/string.h"

using namespace modsecurity::utils::string;

namespace modsecurity {
namespace operators {
Expand All @@ -44,39 +46,47 @@ bool PmFromFile::isComment(const std::string &s) {
}

bool PmFromFile::init(const std::string &config, std::string *error) {
std::istream *iss;

if (m_param.compare(0, 8, "https://") == 0) {
Utils::HttpsClient client;
bool ret = client.download(m_param);
if (ret == false) {
error->assign(client.error);
return false;
}
iss = new std::stringstream(client.content);
} else {
std::string err;
std::string resource = utils::find_resource(m_param, config, &err);
iss = new std::ifstream(resource, std::ios::in);
std::vector<std::string> tokens = split(m_param, ' ');

for (const auto& token : tokens) {
if (! token.empty()) {

std::istream *iss;

if (token.compare(0, 8, "https://") == 0) {
Utils::HttpsClient client;
bool ret = client.download(token);
if (ret == false) {
error->assign(client.error);
return false;
}
iss = new std::stringstream(client.content);
} else {
std::string err;
std::string resource = utils::find_resource(token, config, &err);
iss = new std::ifstream(resource, std::ios::in);

if (((std::ifstream *)iss)->is_open() == false) {
error->assign("Failed to open file: '" + token + "'. " + err);
delete iss;
return false;
}
}

for (std::string line; std::getline(*iss, line); ) {
if (isComment(line) == false) {
acmp_add_pattern(m_p, line.c_str(), NULL, NULL, line.length());
}
}

if (((std::ifstream *)iss)->is_open() == false) {
error->assign("Failed to open file: " + m_param + ". " + err);
delete iss;
return false;
}
}

for (std::string line; std::getline(*iss, line); ) {
if (isComment(line) == false) {
acmp_add_pattern(m_p, line.c_str(), NULL, NULL, line.length());
}
}

while (m_p->is_failtree_done == 0) {
acmp_prepare(m_p);
}

delete iss;
return true;
}

Expand Down
2 changes: 2 additions & 0 deletions test/test-cases/data/pattern-file1.data
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# comment
pattern1
2 changes: 2 additions & 0 deletions test/test-cases/data/pattern-file2.data
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# comment
pattern2
39 changes: 39 additions & 0 deletions test/test-cases/regression/operator-pmfromfile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
{
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "pmFromFile operator test",
"client": {
"ip": "10.20.30.40",
"port": 2313
},
"server": {
"ip": "1.2.3.4",
"port": 80
},
"request": {
"headers": {
"Host": "foobar.com"
},
"uri": "\/test.php?param1=pattern2",
"method": "GET",
"http_version": 1.1,
"body": ""
},
"response": {
"headers": {
"Content-Type": "text\/html; charset=utf-8\n\r",
"Content-Length": "10\n\r"
}
},
"expected": {
"debug_log": "Rule returned 1",
"http_code": 403
},
"rules": [
"SecRuleEngine On",
"SecRule ARGS \"@pmFromFile test-cases/data/pattern-file1.data test-cases/data/pattern-file2.data\" \"phase:1,id:999,deny\""
]
}
]
1 change: 1 addition & 0 deletions test/test-suite.in
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ TESTS+=test/test-cases/regression/operator-fuzzyhash.json
TESTS+=test/test-cases/regression/operator-inpectFile.json
TESTS+=test/test-cases/regression/operator-ipMatchFromFile.json
TESTS+=test/test-cases/regression/operator-pm.json
TESTS+=test/test-cases/regression/operator-pmfromfile.json
TESTS+=test/test-cases/regression/operator-rx.json
TESTS+=test/test-cases/regression/operator-rxGlobal.json
TESTS+=test/test-cases/regression/operator-UnconditionalMatch.json
Expand Down
Loading