mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-29 11:16:33 +03:00
Merge latest 2.5.x changes to trunk.
This commit is contained in:
@@ -26,17 +26,34 @@
|
||||
#include "msc_xml.h"
|
||||
|
||||
/**
|
||||
* Log an alert message to the log, adding the rule metadata at the end.
|
||||
* Format an alert message.
|
||||
*/
|
||||
void msc_alert(modsec_rec *msr, int level, msre_actionset *actionset, const char *action_message,
|
||||
const char * msc_alert_message(modsec_rec *msr, msre_actionset *actionset, const char *action_message,
|
||||
const char *rule_message)
|
||||
{
|
||||
const char *message = NULL;
|
||||
|
||||
if (rule_message == NULL) rule_message = "Unknown error.";
|
||||
|
||||
message = apr_psprintf(msr->mp, "%s %s%s", action_message,
|
||||
rule_message, msre_format_metadata(msr, actionset));
|
||||
if (action_message == NULL) {
|
||||
message = apr_psprintf(msr->mp, "%s%s",
|
||||
rule_message, msre_format_metadata(msr, actionset));
|
||||
}
|
||||
else {
|
||||
message = apr_psprintf(msr->mp, "%s %s%s", action_message,
|
||||
rule_message, msre_format_metadata(msr, actionset));
|
||||
}
|
||||
|
||||
return message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Log an alert message to the log, adding the rule metadata at the end.
|
||||
*/
|
||||
void msc_alert(modsec_rec *msr, int level, msre_actionset *actionset, const char *action_message,
|
||||
const char *rule_message)
|
||||
{
|
||||
const char *message = msc_alert_message(msr, actionset, action_message, rule_message);
|
||||
|
||||
msr_log(msr, level, "%s", message);
|
||||
}
|
||||
|
Reference in New Issue
Block a user