github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 21:36:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix resource load on ip match from file

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-02-22 21:23:20 -03:00
parent 6f718f9d40
commit e3b6b4ccff
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
v3.0.x - YYYY-MMM-DD (To be released)
-------------------------------------
- Fixed resource load on ip match from file
[#1674 - @zimmerle, @StefaanSeys]
- Fixed examples compilation while using disable-shared
[#1670 - @zimmerle, @ivanbaldo]
- Fixed compilation issue while xml is disabled

7
src/operators/ip_match_from_file.cc
View File

@ -14,6 +14,7 @@
*/
#include "src/operators/ip_match_from_file.h"
#include "src/utils/system.h"
#include <string.h>
@ -33,7 +34,11 @@ bool IpMatchFromFile::init(const std::string &file,
if (m_param.compare(0, 8, "https://") == 0) {
res = m_tree.addFromUrl(m_param, &e);
} else {
res = m_tree.addFromFile(m_param, &e);
std::string resf = utils::find_resource(m_param, file, error);\
if (resf == "") {
return false;
}
res = m_tree.addFromFile(resf, &e);
}
if (res == false) {

2
test/test-cases/regression/operator-ipMatchFromFile.json
View File

@ -80,7 +80,7 @@
]
},
"expected":{
"parser_error":"File: operator-ipMatchFromFile.json. Line: 2. Column: 19. Failed to open file: file-not-found.txt"
"parser_error":"Rules error. File: operator-ipMatchFromFile.json. Line: 2. Column: 19. Looking at: 'file-not-found.txt', 'file-not-found.txt', 'operator-ipMatchFromFile.json/file-not-found.txt', 'operator-ipMatchFromFile.json/file-not-found.txt'."
},
"rules":[
"SecRuleEngine On",