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

Make clean and maintainer-clean removes unused files, also add # when rule chain doenst match

Browse Source
This commit is contained in:
brenosilva 2011-04-29 19:05:48 +00:00
parent d4d3497539
commit b19f32bb3e
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile.am
View File

@ -1,6 +1,34 @@
ACLOCAL_AMFLAGS = -I build ACLOCAL_AMFLAGS = -I build
SUBDIRS = @TOPLEVEL_SUBDIRS@ tests SUBDIRS = @TOPLEVEL_SUBDIRS@ tests
CLEANFILES =
MAINTAINERCLEANFILES =
CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
   tests/regression/server_root/logs/*.log
MAINTAINERCLEANFILES += $(CLEANFILES) \
Makefile.in \
aclocal.m4 \
alp2/Makefile.in \
apache2/Makefile.in \
build/config.guess \
build/config.sub \
build/depcomp \
build/libtool.m4 \
build/ltmain.sh \
build/ltoptions.m4 \
build/ltsugar.m4 \
build/ltversion.m4 \
build/lt~obsolete.m4 \
build/missing \
configure \
ext/Makefile.in \
mlogc/Makefile.in \
modsecurity_config_auto.h.in~ \
tests/Makefile.in \
tools/Makefile.in
# Alias for "check" # Alias for "check"
test: check test: check

8
apache2/msc_logging.c
View File

@ -1085,7 +1085,7 @@ void sec_audit_logger(modsec_rec *msr) {
for(i = 0; i < msr->matched_rules->nelts; i++) { for(i = 0; i < msr->matched_rules->nelts; i++) {
rule = ((msre_rule **)msr->matched_rules->elts)[i]; rule = ((msre_rule **)msr->matched_rules->elts)[i];
if ((rule != NULL) && (rule->actionset != NULL) && rule->actionset->is_chained && (rule->chain_starter == NULL)) { if ((rule != NULL) && (rule->actionset != NULL) && rule->actionset->is_chained && (rule->chain_starter == NULL)) {
text = apr_psprintf(msr->mp, "Chain Starter [Match]: %s\n", rule->unparsed); text = apr_psprintf(msr->mp, "%s\n", rule->unparsed);
sec_auditlog_write(msr, text, strlen(text)); sec_auditlog_write(msr, text, strlen(text));
do { do {
if (rule->ruleset != NULL) { if (rule->ruleset != NULL) {
@ -1097,9 +1097,9 @@ void sec_audit_logger(modsec_rec *msr) {
present = chained_is_matched(msr,next_rule); present = chained_is_matched(msr,next_rule);
if (present == 0) { if (present == 0) {
text = apr_psprintf(msr->mp, "Chain node [No Match]: %s\n",next_rule->unparsed); text = apr_psprintf(msr->mp, "#%s\n",next_rule->unparsed);
} else { } else {
text = apr_psprintf(msr->mp, "Chain node [Match]: %s\n",next_rule->unparsed); text = apr_psprintf(msr->mp, "%s\n",next_rule->unparsed);
i++; i++;
} }
@ -1112,7 +1112,7 @@ void sec_audit_logger(modsec_rec *msr) {
sec_auditlog_write(msr, text, strlen(text)); sec_auditlog_write(msr, text, strlen(text));
} else { } else {
if ((rule != NULL) && (rule->actionset != NULL) && !rule->actionset->is_chained && (rule->chain_starter == NULL)) { if ((rule != NULL) && (rule->actionset != NULL) && !rule->actionset->is_chained && (rule->chain_starter == NULL)) {
text = apr_psprintf(msr->mp, "Rule [Match]: %s\n\n", rule->unparsed); text = apr_psprintf(msr->mp, "%s\n\n", rule->unparsed);
sec_auditlog_write(msr, text, strlen(text)); sec_auditlog_write(msr, text, strlen(text));
} }
} }