Skip to content

Commit c97db2f

Browse files
author
Felipe Zimmerle
committed
Adds verbose message when a resource is not found.
Fix #1309
1 parent 77a658c commit c97db2f

File tree

10 files changed

+652
-577
lines changed

10 files changed

+652
-577
lines changed

src/operators/pm_from_file.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ bool PmFromFile::init(const std::string &config, std::string *error) {
3838
}
3939
iss = new std::stringstream(client.content);
4040
} else {
41-
std::string resource = utils::find_resource(m_param, config);
41+
std::string err;
42+
std::string resource = utils::find_resource(m_param, config, &err);
4243
iss = new std::ifstream(resource, std::ios::in);
4344

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

src/operators/validate_dtd.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ namespace operators {
2626

2727

2828
bool ValidateDTD::init(const std::string &file, std::string *error) {
29-
m_resource = utils::find_resource(m_param, file);
29+
std::string err;
30+
m_resource = utils::find_resource(m_param, file, &err);
3031
if (m_resource == "") {
31-
error->assign("XML: File not found: " + m_param + ".");
32+
error->assign("XML: File not found: " + m_param + ". " + err);
3233
return false;
3334
}
3435

src/operators/validate_schema.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ namespace modsecurity {
2626
namespace operators {
2727

2828
bool ValidateSchema::init(const std::string &file, std::string *error) {
29-
m_resource = utils::find_resource(m_param, file);
29+
std::string err;
30+
m_resource = utils::find_resource(m_param, file, &err);
3031
if (m_resource == "") {
31-
error->assign("XML: File not found: " + m_param + ".");
32+
error->assign("XML: File not found: " + m_param + ". " + err);
3233
return false;
3334
}
3435

0 commit comments

Comments
 (0)