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

Cleanup ipmatch function

Browse Source
This commit is contained in:
brenosilva 2011-03-02 18:56:33 +00:00
parent 74666fe2ca
commit 98e6a1c28c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache2/re_operators.c
View File

@ -168,7 +168,6 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
mask = strchr(str_ptr,'/'); mask = strchr(str_ptr,'/');
if(mask == NULL) { if(mask == NULL) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "IP %s",str_ptr);
if(ipv == 4) { if(ipv == 4) {
if (!inet_aton(str_ptr,&addr)) { if (!inet_aton(str_ptr,&addr)) {
@ -246,8 +245,6 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
network = 0; network = 0;
broadcast = 0; broadcast = 0;
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "MASK %d",maskbits);
if(ipv == 4) { if(ipv == 4) {
if(maskbits >= 1 && maskbits <= 30) { if(maskbits >= 1 && maskbits <= 30) {
ipmask = 0; ipmask = 0;
@ -328,7 +325,6 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
} }
if(rule->ip_op == NULL) { if(rule->ip_op == NULL) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "AQUI %lu",network+1);
rule->ip_op = apr_pcalloc(rule->ruleset->mp, sizeof(msre_ipmatch)); rule->ip_op = apr_pcalloc(rule->ruleset->mp, sizeof(msre_ipmatch));
if(rule->ip_op != NULL) { if(rule->ip_op != NULL) {
@ -357,7 +353,6 @@ static int msre_op_ipmatch_param_init(msre_rule *rule, char **error_msg) {
return 0; return 0;
} }
} else { } else {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "AQUI 2 %lu",network+1);
ipdata = apr_pcalloc(rule->ruleset->mp, sizeof(msre_ipmatch)); ipdata = apr_pcalloc(rule->ruleset->mp, sizeof(msre_ipmatch));
if(ipdata != NULL) { if(ipdata != NULL) {
@ -408,8 +403,8 @@ static int msre_op_ipmatch_execute(modsec_rec *msr, msre_rule *rule, msre_var *v
int i; int i;
msre_ipmatch *ipdata = rule->ip_op; msre_ipmatch *ipdata = rule->ip_op;
if(var == NULL || (strcmp(var->name,"REMOTE_ADDR") != 0 )) { if(var == NULL || (strcmp(var->name,"REMOTE_ADDR") != 0 ) || (strcmp(var->name,"SERVER_ADDR") != 0 )) {
msr_log(msr,9,"Operator ipmatch only works with REMOTE_ADDR variable"); msr_log(msr,9,"Operator ipmatch only works with REMOTE_ADDR and SERVER_ADDR variable");
return -1; return -1;
} }