github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-17 01:36:08 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/ModSecurityJNI.vcxproj
View File

@ -71,13 +71,13 @@
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\standalone;c:\Program Files (x86)\Java\jdk1.7.0_21\include\win32;c:\Program Files (x86)\Java\jdk1.7.0_21\include;C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\apache\libinjection\;c:\work\httpd-2.2.24\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\standalone;c:\Program Files (x86)\Java\jdk1.7.0_21\include\win32;c:\Program Files (x86)\Java\jdk1.7.0_21\include;C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;c:\work\httpd-2.2.24\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_STANDALONE</PreprocessorDefinitions> <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_STANDALONE</PreprocessorDefinitions>
<DisableSpecificWarnings>4244;4018</DisableSpecificWarnings> <DisableSpecificWarnings>4244;4018</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib;mod_security2.lib;libinjection_sqli.obj</AdditionalDependencies>
<AdditionalLibraryDirectories>c:\drop\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>c:\drop\x86</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>

15
java/org_modsecurity_ModSecurity.c
View File

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