Merge branch 'modsec_status' into iis_installer

Author: Felipe Zimmerle

apache2/Makefile.am

@@ -8,6 +8,7 @@ mod_security2_la_SOURCES = acmp.c \
     libinjection/libinjection_sqli.c \
     mod_security2.c \
     modsecurity.c \
+    msc_status_engine.c \
     msc_crypt.c \
     msc_geo.c \
     msc_gsb.c \

apache2/Makefile.win

@@ -12,7 +12,8 @@ LIBS = $(APACHE)\lib\libhttpd.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
-       Ws2_32.lib
+       Ws2_32.lib \
+       "iphlpapi.lib"
 
 ###########################################################################
 ###########################################################################
@@ -46,7 +47,8 @@ OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_logging.obj msc_xml.obj msc_multipart.obj modsecurity.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \
-       msc_release.obj libinjection\libinjection_sqli.obj
+       msc_release.obj libinjection\libinjection_sqli.obj \
+       msc_status_engine.obj
 
 all: $(DLL)
 

apache2/apache2_config.c

@@ -2062,6 +2062,23 @@ static const char *cmd_rule_engine(cmd_parms *cmd, void *_dcfg, const char *p1)
     return NULL;
 }
 
+static const char *cmd_status_engine(cmd_parms *cmd, void *_dcfg, const char *p1)
+{
+    if (strcasecmp(p1, "on") == 0) {
+        status_engine_state = STATUS_ENGINE_ENABLED;
+    }
+    else if (strcasecmp(p1, "off") == 0) {
+        status_engine_state = STATUS_ENGINE_DISABLED;
+    }
+    else {
+        return apr_psprintf(cmd->pool, "ModSecurity: Invalid value for " \
+                "SecStatusEngine: %s", p1);
+    }
+
+    return NULL;
+}
+
+
 static const char *cmd_rule_inheritance(cmd_parms *cmd, void *_dcfg, int flag)
 {
     directory_config *dcfg = (directory_config *)_dcfg;
@@ -3276,6 +3293,14 @@ const command_rec module_directives[] = {
         "On or Off"
     ),
 
+    AP_INIT_TAKE1 (
+        "SecStatusEngine",
+        cmd_status_engine,
+        NULL,
+        CMD_SCOPE_ANY,
+        "On or Off"
+    ),
+
     AP_INIT_TAKE1 (
         "SecXmlExternalEntity",
         cmd_xml_external_entity,

apache2/mod_security2.c

@@ -37,6 +37,7 @@
 #include "msc_lua.h"
 #endif
 
+#include "msc_status_engine.h"
 
 /* ModSecurity structure */
 
@@ -60,6 +61,8 @@ unsigned long int DSOLOCAL msc_pcre_match_limit = 0;
 
 unsigned long int DSOLOCAL msc_pcre_match_limit_recursion = 0;
 
+int DSOLOCAL status_engine_state = STATUS_ENGINE_DISABLED;
+
 unsigned long int DSOLOCAL conn_read_state_limit = 0;
 
 unsigned long int DSOLOCAL conn_write_state_limit = 0;
@@ -720,6 +723,17 @@ static int hook_post_config(apr_pool_t *mp, apr_pool_t *mp_log, apr_pool_t *mp_t
             ap_log_error(APLOG_MARK, APLOG_NOTICE | APLOG_NOERRNO, 0, s,
                     "Original server signature: %s", real_server_signature);
         }
+
+#ifndef WIN32
+        if (status_engine_state != STATUS_ENGINE_DISABLED) {
+            msc_status_engine_call();
+        }
+        else {
+            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+                    "Status engine is currently disabled, enable it by set " \
+                    "SecStatusEngine to On.");
+        }
+#endif
     }
 
     srand((unsigned int)(time(NULL) * getpid()));

apache2/modsecurity.h

@@ -142,6 +142,8 @@ extern DSOLOCAL unsigned long int msc_pcre_match_limit;
 
 extern DSOLOCAL unsigned long int msc_pcre_match_limit_recursion;
 
+extern DSOLOCAL int status_engine_state;
+
 extern DSOLOCAL unsigned long int conn_read_state_limit;
 
 extern DSOLOCAL unsigned long int conn_write_state_limit;
@@ -182,6 +184,9 @@ extern DSOLOCAL int *unicode_map_table;
 #define MODSEC_DETECTION_ONLY           1
 #define MODSEC_ENABLED                  2
 
+#define STATUS_ENGINE_ENABLED           1
+#define STATUS_ENGINE_DISABLED          0
+
 #define HASH_DISABLED             0
 #define HASH_ENABLED              1