github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dont create new lua vms

Browse Source
This commit is contained in:
brenosilva
2011-11-09 12:24:27 +00:00
parent 3090edd850
commit f47fb8ebfc
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apache2/msc_lua.c
View File

@@ -108,9 +108,7 @@ char *lua_compile(msc_script **script, const char *filename, apr_pool_t *pool) {
(*script) = apr_pcalloc(pool, sizeof(msc_script)); (*script) = apr_pcalloc(pool, sizeof(msc_script));
(*script)->name = filename; (*script)->name = filename;
(*script)->parts = dump.parts; (*script)->parts = dump.parts;
(*script)->Lstate = L;
/* Destroy state. */
lua_close(L);
return NULL; return NULL;
} }
@@ -392,8 +390,8 @@ static const struct luaL_Reg mylib[] = {
*/ */
int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rule, char **error_msg) { int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rule, char **error_msg) {
apr_time_t time_before; apr_time_t time_before;
lua_State *L = NULL; lua_State *L = script->Lstate;
int rc; int rc, lvm;
if (error_msg == NULL) return -1; if (error_msg == NULL) return -1;
*error_msg = NULL; *error_msg = NULL;
@@ -404,10 +402,16 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
time_before = apr_time_now(); time_before = apr_time_now();
/* Create new state. */ if (L == NULL) {
L = lua_open(); /* Create new state. */
L = lua_open();
luaL_openlibs(L); luaL_openlibs(L);
lvm = 1;
if (L == NULL) {
*error_msg = apr_psprintf(msr->mp, "Lua: Failed to create Lua state");
return -1;
}
}
/* Associate msr with the state. */ /* Associate msr with the state. */
lua_pushlightuserdata(L, (void *)msr); lua_pushlightuserdata(L, (void *)msr);
@@ -450,9 +454,12 @@ int lua_execute(msc_script *script, char *param, modsec_rec *msr, msre_rule *rul
*error_msg = apr_pstrdup(msr->mp, *error_msg); *error_msg = apr_pstrdup(msr->mp, *error_msg);
} }
/* Destroy state. */
lua_pop(L, 1); lua_pop(L, 1);
lua_close(L);
/* Destroy state. */
if(lvm) {
lua_close(L);
}
/* Returns status code to caller. */ /* Returns status code to caller. */
if (msr->txcfg->debuglog_level >= 8) { if (msr->txcfg->debuglog_level >= 8) {

1
apache2/msc_lua.h
View File

@@ -31,6 +31,7 @@ typedef struct msc_script_part msc_script_part;
struct msc_script { struct msc_script {
const char *name; const char *name;
apr_array_header_t *parts; apr_array_header_t *parts;
lua_State *Lstate;
}; };
struct msc_script_part { struct msc_script_part {