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

Code cosmetics: Place copy_rules in nice shape.

Browse Source 
Continuation of kukackajiri's work to provide fixes for errors pointed by
Parfait. The function copy_rules had an integer as return code but it was not
filed proper neither checked by its callers. This commit just adds sanity
checks and documentation for the copy_rules function. Marking were placed
on the copy_rules callers, but the return code is not handled yet.
For kukackajiri's work, see merge request: #612
This commit is contained in:
Felipe Zimmerle 2014-02-28 18:55:04 -08:00
parent 62a6f228f8
commit 31d7fc6d38
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apache2/apache2_config.c
View File

@ -256,13 +256,31 @@ static void copy_rules_phase(apr_pool_t *mp,
} }
/** /**
* Copies rules between two configuration contexts, * @brief Copies rules between one phase of two configuration contexts.
*
* Copies rules between one phase of two configuration contexts,
* taking exceptions into account. * taking exceptions into account.
*
* @param mp apr pool structure
* @param parent_ruleset Parent's msre_ruleset
* @param child_ruleset Child's msre_ruleset
* @param exceptions_arr Exceptions' apr_array_header_t
* @retval 0 Everything went well.
* @retval -1 Something went wrong.
*
*/ */
static int copy_rules(apr_pool_t *mp, msre_ruleset *parent_ruleset, static int copy_rules(apr_pool_t *mp, msre_ruleset *parent_ruleset,
msre_ruleset *child_ruleset, msre_ruleset *child_ruleset,
apr_array_header_t *exceptions_arr) apr_array_header_t *exceptions_arr)
{ {
int ret = 0;
if (parent_ruleset == NULL || child_ruleset == NULL ||
exceptions_arr == NULL) {
ret = -1;
goto failed;
}
copy_rules_phase(mp, parent_ruleset->phase_request_headers, copy_rules_phase(mp, parent_ruleset->phase_request_headers,
child_ruleset->phase_request_headers, exceptions_arr); child_ruleset->phase_request_headers, exceptions_arr);
copy_rules_phase(mp, parent_ruleset->phase_request_body, copy_rules_phase(mp, parent_ruleset->phase_request_body,
@ -274,7 +292,8 @@ static int copy_rules(apr_pool_t *mp, msre_ruleset *parent_ruleset,
copy_rules_phase(mp, parent_ruleset->phase_logging, copy_rules_phase(mp, parent_ruleset->phase_logging,
child_ruleset->phase_logging, exceptions_arr); child_ruleset->phase_logging, exceptions_arr);
return 1; failed:
return ret;
} }
/** /**
@ -393,6 +412,7 @@ void *merge_directory_configs(apr_pool_t *mp, void *_parent, void *_child)
/* Copy the rules from the parent context. */ /* Copy the rules from the parent context. */
merged->ruleset = msre_ruleset_create(parent->ruleset->engine, mp); merged->ruleset = msre_ruleset_create(parent->ruleset->engine, mp);
/* TODO: copy_rules return code should be taken into consideration. */
copy_rules(mp, parent->ruleset, merged->ruleset, child->rule_exceptions); copy_rules(mp, parent->ruleset, merged->ruleset, child->rule_exceptions);
} else } else
if (parent->ruleset == NULL) { if (parent->ruleset == NULL) {
@ -419,6 +439,7 @@ void *merge_directory_configs(apr_pool_t *mp, void *_parent, void *_child)
/* Copy parent rules, then add child rules to it. */ /* Copy parent rules, then add child rules to it. */
merged->ruleset = msre_ruleset_create(parent->ruleset->engine, mp); merged->ruleset = msre_ruleset_create(parent->ruleset->engine, mp);
/* TODO: copy_rules return code should be taken into consideration. */
copy_rules(mp, parent->ruleset, merged->ruleset, child->rule_exceptions); copy_rules(mp, parent->ruleset, merged->ruleset, child->rule_exceptions);
apr_array_cat(merged->ruleset->phase_request_headers, apr_array_cat(merged->ruleset->phase_request_headers,