github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-20 19:16:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

config reload logic

Browse Source
This commit is contained in:
Mihai Pitu
2013-09-06 15:48:10 +03:00
committed by Felipe Zimmerle
parent 0619f6726e
commit 963346246a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/org_modsecurity_ModSecurity.c
View File

@@ -70,7 +70,7 @@ jobject modSecurityInstance;
directory_config *config;
//} JavaModSecurityContext;
jmethodID logMethod;
const char *configErr;
apr_table_t *requests;
apr_pool_t *requestsPool;
@@ -426,6 +426,7 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_initialize(JNIEnv *env,
modsecFinalizeConfig();
modsecInitProcess();
config = NULL;
configErr = NULL;
//table for requests
apr_pool_create(&requestsPool, NULL);
@@ -488,7 +489,6 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_onRequest(JNIEnv *env, j
{
conn_rec *c;
request_rec *r;
const char *err;
jmethodID getHttpRequest;
jclass httpTransactionClass;
jobject httpServletRequest;
@@ -523,17 +523,17 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_onRequest(JNIEnv *env, j
int status;
int len;
if (config == NULL || reloadConfig)
if (config == NULL || reloadConfig || configErr != NULL)
{
const char *path;
config = modsecGetDefaultConfig();
path = fromJString(env, configPath, config->mp); //path to modsecurity.conf
err = modsecProcessConfig(config, path, NULL);
configErr = modsecProcessConfig(config, path, NULL);
if(err != NULL)
if(configErr != NULL)
{
logSec(NULL, 0, (char*)err);
logSec(NULL, 0, (char*)configErr);
return DONE;
}
@@ -543,9 +543,8 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_onRequest(JNIEnv *env, j
modsecProcessConnection(c);
r = modsecNewRequest(c, config);
r->server->server_hostname = serverHostname;
r->handler = "Java";
r->server->server_hostname = serverHostname;
httpTransactionClass = (*env)->GetObjectClass(env, httpTransaction);
getHttpRequest = (*env)->GetMethodID(env, httpTransactionClass, HTTPTRANSACTION_MSHTTPREQUEST_MET, HTTPTRANSACTION_MSHTTPREQUEST_SIG);
@@ -802,4 +801,4 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_onResponse(JNIEnv *env,
modsecFinishRequest(r);
return status;
}
}