github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adds support for /32 in @ipMatch cidr notation.

Browse Source 
/32 is the representation of the ip itself. Not sure if it is needed,
but there is a complaint for that: #849
This commit is contained in:
Felipe Zimmerle
2018-10-15 09:58:19 -03:00
parent a5a40a71a9
commit 120108fd33
4 changed files with 105 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/msc_tree.cc
View File

@@ -846,16 +846,14 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
ptr = NULL;
return NULL;
}
if(ptr != NULL) {
if (ptr != NULL) {
free(ptr);
ptr = NULL;
}
if(netmask_v4 == 0) {
if (netmask_v4 == 0) {
return NULL;
}
else if (netmask_v4 != NETMASK_32 && pos < strlen(ip_strv4)) {
else if (pos < strlen(ip_strv4)) {
ip_strv4[pos] = '\0';
}
@@ -864,11 +862,9 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
if (ret <= 0) {
return NULL;
}
ip = addr4.s_addr;
tree->count++;
return CPTAddElement((unsigned char *)&ip, NETMASK_32, tree, netmask_v4);
case IPV6_TREE:
@@ -1067,6 +1063,9 @@ unsigned char is_netmask_v4(char *ip_strv4) {
}
cidr = atoi(mask_str);
if (cidr == 32) {
return 32;
}
if ((cidr < 0) || (cidr > 32)) {
return 0;
}