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

ModSecurity: improving duplicate ID search

Browse Source
This commit is contained in:
Breno Silva 2013-01-31 10:22:37 -04:00
parent 8816254cc8
commit 9725e71f06
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apache2/apache2_config.c
View File

@ -128,6 +128,8 @@ void *create_directory_config(apr_pool_t *mp, char *path)
dcfg->cache_trans_max = NOT_SET; dcfg->cache_trans_max = NOT_SET;
dcfg->cache_trans_maxitems = NOT_SET; dcfg->cache_trans_maxitems = NOT_SET;
/* Rule ids */
dcfg->rule_id_htab = apr_hash_make(mp);
dcfg->component_signatures = apr_array_make(mp, 16, sizeof(char *)); dcfg->component_signatures = apr_array_make(mp, 16, sizeof(char *));
dcfg->request_encoding = NOT_SET_P; dcfg->request_encoding = NOT_SET_P;
@ -718,7 +720,9 @@ static const char *add_rule(cmd_parms *cmd, directory_config *dcfg, int type,
const char *p1, const char *p2, const char *p3) const char *p1, const char *p2, const char *p3)
{ {
char *my_error_msg = NULL; char *my_error_msg = NULL;
msre_rule *rule = NULL, *tmp_rule = NULL; //msre_rule *rule = NULL, *tmp_rule = NULL;
char *rid = NULL;
msre_rule *rule = NULL;
extern msc_engine *modsecurity; extern msc_engine *modsecurity;
int offset = 0; int offset = 0;
@ -771,9 +775,16 @@ static const char *add_rule(cmd_parms *cmd, directory_config *dcfg, int type,
if(type != RULE_TYPE_LUA) if(type != RULE_TYPE_LUA)
#endif #endif
{ {
tmp_rule = msre_ruleset_fetch_rule(dcfg->ruleset, rule->actionset->id, offset); rid = apr_hash_get(dcfg->rule_id_htab, rule->actionset->id, APR_HASH_KEY_STRING);
if(tmp_rule != NULL) if(rid != NULL) {
return "ModSecurity: Found another rule with the same id"; return "ModSecurity: Found another rule with the same id";
} else {
apr_hash_set(dcfg->rule_id_htab, apr_pstrdup(dcfg->mp, rule->actionset->id), APR_HASH_KEY_STRING, apr_pstrdup(dcfg->mp, "1"));
}
//tmp_rule = msre_ruleset_fetch_rule(dcfg->ruleset, rule->actionset->id, offset);
//if(tmp_rule != NULL)
// return "ModSecurity: Found another rule with the same id";
} }
} }

3
apache2/modsecurity.h
View File

@ -572,6 +572,9 @@ struct directory_config {
/* Collection timeout */ /* Collection timeout */
int col_timeout; int col_timeout;
/* hash of ids */
apr_hash_t *rule_id_htab;
/* Hash */ /* Hash */
apr_array_header_t *hash_method; apr_array_header_t *hash_method;
const char *crypto_key; const char *crypto_key;