X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=modules%2Flua%2Flua_request.c;h=5d7d8f537e35ce3dcba5234befa02d133a1b4a06;hb=394e5594d60f65a687e2bad9a848af8fed70a55e;hp=e2b91d43cdb62d2f918c88ee6d919871bd9fe89d;hpb=a36f6f704834b5987f2aefc14fd2f05b2e2564f1;p=apache diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index e2b91d43cd..5d7d8f537e 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -19,15 +19,19 @@ #include "util_script.h" #include "lua_apr.h" +APLOG_USE_MODULE(lua); + typedef char *(*req_field_string_f) (request_rec * r); typedef int (*req_field_int_f) (request_rec * r); +typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r); -void apl_rstack_dump(lua_State *L, request_rec *r, const char *msg) +void ap_lua_rstack_dump(lua_State *L, request_rec *r, const char *msg) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Lua Stack Dump: [%s]", msg); - int i; int top = lua_gettop(L); + + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Lua Stack Dump: [%s]", msg); + for (i = 1; i <= top; i++) { int t = lua_type(L, i); switch (t) { @@ -90,7 +94,7 @@ void apl_rstack_dump(lua_State *L, request_rec *r, const char *msg) * userdata thingamajig and return it if it is. if it is not * lua will enter its error handling routine. */ -static request_rec *apl_check_request_rec(lua_State *L, int index) +static request_rec *ap_lua_check_request_rec(lua_State *L, int index) { request_rec *r; luaL_checkudata(L, index, "Apache2.Request"); @@ -152,7 +156,7 @@ static int req_aprtable2luatable_cb(void *l, const char *key, static int req_parseargs(lua_State *L) { apr_table_t *form_table; - request_rec *r = apl_check_request_rec(L, 1); + request_rec *r = ap_lua_check_request_rec(L, 1); lua_newtable(L); lua_newtable(L); /* [table, table] */ ap_args_to_table(r, &form_table); @@ -163,7 +167,7 @@ static int req_parseargs(lua_State *L) /* wrap ap_rputs as r:puts(String) */ static int req_puts(lua_State *L) { - request_rec *r = apl_check_request_rec(L, 1); + request_rec *r = ap_lua_check_request_rec(L, 1); int argc = lua_gettop(L); int i; @@ -177,7 +181,7 @@ static int req_puts(lua_State *L) /* wrap ap_rwrite as r:write(String) */ static int req_write(lua_State *L) { - request_rec *r = apl_check_request_rec(L, 1); + request_rec *r = ap_lua_check_request_rec(L, 1); size_t n; const char *buf = luaL_checklstring(L, 2, &n); @@ -185,23 +189,10 @@ static int req_write(lua_State *L) return 0; } -/* r:parsebody() */ -static int req_parsebody(lua_State *L) -{ - request_rec *r = apl_check_request_rec(L, 1); - lua_newtable(L); - lua_newtable(L); - apr_table_t *form_table; - if (ap_body_to_table(r, &form_table) == APR_SUCCESS) { - apr_table_do(req_aprtable2luatable_cb, L, form_table, NULL); - } - return 2; -} - /* r:addoutputfilter(name|function) */ static int req_add_output_filter(lua_State *L) { - request_rec *r = apl_check_request_rec(L, 1); + request_rec *r = ap_lua_check_request_rec(L, 1); const char *name = luaL_checkstring(L, 2); ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "adding output filter %s", name); @@ -209,16 +200,41 @@ static int req_add_output_filter(lua_State *L) return 0; } -static int req_document_root(lua_State *L) +/* wrap ap_construct_url as r:construct_url(String) */ +static int req_construct_url(lua_State *L) { - request_rec *r = apl_check_request_rec(L, 1); - char *doc_root = apr_pstrdup(r->pool, ap_document_root(r)); - lua_pushstring(L, doc_root); + request_rec *r = ap_lua_check_request_rec(L, 1); + const char *name = luaL_checkstring(L, 2); + lua_pushstring(L, ap_construct_url(r->pool, name, r)); return 1; } +/* wrap ap_escape_html r:escape_html(String) */ +static int req_escape_html(lua_State *L) +{ + request_rec *r = ap_lua_check_request_rec(L, 1); + const char *s = luaL_checkstring(L, 2); + lua_pushstring(L, ap_escape_html(r->pool, s)); + return 1; +} +/* wrap optional ssl_var_lookup as r:ssl_var_lookup(String) */ +static int req_ssl_var_lookup(lua_State *L) +{ + request_rec *r = ap_lua_check_request_rec(L, 1); + const char *s = luaL_checkstring(L, 2); + const char *res = ap_lua_ssl_val(r->pool, r->server, r->connection, r, + (char *)s); + lua_pushstring(L, res); + return 1; +} /* BEGIN dispatch mathods for request_rec fields */ +/* not really a field, but we treat it like one */ +static const char *req_document_root(request_rec *r) +{ + return ap_document_root(r); +} + static char *req_uri_field(request_rec *r) { return r->uri; @@ -228,7 +244,20 @@ static const char *req_method_field(request_rec *r) { return r->method; } - +static const char *req_handler_field(request_rec *r) +{ + return r->handler; +} +static const char *req_proxyreq_field(request_rec *r) +{ + switch (r->proxyreq) { + case PROXYREQ_NONE: return "PROXYREQ_NONE"; + case PROXYREQ_PROXY: return "PROXYREQ_PROXY"; + case PROXYREQ_REVERSE: return "PROXYREQ_REVERSE"; + case PROXYREQ_RESPONSE: return "PROXYREQ_RESPONSE"; + default: return NULL; + } +} static const char *req_hostname_field(request_rec *r) { return r->hostname; @@ -304,57 +333,96 @@ static int req_assbackwards_field(request_rec *r) return r->assbackwards; } +static apr_table_t* req_headers_in(request_rec *r) +{ + return r->headers_in; +} + +static apr_table_t* req_headers_out(request_rec *r) +{ + return r->headers_out; +} + +static apr_table_t* req_err_headers_out(request_rec *r) +{ + return r->err_headers_out; +} + +static apr_table_t* req_subprocess_env(request_rec *r) +{ + return r->subprocess_env; +} + +static apr_table_t* req_notes(request_rec *r) +{ + return r->notes; +} + +static int req_ssl_is_https_field(request_rec *r) +{ + return ap_lua_ssl_is_https(r->connection); +} + /* END dispatch mathods for request_rec fields */ static int req_dispatch(lua_State *L) { - request_rec *r = apl_check_request_rec(L, 1); + apr_hash_t *dispatch; + req_fun_t *rft; + request_rec *r = ap_lua_check_request_rec(L, 1); const char *name = luaL_checkstring(L, 2); lua_pop(L, 2); lua_getfield(L, LUA_REGISTRYINDEX, "Apache2.Request.dispatch"); - apr_hash_t *dispatch = lua_touserdata(L, 1); + dispatch = lua_touserdata(L, 1); lua_pop(L, 1); - req_fun_t *rft = apr_hash_get(dispatch, name, APR_HASH_KEY_STRING); + rft = apr_hash_get(dispatch, name, APR_HASH_KEY_STRING); if (rft) { switch (rft->type) { case APL_REQ_FUNTYPE_TABLE:{ + apr_table_t *rs; + req_field_apr_table_f func = (req_field_apr_table_f)rft->fun; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "request_rec->dispatching %s -> apr table (NOT IMPLEMENTED YET)", + "request_rec->dispatching %s -> apr table", name); - return 0; + rs = (*func)(r); + ap_lua_push_apr_table(L, rs); + return 1; } case APL_REQ_FUNTYPE_LUACFUN:{ + lua_CFunction func = (lua_CFunction)rft->fun; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "request_rec->dispatching %s -> lua_CFunction", name); - lua_CFunction func = rft->fun; lua_pushcfunction(L, func); return 1; } case APL_REQ_FUNTYPE_STRING:{ + req_field_string_f func = (req_field_string_f)rft->fun; + char *rs; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "request_rec->dispatching %s -> string", name); - req_field_string_f func = rft->fun; - char *rs = (*func) (r); + rs = (*func) (r); lua_pushstring(L, rs); return 1; } case APL_REQ_FUNTYPE_INT:{ + req_field_int_f func = (req_field_int_f)rft->fun; + int rs; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "request_rec->dispatching %s -> int", name); - req_field_int_f func = rft->fun; - int rs = (*func) (r); + rs = (*func) (r); lua_pushnumber(L, rs); return 1; } case APL_REQ_FUNTYPE_BOOLEAN:{ + req_field_int_f func = (req_field_int_f)rft->fun; + int rs; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "request_rec->dispatching %s -> boolean", name); - req_field_int_f func = rft->fun; - int rs = (*func) (r); + rs = (*func) (r); lua_pushboolean(L, rs); return 1; } @@ -368,14 +436,16 @@ static int req_dispatch(lua_State *L) /* helper function for the logging functions below */ static int req_log_at(lua_State *L, int level) { - request_rec *r = apl_check_request_rec(L, 1); + const char *msg; + request_rec *r = ap_lua_check_request_rec(L, 1); lua_Debug dbg; lua_getstack(L, 1, &dbg); lua_getinfo(L, "Sl", &dbg); - const char *msg = luaL_checkstring(L, 2); - ap_log_rerror(dbg.source, dbg.currentline, level, 0, r, msg); + msg = luaL_checkstring(L, 2); + ap_log_rerror(dbg.source, dbg.currentline, APLOG_MODULE_INDEX, level, 0, + r, "%s", msg); return 0; } @@ -421,52 +491,75 @@ static int req_debug(lua_State *L) return 0; } +#define APLUA_REQ_TRACE(lev) static int req_trace##lev(lua_State *L) \ +{ \ + req_log_at(L, APLOG_TRACE##lev); \ + return 0; \ +} + +APLUA_REQ_TRACE(1) +APLUA_REQ_TRACE(2) +APLUA_REQ_TRACE(3) +APLUA_REQ_TRACE(4) +APLUA_REQ_TRACE(5) +APLUA_REQ_TRACE(6) +APLUA_REQ_TRACE(7) +APLUA_REQ_TRACE(8) + /* handle r.status = 201 */ static int req_newindex(lua_State *L) { + const char *key; /* request_rec* r = lua_touserdata(L, lua_upvalueindex(1)); */ /* const char* key = luaL_checkstring(L, -2); */ - request_rec *r = apl_check_request_rec(L, 1); - apl_rstack_dump(L, r, "req_newindex"); - const char *key = luaL_checkstring(L, 2); - apl_rstack_dump(L, r, "req_newindex"); - if (0 == apr_strnatcmp("status", key)) { - int code = luaL_checkinteger(L, 3); - r->status = code; - luaL_getmetatable(L, "Apache2.Request"); - lua_pushinteger(L, code); - lua_setfield(L, -2, "status"); - lua_pop(L, 1); + request_rec *r = ap_lua_check_request_rec(L, 1); + key = luaL_checkstring(L, 2); + + if (0 == strcmp("args", key)) { + const char *value = luaL_checkstring(L, 3); + r->args = apr_pstrdup(r->pool, value); return 0; } - if (0 == apr_strnatcmp("content_type", key)) { + if (0 == strcmp("content_type", key)) { const char *value = luaL_checkstring(L, 3); - r->content_type = apr_pstrdup(r->pool, value); - luaL_getmetatable(L, "Apache2.Request"); - lua_pushstring(L, value); - lua_setfield(L, -2, "content_type"); - lua_pop(L, 1); + ap_set_content_type(r, apr_pstrdup(r->pool, value)); return 0; } - if (0 == apr_strnatcmp("filename", key)) { + if (0 == strcmp("filename", key)) { const char *value = luaL_checkstring(L, 3); r->filename = apr_pstrdup(r->pool, value); - luaL_getmetatable(L, "Apache2.Request"); - lua_pushstring(L, value); - lua_setfield(L, -2, "filename"); - lua_pop(L, 1); return 0; } - if (0 == apr_strnatcmp("uri", key)) { + if (0 == strcmp("handler", key)) { + const char *value = luaL_checkstring(L, 3); + r->handler = apr_pstrdup(r->pool, value); + return 0; + } + + if (0 == strcmp("proxyreq", key)) { + int value = luaL_checkinteger(L, 3); + r->proxyreq = value; + return 0; + } + + if (0 == strcmp("status", key)) { + int code = luaL_checkinteger(L, 3); + r->status = code; + return 0; + } + + if (0 == strcmp("uri", key)) { const char *value = luaL_checkstring(L, 3); r->uri = apr_pstrdup(r->pool, value); - luaL_getmetatable(L, "Apache2.Request"); - lua_pushstring(L, value); - lua_setfield(L, -2, "uri"); - lua_pop(L, 1); + return 0; + } + + if (0 == strcmp("user", key)) { + const char *value = luaL_checkstring(L, 3); + r->user = apr_pstrdup(r->pool, value); return 0; } @@ -496,7 +589,7 @@ static const struct luaL_Reg server_methods[] = { }; -static req_fun_t *makefun(void *fun, int type, apr_pool_t *pool) +static req_fun_t *makefun(const void *fun, int type, apr_pool_t *pool) { req_fun_t *rft = apr_palloc(pool, sizeof(req_fun_t)); rft->fun = fun; @@ -504,7 +597,7 @@ static req_fun_t *makefun(void *fun, int type, apr_pool_t *pool) return rft; } -void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) +AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p) { apr_hash_t *dispatch = apr_hash_make(p); @@ -514,11 +607,9 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) apr_hash_set(dispatch, "write", APR_HASH_KEY_STRING, makefun(&req_write, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "document_root", APR_HASH_KEY_STRING, - makefun(&req_document_root, APL_REQ_FUNTYPE_LUACFUN, p)); + makefun(&req_document_root, APL_REQ_FUNTYPE_STRING, p)); apr_hash_set(dispatch, "parseargs", APR_HASH_KEY_STRING, makefun(&req_parseargs, APL_REQ_FUNTYPE_LUACFUN, p)); - apr_hash_set(dispatch, "parsebody", APR_HASH_KEY_STRING, - makefun(&req_parsebody, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "debug", APR_HASH_KEY_STRING, makefun(&req_debug, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "info", APR_HASH_KEY_STRING, @@ -526,7 +617,7 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) apr_hash_set(dispatch, "notice", APR_HASH_KEY_STRING, makefun(&req_notice, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "warn", APR_HASH_KEY_STRING, - makefun(req_warn, APL_REQ_FUNTYPE_LUACFUN, p)); + makefun(&req_warn, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "err", APR_HASH_KEY_STRING, makefun(&req_err, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "crit", APR_HASH_KEY_STRING, @@ -535,11 +626,34 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) makefun(&req_alert, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "emerg", APR_HASH_KEY_STRING, makefun(&req_emerg, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace1", APR_HASH_KEY_STRING, + makefun(&req_trace1, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace2", APR_HASH_KEY_STRING, + makefun(&req_trace2, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace3", APR_HASH_KEY_STRING, + makefun(&req_trace3, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace4", APR_HASH_KEY_STRING, + makefun(&req_trace4, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace5", APR_HASH_KEY_STRING, + makefun(&req_trace5, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace6", APR_HASH_KEY_STRING, + makefun(&req_trace6, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace7", APR_HASH_KEY_STRING, + makefun(&req_trace7, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "trace8", APR_HASH_KEY_STRING, + makefun(&req_trace8, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "add_output_filter", APR_HASH_KEY_STRING, makefun(&req_add_output_filter, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "construct_url", APR_HASH_KEY_STRING, + makefun(&req_construct_url, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "escape_html", APR_HASH_KEY_STRING, + makefun(&req_escape_html, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "ssl_var_lookup", APR_HASH_KEY_STRING, + makefun(&req_ssl_var_lookup, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "is_https", APR_HASH_KEY_STRING, + makefun(&req_ssl_is_https_field, APL_REQ_FUNTYPE_BOOLEAN, p)); apr_hash_set(dispatch, "assbackwards", APR_HASH_KEY_STRING, - makefun(&req_assbackwards_field, APL_REQ_FUNTYPE_BOOLEAN, - p)); + makefun(&req_assbackwards_field, APL_REQ_FUNTYPE_BOOLEAN, p)); apr_hash_set(dispatch, "status", APR_HASH_KEY_STRING, makefun(&req_status_field, APL_REQ_FUNTYPE_INT, p)); apr_hash_set(dispatch, "protocol", APR_HASH_KEY_STRING, @@ -566,6 +680,8 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) makefun(&req_path_info_field, APL_REQ_FUNTYPE_STRING, p)); apr_hash_set(dispatch, "args", APR_HASH_KEY_STRING, makefun(&req_args_field, APL_REQ_FUNTYPE_STRING, p)); + apr_hash_set(dispatch, "handler", APR_HASH_KEY_STRING, + makefun(&req_handler_field, APL_REQ_FUNTYPE_STRING, p)); apr_hash_set(dispatch, "hostname", APR_HASH_KEY_STRING, makefun(&req_hostname_field, APL_REQ_FUNTYPE_STRING, p)); apr_hash_set(dispatch, "uri", APR_HASH_KEY_STRING, @@ -574,6 +690,19 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) makefun(&req_the_request_field, APL_REQ_FUNTYPE_STRING, p)); apr_hash_set(dispatch, "method", APR_HASH_KEY_STRING, makefun(&req_method_field, APL_REQ_FUNTYPE_STRING, p)); + apr_hash_set(dispatch, "proxyreq", APR_HASH_KEY_STRING, + makefun(&req_proxyreq_field, APL_REQ_FUNTYPE_STRING, p)); + apr_hash_set(dispatch, "headers_in", APR_HASH_KEY_STRING, + makefun(&req_headers_in, APL_REQ_FUNTYPE_TABLE, p)); + apr_hash_set(dispatch, "headers_out", APR_HASH_KEY_STRING, + makefun(&req_headers_out, APL_REQ_FUNTYPE_TABLE, p)); + apr_hash_set(dispatch, "err_headers_out", APR_HASH_KEY_STRING, + makefun(&req_err_headers_out, APL_REQ_FUNTYPE_TABLE, p)); + apr_hash_set(dispatch, "notes", APR_HASH_KEY_STRING, + makefun(&req_notes, APL_REQ_FUNTYPE_TABLE, p)); + apr_hash_set(dispatch, "subprocess_env", APR_HASH_KEY_STRING, + makefun(&req_subprocess_env, APL_REQ_FUNTYPE_TABLE, p)); + lua_pushlightuserdata(L, dispatch); lua_setfield(L, LUA_REGISTRYINDEX, "Apache2.Request.dispatch"); @@ -604,23 +733,24 @@ void apl_load_request_lmodule(lua_State *L, apr_pool_t *p) } -void apl_push_connection(lua_State *L, conn_rec *c) +AP_LUA_DECLARE(void) ap_lua_push_connection(lua_State *L, conn_rec *c) { lua_boxpointer(L, c); luaL_getmetatable(L, "Apache2.Connection"); lua_setmetatable(L, -2); luaL_getmetatable(L, "Apache2.Connection"); - apl_push_apr_table(L, "notes", c->notes); + ap_lua_push_apr_table(L, c->notes); + lua_setfield(L, -2, "notes"); - lua_pushstring(L, c->remote_ip); + lua_pushstring(L, c->peer_ip); lua_setfield(L, -2, "remote_ip"); lua_pop(L, 1); } -void apl_push_server(lua_State *L, server_rec *s) +AP_LUA_DECLARE(void) ap_lua_push_server(lua_State *L, server_rec *s) { lua_boxpointer(L, s); luaL_getmetatable(L, "Apache2.Server"); @@ -633,7 +763,7 @@ void apl_push_server(lua_State *L, server_rec *s) lua_pop(L, 1); } -void apl_push_request(lua_State *L, request_rec *r) +AP_LUA_DECLARE(void) ap_lua_push_request(lua_State *L, request_rec *r) { lua_boxpointer(L, r); luaL_getmetatable(L, "Apache2.Request");