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

Support comments in ipMatchFromFile file via '#' token

Browse Source
This commit is contained in:
Martin Vierula 2022-12-01 11:19:26 -08:00
parent 07514f9779
commit af860e2eef
No known key found for this signature in database
GPG Key ID: F2FC4E45883BCBA4
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
v3.x.y - YYYY-MMM-DD (to be released) v3.x.y - YYYY-MMM-DD (to be released)
------------------------------------- -------------------------------------
- Support comments in ipMatchFromFile file via '#' token
[Issue #2554 - @tomsommer, @martinhsv]
- Fix: FILES_TMP_CONTENT collection key should use part name - Fix: FILES_TMP_CONTENT collection key should use part name
[Issue #2831 - @airween] [Issue #2831 - @airween]
- Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro - Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro

4
src/utils/ip_tree.cc
View File

@ -88,6 +88,10 @@ IpTree::~IpTree() {
bool IpTree::addFromBuffer(std::istream *ss, std::string *error) { bool IpTree::addFromBuffer(std::istream *ss, std::string *error) {
char *error_msg = NULL; char *error_msg = NULL;
for (std::string line; std::getline(*ss, line); ) { for (std::string line; std::getline(*ss, line); ) {
size_t comment_start = line.find('#');
if (comment_start != std::string::npos) {
line = line.substr(0, comment_start);
}
int res = add_ip_from_param(line.c_str(), &m_tree, &error_msg); int res = add_ip_from_param(line.c_str(), &m_tree, &error_msg);
if (res != 0) { if (res != 0) {
if (error_msg != NULL) { if (error_msg != NULL) {

1
test/test-cases/data/ipMatchFromFile.txt
View File

@ -1,4 +1,5 @@
127.0.0.1 127.0.0.1
# Comment line
10.10.10.1 10.10.10.1
::1 ::1
200.249.12.31 200.249.12.31