diff --git a/modules/lua/lua_apr.c b/modules/lua/lua_apr.c index de0e34d024..c0af7c91ad 100644 --- a/modules/lua/lua_apr.c +++ b/modules/lua/lua_apr.c @@ -17,7 +17,6 @@ #include "mod_lua.h" #include "lua_apr.h" -#include "util_md5.h" /** * make a userdata out of a C pointer, and vice versa @@ -89,1035 +88,4 @@ AP_LUA_DECLARE(int) ap_lua_init(lua_State *L, apr_pool_t *p) } -/* - * ======================================================================================================================= - * util_read: Reads any additional form data sent in POST/PUT requests. - * ======================================================================================================================= - */ -static int util_read(request_rec *r, const char **rbuf, apr_off_t *size) -{ - int rc = OK; - if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) - return rc; - if (ap_should_client_block(r)) { - char buffer[HUGE_STRING_LEN]; - apr_off_t rsize, - len_read, - rpos = 0; - apr_off_t length = r->remaining; - - *rbuf = apr_pcalloc(r->pool, length + 1); - *size = length; - while ((len_read = ap_get_client_block(r, buffer, sizeof(buffer))) > 0) { - if ((rpos + len_read) > length) - rsize = length - rpos; - else - rsize = len_read; - memcpy((char *)*rbuf + rpos, buffer, rsize); - rpos += rsize; - } - } - - return rc; -} - -/* - * ======================================================================================================================= - * util_write: Reads any additional form data sent in POST/PUT requests - * and writes to a file. - * ======================================================================================================================= - */ -static apr_status_t util_write(request_rec *r, apr_file_t *file, apr_off_t *size) -{ - apr_status_t rc = OK; - - if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) - return rc; - if (ap_should_client_block(r)) { - char argsbuffer[HUGE_STRING_LEN]; - apr_off_t rsize, - len_read, - rpos = 0; - apr_off_t length = r->remaining; - apr_size_t written; - - *size = length; - while ((len_read = - ap_get_client_block(r, argsbuffer, - sizeof(argsbuffer))) > 0) { - if ((rpos + len_read) > length) - rsize = (apr_size_t) length - rpos; - else - rsize = len_read; - - rc = apr_file_write_full(file, argsbuffer, (apr_size_t) rsize, - &written); - if (written != rsize || rc != OK) - return APR_ENOSPC; - rpos += rsize; - } - } - - return rc; -} - -static request_rec *ap_lua_check_request_rec(lua_State *L, int index) -{ - request_rec *r; - luaL_checkudata(L, index, "Apache2.Request"); - r = (request_rec *) lua_unboxpointer(L, index); - return r; -} - -/* - * lua_apr_b64encode; r:encode_base64(string) - encodes a string to Base64 - * format - */ -static int lua_apr_b64encode(lua_State *L) -{ - const char *plain; - char *encoded; - size_t plain_len, encoded_len; - request_rec *r; - - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - plain = lua_tolstring(L, 2, &plain_len); - encoded_len = apr_base64_encode_len(plain_len) + 1; - if (encoded_len) { - encoded = apr_palloc(r->pool, encoded_len); - apr_base64_encode(encoded, plain, plain_len); - lua_pushlstring(L, encoded, encoded_len); - return 1; - } - return 0; -} - -/* - * lua_apr_b64decode; r:decode_base64(string) - decodes a Base64 string - */ -static int lua_apr_b64decode(lua_State *L) -{ - const char *encoded; - char *plain; - size_t encoded_len, decoded_len; - request_rec *r; - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - encoded = lua_tolstring(L, 2, &encoded_len); - decoded_len = apr_base64_decode_len(encoded) + 1; - if (decoded_len) { - plain = apr_palloc(r->pool, decoded_len); - apr_base64_decode(plain, encoded); - lua_pushlstring(L, plain, decoded_len); - return 1; - } - return 0; -} - -/* - * lua_ap_unescape; r:unescape(string) - Unescapes an URL-encoded string - */ -static int lua_ap_unescape(lua_State *L) -{ - const char *escaped; - char *plain; - size_t x, - y; - request_rec *r; - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - escaped = lua_tolstring(L, 2, &x); - plain = apr_pstrdup(r->pool, escaped); - y = ap_unescape_urlencoded(plain); - if (!y) { - lua_pushstring(L, plain); - return 1; - } - return 0; -} - -/* - * lua_ap_escape; r:escape(string) - URL-escapes a string - */ -static int lua_ap_escape(lua_State *L) -{ - const char *plain; - char *escaped; - size_t x; - request_rec *r; - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - plain = lua_tolstring(L, 2, &x); - escaped = ap_escape_urlencoded(r->pool, plain); - lua_pushstring(L, escaped); - return 1; -} - -/* - * lua_apr_md5; r:md5(string) - Calculates an MD5 digest of a string - */ -static int lua_apr_md5(lua_State *L) -{ - const char *buffer; - char *result; - size_t len; - request_rec *r; - - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - buffer = lua_tolstring(L, 2, &len); - result = ap_md5_binary(r->pool, (const unsigned char *)buffer, len); - lua_pushstring(L, result); - return 1; -} - -/* - * lua_apr_sha1; r:sha1(string) - Calculates the SHA1 digest of a string - */ -static int lua_apr_sha1(lua_State *L) -{ - unsigned char digest[APR_SHA1_DIGESTSIZE]; - apr_sha1_ctx_t sha1; - const char *buffer; - char *result; - size_t len; - request_rec *r; - - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - result = apr_pcalloc(r->pool, sizeof(digest) * 2 + 1); - buffer = lua_tolstring(L, 2, &len); - apr_sha1_init(&sha1); - apr_sha1_update(&sha1, buffer, len); - apr_sha1_final(digest, &sha1); - ap_bin2hex(digest, sizeof(digest), result); - lua_pushstring(L, result); - return 1; -} - - - -/* - * lua_ap_banner; r:banner() - Returns the current server banner - */ -static int lua_ap_banner(lua_State *L) -{ - lua_pushstring(L, ap_get_server_banner()); - return 1; -} - -/* - * lua_ap_port; r:port() - Returns the port used by the request - */ -static int lua_ap_port(lua_State *L) -{ - request_rec *r; - apr_port_t port; - - r = ap_lua_check_request_rec(L, 1); - port = ap_get_server_port(r); - lua_pushnumber(L, port); - return 1; -} - -/* - * lua_ap_mpm_query; r:mpm_query(info) - Queries for MPM info - */ -static int lua_ap_mpm_query(lua_State *L) -{ - int x, - y; - - x = lua_tonumber(L, 1); - ap_mpm_query(x, &y); - lua_pushnumber(L, y); - return 1; -} - -/* - * lua_ap_expr; r:expr(string) - Evaluates an expr statement. - */ -static int lua_ap_expr(lua_State *L) -{ - request_rec *r; - int x = 0; - const char *expr, - *err; - ap_expr_info_t res; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TSTRING); - r = ap_lua_check_request_rec(L, 1); - expr = lua_tostring(L, 2); - - - res.filename = NULL; - res.flags = 0; - res.line_number = 0; - res.module_index = APLOG_MODULE_INDEX; - - err = ap_expr_parse(r->pool, r->pool, &res, expr, NULL); - if (!err) { - x = ap_expr_exec(r, &res, &err); - lua_pushboolean(L, x); - if (x < 0) { - lua_pushstring(L, err); - return 2; - } - return 1; - } else { - lua_pushboolean(L, 0); - lua_pushstring(L, err); - return 2; - } - lua_pushboolean(L, 0); - return 1; -} - - -/* - * lua_ap_regex; r:regex(string, pattern) - Evaluates a regex and returns - * captures if matched - */ -static int lua_ap_regex(lua_State *L) -{ - request_rec *r; - int i, - rv; - const char *pattern, - *source; - char *err; - ap_regex_t regex; - ap_regmatch_t matches[AP_MAX_REG_MATCH]; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TSTRING); - luaL_checktype(L, 3, LUA_TSTRING); - r = ap_lua_check_request_rec(L, 1); - pattern = lua_tostring(L, 2); - source = lua_tostring(L, 3); - - rv = ap_regcomp(®ex, pattern, 0); - if (rv) { - lua_pushboolean(L, 0); - err = apr_palloc(r->pool, 256); - ap_regerror(rv, ®ex, err, 256); - lua_pushstring(L, err); - return 2; - } - - rv = ap_regexec(®ex, source, AP_MAX_REG_MATCH, matches, 0); - if (rv < 0) { - lua_pushboolean(L, 0); - err = apr_palloc(r->pool, 256); - ap_regerror(rv, ®ex, err, 256); - lua_pushstring(L, err); - return 2; - } - lua_newtable(L); - for (i = 0; i < regex.re_nsub; i++) { - lua_pushinteger(L, i); - if (matches[i].rm_so >= 0 && matches[i].rm_eo >= 0) - lua_pushstring(L, - apr_pstrndup(r->pool, source + matches[i].rm_so, - matches[i].rm_eo - matches[i].rm_so)); - else - lua_pushnil(L); - lua_settable(L, -3); - - } - return 1; -} - - - - -/* - * lua_ap_scoreboard_process; r:scoreboard_process(a) - returns scoreboard info - */ -static int lua_ap_scoreboard_process(lua_State *L) -{ - int i; - process_score *ps_record; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TNUMBER); - i = lua_tonumber(L, 2); - ps_record = ap_get_scoreboard_process(i); - if (ps_record) { - lua_newtable(L); - - lua_pushstring(L, "connections"); - lua_pushnumber(L, ps_record->connections); - lua_settable(L, -3); - - lua_pushstring(L, "keepalive"); - lua_pushnumber(L, ps_record->keep_alive); - lua_settable(L, -3); - - lua_pushstring(L, "lingering_close"); - lua_pushnumber(L, ps_record->lingering_close); - lua_settable(L, -3); - - lua_pushstring(L, "pid"); - lua_pushnumber(L, ps_record->pid); - lua_settable(L, -3); - - lua_pushstring(L, "suspended"); - lua_pushnumber(L, ps_record->suspended); - lua_settable(L, -3); - - lua_pushstring(L, "write_completion"); - lua_pushnumber(L, ps_record->write_completion); - lua_settable(L, -3); - - lua_pushstring(L, "not_accepting"); - lua_pushnumber(L, ps_record->not_accepting); - lua_settable(L, -3); - - lua_pushstring(L, "quiescing"); - lua_pushnumber(L, ps_record->quiescing); - lua_settable(L, -3); - - return 1; - } - return 0; -} - -/* - * lua_ap_scoreboard_worker; r:scoreboard_worker(proc, thread) - Returns thread - * info - */ -static int lua_ap_scoreboard_worker(lua_State *L) -{ - int i, - j; - worker_score *ws_record; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TNUMBER); - luaL_checktype(L, 3, LUA_TNUMBER); - i = lua_tonumber(L, 2); - j = lua_tonumber(L, 3); - ws_record = ap_get_scoreboard_worker_from_indexes(i, j); - if (ws_record) { - lua_newtable(L); - - lua_pushstring(L, "access_count"); - lua_pushnumber(L, ws_record->access_count); - lua_settable(L, -3); - - lua_pushstring(L, "bytes_served"); - lua_pushnumber(L, ws_record->bytes_served); - lua_settable(L, -3); - - lua_pushstring(L, "client"); - lua_pushstring(L, ws_record->client); - lua_settable(L, -3); - - lua_pushstring(L, "conn_bytes"); - lua_pushnumber(L, ws_record->conn_bytes); - lua_settable(L, -3); - - lua_pushstring(L, "conn_count"); - lua_pushnumber(L, ws_record->conn_count); - lua_settable(L, -3); - - lua_pushstring(L, "generation"); - lua_pushnumber(L, ws_record->generation); - lua_settable(L, -3); - - lua_pushstring(L, "last_used"); - lua_pushnumber(L, ws_record->last_used); - lua_settable(L, -3); - - lua_pushstring(L, "pid"); - lua_pushnumber(L, ws_record->pid); - lua_settable(L, -3); - - lua_pushstring(L, "request"); - lua_pushstring(L, ws_record->request); - lua_settable(L, -3); - - lua_pushstring(L, "start_time"); - lua_pushnumber(L, ws_record->start_time); - lua_settable(L, -3); - - lua_pushstring(L, "status"); - lua_pushnumber(L, ws_record->status); - lua_settable(L, -3); - - lua_pushstring(L, "stop_time"); - lua_pushnumber(L, ws_record->stop_time); - lua_settable(L, -3); - - lua_pushstring(L, "tid"); - - lua_pushinteger(L, (lua_Integer) ws_record->tid); - lua_settable(L, -3); - - lua_pushstring(L, "vhost"); - lua_pushstring(L, ws_record->vhost); - lua_settable(L, -3); -#ifdef HAVE_TIMES - lua_pushstring(L, "stimes"); - lua_pushnumber(L, ws_record->times.tms_stime); - lua_settable(L, -3); - - lua_pushstring(L, "utimes"); - lua_pushnumber(L, ws_record->times.tms_utime); - lua_settable(L, -3); -#endif - return 1; - } - return 0; -} - -/* - * lua_ap_restarted; r:started() - Returns the timestamp of last server - * (re)start - */ -static int lua_ap_restarted(lua_State *L) -{ - lua_pushnumber(L, ap_scoreboard_image->global->restart_time); - return 1; -} - -/* - * lua_ap_clock; r:clock() - Returns timestamp with microsecond precision - */ -static int lua_ap_clock(lua_State *L) -{ - apr_time_t now; - now = apr_time_now(); - lua_pushnumber(L, now); - return 1; -} - - -/* - * lua_ap_requestbody; r:requestbody([filename]) - Reads or stores the request - * body - */ -static int lua_ap_requestbody(lua_State *L) -{ - const char *filename; - request_rec *r; - - r = ap_lua_check_request_rec(L, 1); - filename = luaL_optstring(L, 2, 0); - - if (r) { - apr_off_t size; - - if (r->method_number != M_POST && r->method_number != M_PUT) - return (0); - if (!filename) { - const char *data; - - if (util_read(r, &data, &size) != OK) - return (0); - - lua_pushlstring(L, data, (size_t) size); - lua_pushinteger(L, (lua_Integer) size); - return (2); - } else { - apr_status_t rc; - apr_file_t *file; - - rc = apr_file_open(&file, filename, APR_CREATE | APR_FOPEN_WRITE, - APR_FPROT_OS_DEFAULT, r->pool); - lua_settop(L, 0); - if (rc == APR_SUCCESS) { - rc = util_write(r, file, &size); - apr_file_close(file); - if (rc != OK) { - lua_pushboolean(L, 0); - return 1; - } - lua_pushinteger(L, (lua_Integer) size); - return (1); - } else - lua_pushboolean(L, 0); - return (1); - } - } - - return (0); -} - -/* - * lua_ap_add_input_filter; r:add_input_filter(name) - Adds an input filter to - * the chain - */ -static int lua_ap_add_input_filter(lua_State *L) -{ - request_rec *r; - const char *filterName; - ap_filter_rec_t *filter; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TSTRING); - r = ap_lua_check_request_rec(L, 1); - filterName = lua_tostring(L, 2); - filter = ap_get_input_filter_handle(filterName); - if (filter) { - ap_add_input_filter_handle(filter, NULL, r, r->connection); - lua_pushboolean(L, 1); - } else - lua_pushboolean(L, 0); - return 1; -} - - -/* - * lua_ap_module_info; r:module_info(mod_name) - Returns information about a - * loaded module - */ -static int lua_ap_module_info(lua_State *L) -{ - const char *moduleName; - module *mod; - - luaL_checktype(L, 1, LUA_TSTRING); - moduleName = lua_tostring(L, 1); - mod = ap_find_linked_module(moduleName); - if (mod) { - const command_rec *cmd; - lua_newtable(L); - lua_pushstring(L, "commands"); - lua_newtable(L); - for (cmd = mod->cmds; cmd->name; ++cmd) { - lua_pushstring(L, cmd->name); - lua_pushstring(L, cmd->errmsg); - lua_settable(L, -3); - } - lua_settable(L, -3); - return 1; - } - return 0; -} - -/* - * lua_ap_runtime_dir_relative: r:runtime_dir_relative(file): Returns the - * filename as relative to the runtime dir - */ -static int lua_ap_runtime_dir_relative(lua_State *L) -{ - request_rec *r; - const char *file; - - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - file = luaL_optstring(L, 2, "."); - lua_pushstring(L, ap_runtime_dir_relative(r->pool, file)); - return 1; -} - -/* - * lua_ap_set_document_root; r:set_document_root(path) - sets the current doc - * root for the request - */ -static int lua_ap_set_document_root(lua_State *L) -{ - request_rec *r; - const char *root; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TSTRING); - r = ap_lua_check_request_rec(L, 1); - root = lua_tostring(L, 2); - ap_set_document_root(r, root); - return 0; -} - -/* - * lua_ap_stat; r:stat(filename) - Runs stat on a file and returns the file - * info as a table - */ -static int lua_ap_stat(lua_State *L) -{ - request_rec *r; - const char *filename; - apr_finfo_t file_info; - - luaL_checktype(L, 1, LUA_TUSERDATA); - luaL_checktype(L, 2, LUA_TSTRING); - r = ap_lua_check_request_rec(L, 1); - filename = lua_tostring(L, 2); - if (apr_stat(&file_info, filename, APR_FINFO_NORM, r->pool) == OK) { - lua_newtable(L); - - lua_pushstring(L, "mtime"); - lua_pushinteger(L, file_info.mtime); - lua_settable(L, -3); - - lua_pushstring(L, "atime"); - lua_pushinteger(L, file_info.atime); - lua_settable(L, -3); - - lua_pushstring(L, "ctime"); - lua_pushinteger(L, file_info.ctime); - lua_settable(L, -3); - - lua_pushstring(L, "size"); - lua_pushinteger(L, file_info.size); - lua_settable(L, -3); - - lua_pushstring(L, "filetype"); - lua_pushinteger(L, file_info.filetype); - lua_settable(L, -3); - - return 1; - } - else { - return 0; - } -} - -/* - * lua_ap_loaded_modules; r:loaded_modules() - Returns a list of loaded modules - */ -static int lua_ap_loaded_modules(lua_State *L) -{ - int i; - lua_newtable(L); - for (i = 0; ap_loaded_modules[i] && ap_loaded_modules[i]->name; i++) { - lua_pushinteger(L, i + 1); - lua_pushstring(L, ap_loaded_modules[i]->name); - lua_settable(L, -3); - } - return 1; -} - -/* - * lua_ap_server_info; r:server_info() - Returns server info, such as the - * executable filename, server root, mpm etc - */ -static int lua_ap_server_info(lua_State *L) -{ - lua_newtable(L); - - lua_pushstring(L, "server_executable"); - lua_pushstring(L, ap_server_argv0); - lua_settable(L, -3); - - lua_pushstring(L, "server_root"); - lua_pushstring(L, ap_server_root); - lua_settable(L, -3); - - lua_pushstring(L, "scoreboard_fname"); - lua_pushstring(L, ap_scoreboard_fname); - lua_settable(L, -3); - - lua_pushstring(L, "server_mpm"); - lua_pushstring(L, ap_show_mpm()); - lua_settable(L, -3); - - return 1; -} - - -/* - * === Auto-scraped functions === - */ - - -/** - * ap_set_context_info: Set context_prefix and context_document_root. - * @param r The request - * @param prefix the URI prefix, without trailing slash - * @param document_root the corresponding directory on disk, without trailing - * slash - * @note If one of prefix of document_root is NULL, the corrsponding - * property will not be changed. - */ -static int lua_ap_set_context_info(lua_State *L) -{ - - request_rec *r; - const char *prefix; - const char *document_root; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - prefix = lua_tostring(L, 2); - luaL_checktype(L, 3, LUA_TSTRING); - document_root = lua_tostring(L, 3); - ap_set_context_info(r, prefix, document_root); - return 0; -} - - -/** - * ap_os_escape_path (apr_pool_t *p, const char *path, int partial) - * convert an OS path to a URL in an OS dependant way. - * @param p The pool to allocate from - * @param path The path to convert - * @param partial if set, assume that the path will be appended to something - * with a '/' in it (and thus does not prefix "./") - * @return The converted URL - */ -static int lua_ap_os_escape_path(lua_State *L) -{ - - char *returnValue; - request_rec *r; - const char *path; - int partial = 0; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - path = lua_tostring(L, 2); - if (lua_isboolean(L, 3)) - partial = lua_toboolean(L, 3); - returnValue = ap_os_escape_path(r->pool, path, partial); - lua_pushstring(L, returnValue); - return 1; -} - - -/** - * ap_escape_logitem (apr_pool_t *p, const char *str) - * Escape a string for logging - * @param p The pool to allocate from - * @param str The string to escape - * @return The escaped string - */ -static int lua_ap_escape_logitem(lua_State *L) -{ - - char *returnValue; - request_rec *r; - const char *str; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - str = lua_tostring(L, 2); - returnValue = ap_escape_logitem(r->pool, str); - lua_pushstring(L, returnValue); - return 1; -} - -/** - * ap_strcmp_match (const char *str, const char *expected) - * Determine if a string matches a patterm containing the wildcards '?' or '*' - * @param str The string to check - * @param expected The pattern to match against - * @param ignoreCase Whether to ignore case when matching - * @return 1 if the two strings match, 0 otherwise - */ -static int lua_ap_strcmp_match(lua_State *L) -{ - - int returnValue; - const char *str; - const char *expected; - int ignoreCase = 0; - luaL_checktype(L, 1, LUA_TSTRING); - str = lua_tostring(L, 1); - luaL_checktype(L, 2, LUA_TSTRING); - expected = lua_tostring(L, 2); - if (lua_isboolean(L, 3)) - ignoreCase = lua_toboolean(L, 3); - if (!ignoreCase) - returnValue = ap_strcmp_match(str, expected); - else - returnValue = ap_strcasecmp_match(str, expected); - lua_pushboolean(L, (!returnValue)); - return 1; -} - - -/** - * ap_set_keepalive (request_rec *r) - * Set the keepalive status for this request - * @param r The current request - * @return 1 if keepalive can be set, 0 otherwise - */ -static int lua_ap_set_keepalive(lua_State *L) -{ - - int returnValue; - request_rec *r; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - returnValue = ap_set_keepalive(r); - lua_pushboolean(L, returnValue); - return 1; -} - -/** - * ap_make_etag (request_rec *r, int force_weak) - * Construct an entity tag from the resource information. If it's a real - * file, build in some of the file characteristics. - * @param r The current request - * @param force_weak Force the entity tag to be weak - it could be modified - * again in as short an interval. - * @return The entity tag - */ -static int lua_ap_make_etag(lua_State *L) -{ - - char *returnValue; - request_rec *r; - int force_weak; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TBOOLEAN); - force_weak = luaL_optint(L, 2, 0); - returnValue = ap_make_etag(r, force_weak); - lua_pushstring(L, returnValue); - return 1; -} - - - -/** - * ap_send_interim_response (request_rec *r, int send_headers) - * Send an interim (HTTP 1xx) response immediately. - * @param r The request - * @param send_headers Whether to send&clear headers in r->headers_out - */ -static int lua_ap_send_interim_response(lua_State *L) -{ - - request_rec *r; - int send_headers = 0; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - if (lua_isboolean(L, 2)) - send_headers = lua_toboolean(L, 2); - ap_send_interim_response(r, send_headers); - return 0; -} - - -/** - * ap_custom_response (request_rec *r, int status, const char *string) - * Install a custom response handler for a given status - * @param r The current request - * @param status The status for which the custom response should be used - * @param string The custom response. This can be a static string, a file - * or a URL - */ -static int lua_ap_custom_response(lua_State *L) -{ - - request_rec *r; - int status; - const char *string; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - luaL_checktype(L, 2, LUA_TNUMBER); - status = lua_tointeger(L, 2); - luaL_checktype(L, 3, LUA_TSTRING); - string = lua_tostring(L, 3); - ap_custom_response(r, status, string); - return 0; -} - - -/** - * ap_exists_config_define (const char *name) - * Check for a definition from the server command line - * @param name The define to check for - * @return 1 if defined, 0 otherwise - */ -static int lua_ap_exists_config_define(lua_State *L) -{ - - int returnValue; - const char *name; - luaL_checktype(L, 1, LUA_TSTRING); - name = lua_tostring(L, 1); - returnValue = ap_exists_config_define(name); - lua_pushinteger(L, returnValue); - return 1; -} - -static int lua_ap_get_server_name_for_url(lua_State *L) -{ - - const char *servername; - request_rec *r; - luaL_checktype(L, 1, LUA_TUSERDATA); - r = ap_lua_check_request_rec(L, 1); - servername = ap_get_server_name_for_url(r); - lua_pushstring(L, servername); - return 1; -} - - - -/** - * ap_state_query (int query_code) item starts a new field */ -static int lua_ap_state_query(lua_State *L) -{ - - int returnValue; - int query_code; - luaL_checktype(L, 1, LUA_TNUMBER); - query_code = lua_tointeger(L, 1); - returnValue = ap_state_query(query_code); - lua_pushinteger(L, returnValue); - return 1; -} - -static int lua_ap_sleep(lua_State *L) -{ - - int msec; - luaL_checktype(L, 1, LUA_TNUMBER); - msec = (lua_tonumber(L, 1) * 1000000); - apr_sleep(msec); - return 0; -} - -static const struct luaL_Reg httpd_functions[] = { - {"base64_encode", lua_apr_b64encode}, - {"base64_decode", lua_apr_b64decode}, - {"md5", lua_apr_md5}, - {"sha1", lua_apr_sha1}, - {"escape", lua_ap_escape}, - {"unescape", lua_ap_unescape}, - {"banner", lua_ap_banner}, - {"port", lua_ap_port}, - {"mpm_query", lua_ap_mpm_query}, - {"expr", lua_ap_expr}, - {"scoreboard_process", lua_ap_scoreboard_process}, - {"scoreboard_worker", lua_ap_scoreboard_worker}, - {"started", lua_ap_restarted}, - {"clock", lua_ap_clock}, - {"requestbody", lua_ap_requestbody}, - {"add_input_filter", lua_ap_add_input_filter}, - {"module_info", lua_ap_module_info}, - {"loaded_modules", lua_ap_loaded_modules}, - {"runtime_dir_relative", lua_ap_runtime_dir_relative}, - {"server_info", lua_ap_server_info}, - {"set_document_root", lua_ap_set_document_root}, - {"set_context_info", lua_ap_set_context_info}, - {"os_escape_path", lua_ap_os_escape_path}, - {"escape_logitem", lua_ap_escape_logitem}, - {"strcmp_match", lua_ap_strcmp_match}, - {"set_keepalive", lua_ap_set_keepalive}, - {"make_etag", lua_ap_make_etag}, - {"send_interim_response", lua_ap_send_interim_response}, - {"custom_response", lua_ap_custom_response}, - {"exists_config_define", lua_ap_exists_config_define}, - {"state_query", lua_ap_state_query}, - {"stat", lua_ap_stat}, - {"regex", lua_ap_regex}, - {"sleep", lua_ap_sleep}, - {"get_server_name_for_url", lua_ap_get_server_name_for_url}, - {NULL, NULL} /* sentinel */ -}; - -AP_LUA_DECLARE(int) ap_lua_load_httpd_functions(lua_State *L) -{ - lua_getglobal(L, "apache2"); - luaL_register(L, NULL, httpd_functions); - return 0; -} diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index a16fbaebb5..7020c2d1d9 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -20,6 +20,7 @@ #include "lua_apr.h" #include "scoreboard.h" #include "lua_dbd.h" +#include "util_md5.h" APLOG_USE_MODULE(lua); #define POST_MAX_VARS 500 @@ -193,6 +194,47 @@ static int lua_read_body(request_rec *r, const char **rbuf, apr_off_t *size) return (rc); } + +/* + * ======================================================================================================================= + * lua_write_body: Reads any additional form data sent in POST/PUT requests + * and writes to a file. + * ======================================================================================================================= + */ +static apr_status_t lua_write_body(request_rec *r, apr_file_t *file, apr_off_t *size) +{ + apr_status_t rc = OK; + + if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) + return rc; + if (ap_should_client_block(r)) { + char argsbuffer[HUGE_STRING_LEN]; + apr_off_t rsize, + len_read, + rpos = 0; + apr_off_t length = r->remaining; + apr_size_t written; + + *size = length; + while ((len_read = + ap_get_client_block(r, argsbuffer, + sizeof(argsbuffer))) > 0) { + if ((rpos + len_read) > length) + rsize = (apr_size_t) length - rpos; + else + rsize = len_read; + + rc = apr_file_write_full(file, argsbuffer, (apr_size_t) rsize, + &written); + if (written != rsize || rc != OK) + return APR_ENOSPC; + rpos += rsize; + } + } + + return rc; +} + /* r:parseargs() returning a lua table */ static int req_parseargs(lua_State *L) { @@ -276,6 +318,64 @@ static int req_parsebody(lua_State *L) return 2; /* [table, table>] */ } + +/* + * lua_ap_requestbody; r:requestbody([filename]) - Reads or stores the request + * body + */ +static int lua_ap_requestbody(lua_State *L) +{ + const char *filename; + request_rec *r; + apr_off_t maxSize; + + r = ap_lua_check_request_rec(L, 1); + filename = luaL_optstring(L, 2, 0); + maxSize = luaL_optint(L, 3, 0); + + if (r) { + apr_off_t size; + if (maxSize > 0 && r->remaining > maxSize) { + lua_pushnil(L); + lua_pushliteral(L, "Request body was larger than the permitted size."); + return 2; + } + if (r->method_number != M_POST && r->method_number != M_PUT) + return (0); + if (!filename) { + const char *data; + + if (lua_read_body(r, &data, &size) != OK) + return (0); + + lua_pushlstring(L, data, (size_t) size); + lua_pushinteger(L, (lua_Integer) size); + return (2); + } else { + apr_status_t rc; + apr_file_t *file; + + rc = apr_file_open(&file, filename, APR_CREATE | APR_FOPEN_WRITE, + APR_FPROT_OS_DEFAULT, r->pool); + lua_settop(L, 0); + if (rc == APR_SUCCESS) { + rc = lua_write_body(r, file, &size); + apr_file_close(file); + if (rc != OK) { + lua_pushboolean(L, 0); + return 1; + } + lua_pushinteger(L, (lua_Integer) size); + return (1); + } else + lua_pushboolean(L, 0); + return (1); + } + } + + return (0); +} + /* wrap ap_rputs as r:puts(String) */ static int req_puts(lua_State *L) { @@ -595,6 +695,846 @@ static int lua_ap_sendfile(lua_State *L) } +/* + * lua_apr_b64encode; r:encode_base64(string) - encodes a string to Base64 + * format + */ +static int lua_apr_b64encode(lua_State *L) +{ + const char *plain; + char *encoded; + size_t plain_len, encoded_len; + request_rec *r; + + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + plain = lua_tolstring(L, 2, &plain_len); + encoded_len = apr_base64_encode_len(plain_len) + 1; + if (encoded_len) { + encoded = apr_palloc(r->pool, encoded_len); + apr_base64_encode(encoded, plain, plain_len); + lua_pushlstring(L, encoded, encoded_len); + return 1; + } + return 0; +} + +/* + * lua_apr_b64decode; r:decode_base64(string) - decodes a Base64 string + */ +static int lua_apr_b64decode(lua_State *L) +{ + const char *encoded; + char *plain; + size_t encoded_len, decoded_len; + request_rec *r; + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + encoded = lua_tolstring(L, 2, &encoded_len); + decoded_len = apr_base64_decode_len(encoded) + 1; + if (decoded_len) { + plain = apr_palloc(r->pool, decoded_len); + apr_base64_decode(plain, encoded); + lua_pushlstring(L, plain, decoded_len); + return 1; + } + return 0; +} + +/* + * lua_ap_unescape; r:unescape(string) - Unescapes an URL-encoded string + */ +static int lua_ap_unescape(lua_State *L) +{ + const char *escaped; + char *plain; + size_t x, + y; + request_rec *r; + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + escaped = lua_tolstring(L, 2, &x); + plain = apr_pstrdup(r->pool, escaped); + y = ap_unescape_urlencoded(plain); + if (!y) { + lua_pushstring(L, plain); + return 1; + } + return 0; +} + +/* + * lua_ap_escape; r:escape(string) - URL-escapes a string + */ +static int lua_ap_escape(lua_State *L) +{ + const char *plain; + char *escaped; + size_t x; + request_rec *r; + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + plain = lua_tolstring(L, 2, &x); + escaped = ap_escape_urlencoded(r->pool, plain); + lua_pushstring(L, escaped); + return 1; +} + +/* + * lua_apr_md5; r:md5(string) - Calculates an MD5 digest of a string + */ +static int lua_apr_md5(lua_State *L) +{ + const char *buffer; + char *result; + size_t len; + request_rec *r; + + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + buffer = lua_tolstring(L, 2, &len); + result = ap_md5_binary(r->pool, (const unsigned char *)buffer, len); + lua_pushstring(L, result); + return 1; +} + +/* + * lua_apr_sha1; r:sha1(string) - Calculates the SHA1 digest of a string + */ +static int lua_apr_sha1(lua_State *L) +{ + unsigned char digest[APR_SHA1_DIGESTSIZE]; + apr_sha1_ctx_t sha1; + const char *buffer; + char *result; + size_t len; + request_rec *r; + + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + result = apr_pcalloc(r->pool, sizeof(digest) * 2 + 1); + buffer = lua_tolstring(L, 2, &len); + apr_sha1_init(&sha1); + apr_sha1_update(&sha1, buffer, len); + apr_sha1_final(digest, &sha1); + ap_bin2hex(digest, sizeof(digest), result); + lua_pushstring(L, result); + return 1; +} + + + +/* + * lua_ap_banner; r:banner() - Returns the current server banner + */ +static int lua_ap_banner(lua_State *L) +{ + lua_pushstring(L, ap_get_server_banner()); + return 1; +} + +/* + * lua_ap_mpm_query; r:mpm_query(info) - Queries for MPM info + */ +static int lua_ap_mpm_query(lua_State *L) +{ + int x, + y; + + x = lua_tonumber(L, 1); + ap_mpm_query(x, &y); + lua_pushnumber(L, y); + return 1; +} + +/* + * lua_ap_expr; r:expr(string) - Evaluates an expr statement. + */ +static int lua_ap_expr(lua_State *L) +{ + request_rec *r; + int x = 0; + const char *expr, + *err; + ap_expr_info_t res; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TSTRING); + r = ap_lua_check_request_rec(L, 1); + expr = lua_tostring(L, 2); + + + res.filename = NULL; + res.flags = 0; + res.line_number = 0; + res.module_index = APLOG_MODULE_INDEX; + + err = ap_expr_parse(r->pool, r->pool, &res, expr, NULL); + if (!err) { + x = ap_expr_exec(r, &res, &err); + lua_pushboolean(L, x); + if (x < 0) { + lua_pushstring(L, err); + return 2; + } + return 1; + } else { + lua_pushboolean(L, 0); + lua_pushstring(L, err); + return 2; + } + lua_pushboolean(L, 0); + return 1; +} + + +/* + * lua_ap_regex; r:regex(string, pattern) - Evaluates a regex and returns + * captures if matched + */ +static int lua_ap_regex(lua_State *L) +{ + request_rec *r; + int i, + rv; + const char *pattern, + *source; + char *err; + ap_regex_t regex; + ap_regmatch_t matches[AP_MAX_REG_MATCH]; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TSTRING); + luaL_checktype(L, 3, LUA_TSTRING); + r = ap_lua_check_request_rec(L, 1); + pattern = lua_tostring(L, 2); + source = lua_tostring(L, 3); + + rv = ap_regcomp(®ex, pattern, 0); + if (rv) { + lua_pushboolean(L, 0); + err = apr_palloc(r->pool, 256); + ap_regerror(rv, ®ex, err, 256); + lua_pushstring(L, err); + return 2; + } + + rv = ap_regexec(®ex, source, AP_MAX_REG_MATCH, matches, 0); + if (rv < 0) { + lua_pushboolean(L, 0); + err = apr_palloc(r->pool, 256); + ap_regerror(rv, ®ex, err, 256); + lua_pushstring(L, err); + return 2; + } + lua_newtable(L); + for (i = 0; i < regex.re_nsub; i++) { + lua_pushinteger(L, i); + if (matches[i].rm_so >= 0 && matches[i].rm_eo >= 0) + lua_pushstring(L, + apr_pstrndup(r->pool, source + matches[i].rm_so, + matches[i].rm_eo - matches[i].rm_so)); + else + lua_pushnil(L); + lua_settable(L, -3); + + } + return 1; +} + + + + +/* + * lua_ap_scoreboard_process; r:scoreboard_process(a) - returns scoreboard info + */ +static int lua_ap_scoreboard_process(lua_State *L) +{ + int i; + process_score *ps_record; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TNUMBER); + i = lua_tonumber(L, 2); + ps_record = ap_get_scoreboard_process(i); + if (ps_record) { + lua_newtable(L); + + lua_pushstring(L, "connections"); + lua_pushnumber(L, ps_record->connections); + lua_settable(L, -3); + + lua_pushstring(L, "keepalive"); + lua_pushnumber(L, ps_record->keep_alive); + lua_settable(L, -3); + + lua_pushstring(L, "lingering_close"); + lua_pushnumber(L, ps_record->lingering_close); + lua_settable(L, -3); + + lua_pushstring(L, "pid"); + lua_pushnumber(L, ps_record->pid); + lua_settable(L, -3); + + lua_pushstring(L, "suspended"); + lua_pushnumber(L, ps_record->suspended); + lua_settable(L, -3); + + lua_pushstring(L, "write_completion"); + lua_pushnumber(L, ps_record->write_completion); + lua_settable(L, -3); + + lua_pushstring(L, "not_accepting"); + lua_pushnumber(L, ps_record->not_accepting); + lua_settable(L, -3); + + lua_pushstring(L, "quiescing"); + lua_pushnumber(L, ps_record->quiescing); + lua_settable(L, -3); + + return 1; + } + return 0; +} + +/* + * lua_ap_scoreboard_worker; r:scoreboard_worker(proc, thread) - Returns thread + * info + */ +static int lua_ap_scoreboard_worker(lua_State *L) +{ + int i, + j; + worker_score *ws_record; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TNUMBER); + luaL_checktype(L, 3, LUA_TNUMBER); + i = lua_tonumber(L, 2); + j = lua_tonumber(L, 3); + ws_record = ap_get_scoreboard_worker_from_indexes(i, j); + if (ws_record) { + lua_newtable(L); + + lua_pushstring(L, "access_count"); + lua_pushnumber(L, ws_record->access_count); + lua_settable(L, -3); + + lua_pushstring(L, "bytes_served"); + lua_pushnumber(L, ws_record->bytes_served); + lua_settable(L, -3); + + lua_pushstring(L, "client"); + lua_pushstring(L, ws_record->client); + lua_settable(L, -3); + + lua_pushstring(L, "conn_bytes"); + lua_pushnumber(L, ws_record->conn_bytes); + lua_settable(L, -3); + + lua_pushstring(L, "conn_count"); + lua_pushnumber(L, ws_record->conn_count); + lua_settable(L, -3); + + lua_pushstring(L, "generation"); + lua_pushnumber(L, ws_record->generation); + lua_settable(L, -3); + + lua_pushstring(L, "last_used"); + lua_pushnumber(L, ws_record->last_used); + lua_settable(L, -3); + + lua_pushstring(L, "pid"); + lua_pushnumber(L, ws_record->pid); + lua_settable(L, -3); + + lua_pushstring(L, "request"); + lua_pushstring(L, ws_record->request); + lua_settable(L, -3); + + lua_pushstring(L, "start_time"); + lua_pushnumber(L, ws_record->start_time); + lua_settable(L, -3); + + lua_pushstring(L, "status"); + lua_pushnumber(L, ws_record->status); + lua_settable(L, -3); + + lua_pushstring(L, "stop_time"); + lua_pushnumber(L, ws_record->stop_time); + lua_settable(L, -3); + + lua_pushstring(L, "tid"); + + lua_pushinteger(L, (lua_Integer) ws_record->tid); + lua_settable(L, -3); + + lua_pushstring(L, "vhost"); + lua_pushstring(L, ws_record->vhost); + lua_settable(L, -3); +#ifdef HAVE_TIMES + lua_pushstring(L, "stimes"); + lua_pushnumber(L, ws_record->times.tms_stime); + lua_settable(L, -3); + + lua_pushstring(L, "utimes"); + lua_pushnumber(L, ws_record->times.tms_utime); + lua_settable(L, -3); +#endif + return 1; + } + return 0; +} + +/* + * lua_ap_restarted; r:started() - Returns the timestamp of last server + * (re)start + */ +static int lua_ap_restarted(lua_State *L) +{ + lua_pushnumber(L, ap_scoreboard_image->global->restart_time); + return 1; +} + +/* + * lua_ap_clock; r:clock() - Returns timestamp with microsecond precision + */ +static int lua_ap_clock(lua_State *L) +{ + apr_time_t now; + now = apr_time_now(); + lua_pushnumber(L, now); + return 1; +} + +/* + * lua_ap_add_input_filter; r:add_input_filter(name) - Adds an input filter to + * the chain + */ +static int lua_ap_add_input_filter(lua_State *L) +{ + request_rec *r; + const char *filterName; + ap_filter_rec_t *filter; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TSTRING); + r = ap_lua_check_request_rec(L, 1); + filterName = lua_tostring(L, 2); + filter = ap_get_input_filter_handle(filterName); + if (filter) { + ap_add_input_filter_handle(filter, NULL, r, r->connection); + lua_pushboolean(L, 1); + } else + lua_pushboolean(L, 0); + return 1; +} + + +/* + * lua_ap_module_info; r:module_info(mod_name) - Returns information about a + * loaded module + */ +static int lua_ap_module_info(lua_State *L) +{ + const char *moduleName; + module *mod; + + luaL_checktype(L, 1, LUA_TSTRING); + moduleName = lua_tostring(L, 1); + mod = ap_find_linked_module(moduleName); + if (mod) { + const command_rec *cmd; + lua_newtable(L); + lua_pushstring(L, "commands"); + lua_newtable(L); + for (cmd = mod->cmds; cmd->name; ++cmd) { + lua_pushstring(L, cmd->name); + lua_pushstring(L, cmd->errmsg); + lua_settable(L, -3); + } + lua_settable(L, -3); + return 1; + } + return 0; +} + +/* + * lua_ap_runtime_dir_relative: r:runtime_dir_relative(file): Returns the + * filename as relative to the runtime dir + */ +static int lua_ap_runtime_dir_relative(lua_State *L) +{ + request_rec *r; + const char *file; + + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + file = luaL_optstring(L, 2, "."); + lua_pushstring(L, ap_runtime_dir_relative(r->pool, file)); + return 1; +} + +/* + * lua_ap_set_document_root; r:set_document_root(path) - sets the current doc + * root for the request + */ +static int lua_ap_set_document_root(lua_State *L) +{ + request_rec *r; + const char *root; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TSTRING); + r = ap_lua_check_request_rec(L, 1); + root = lua_tostring(L, 2); + ap_set_document_root(r, root); + return 0; +} + +/* + * lua_ap_stat; r:stat(filename) - Runs stat on a file and returns the file + * info as a table + */ +static int lua_ap_stat(lua_State *L) +{ + request_rec *r; + const char *filename; + apr_finfo_t file_info; + + luaL_checktype(L, 1, LUA_TUSERDATA); + luaL_checktype(L, 2, LUA_TSTRING); + r = ap_lua_check_request_rec(L, 1); + filename = lua_tostring(L, 2); + if (apr_stat(&file_info, filename, APR_FINFO_NORM, r->pool) == OK) { + lua_newtable(L); + + lua_pushstring(L, "mtime"); + lua_pushinteger(L, file_info.mtime); + lua_settable(L, -3); + + lua_pushstring(L, "atime"); + lua_pushinteger(L, file_info.atime); + lua_settable(L, -3); + + lua_pushstring(L, "ctime"); + lua_pushinteger(L, file_info.ctime); + lua_settable(L, -3); + + lua_pushstring(L, "size"); + lua_pushinteger(L, file_info.size); + lua_settable(L, -3); + + lua_pushstring(L, "filetype"); + lua_pushinteger(L, file_info.filetype); + lua_settable(L, -3); + + return 1; + } + else { + return 0; + } +} + +/* + * lua_ap_loaded_modules; r:loaded_modules() - Returns a list of loaded modules + */ +static int lua_ap_loaded_modules(lua_State *L) +{ + int i; + lua_newtable(L); + for (i = 0; ap_loaded_modules[i] && ap_loaded_modules[i]->name; i++) { + lua_pushinteger(L, i + 1); + lua_pushstring(L, ap_loaded_modules[i]->name); + lua_settable(L, -3); + } + return 1; +} + +/* + * lua_ap_server_info; r:server_info() - Returns server info, such as the + * executable filename, server root, mpm etc + */ +static int lua_ap_server_info(lua_State *L) +{ + lua_newtable(L); + + lua_pushstring(L, "server_executable"); + lua_pushstring(L, ap_server_argv0); + lua_settable(L, -3); + + lua_pushstring(L, "server_root"); + lua_pushstring(L, ap_server_root); + lua_settable(L, -3); + + lua_pushstring(L, "scoreboard_fname"); + lua_pushstring(L, ap_scoreboard_fname); + lua_settable(L, -3); + + lua_pushstring(L, "server_mpm"); + lua_pushstring(L, ap_show_mpm()); + lua_settable(L, -3); + + return 1; +} + + +/* + * === Auto-scraped functions === + */ + + +/** + * ap_set_context_info: Set context_prefix and context_document_root. + * @param r The request + * @param prefix the URI prefix, without trailing slash + * @param document_root the corresponding directory on disk, without trailing + * slash + * @note If one of prefix of document_root is NULL, the corrsponding + * property will not be changed. + */ +static int lua_ap_set_context_info(lua_State *L) +{ + + request_rec *r; + const char *prefix; + const char *document_root; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + prefix = lua_tostring(L, 2); + luaL_checktype(L, 3, LUA_TSTRING); + document_root = lua_tostring(L, 3); + ap_set_context_info(r, prefix, document_root); + return 0; +} + + +/** + * ap_os_escape_path (apr_pool_t *p, const char *path, int partial) + * convert an OS path to a URL in an OS dependant way. + * @param p The pool to allocate from + * @param path The path to convert + * @param partial if set, assume that the path will be appended to something + * with a '/' in it (and thus does not prefix "./") + * @return The converted URL + */ +static int lua_ap_os_escape_path(lua_State *L) +{ + + char *returnValue; + request_rec *r; + const char *path; + int partial = 0; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + path = lua_tostring(L, 2); + if (lua_isboolean(L, 3)) + partial = lua_toboolean(L, 3); + returnValue = ap_os_escape_path(r->pool, path, partial); + lua_pushstring(L, returnValue); + return 1; +} + + +/** + * ap_escape_logitem (apr_pool_t *p, const char *str) + * Escape a string for logging + * @param p The pool to allocate from + * @param str The string to escape + * @return The escaped string + */ +static int lua_ap_escape_logitem(lua_State *L) +{ + + char *returnValue; + request_rec *r; + const char *str; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + str = lua_tostring(L, 2); + returnValue = ap_escape_logitem(r->pool, str); + lua_pushstring(L, returnValue); + return 1; +} + +/** + * ap_strcmp_match (const char *str, const char *expected) + * Determine if a string matches a patterm containing the wildcards '?' or '*' + * @param str The string to check + * @param expected The pattern to match against + * @param ignoreCase Whether to ignore case when matching + * @return 1 if the two strings match, 0 otherwise + */ +static int lua_ap_strcmp_match(lua_State *L) +{ + + int returnValue; + const char *str; + const char *expected; + int ignoreCase = 0; + luaL_checktype(L, 1, LUA_TSTRING); + str = lua_tostring(L, 1); + luaL_checktype(L, 2, LUA_TSTRING); + expected = lua_tostring(L, 2); + if (lua_isboolean(L, 3)) + ignoreCase = lua_toboolean(L, 3); + if (!ignoreCase) + returnValue = ap_strcmp_match(str, expected); + else + returnValue = ap_strcasecmp_match(str, expected); + lua_pushboolean(L, (!returnValue)); + return 1; +} + + +/** + * ap_set_keepalive (request_rec *r) + * Set the keepalive status for this request + * @param r The current request + * @return 1 if keepalive can be set, 0 otherwise + */ +static int lua_ap_set_keepalive(lua_State *L) +{ + + int returnValue; + request_rec *r; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + returnValue = ap_set_keepalive(r); + lua_pushboolean(L, returnValue); + return 1; +} + +/** + * ap_make_etag (request_rec *r, int force_weak) + * Construct an entity tag from the resource information. If it's a real + * file, build in some of the file characteristics. + * @param r The current request + * @param force_weak Force the entity tag to be weak - it could be modified + * again in as short an interval. + * @return The entity tag + */ +static int lua_ap_make_etag(lua_State *L) +{ + + char *returnValue; + request_rec *r; + int force_weak; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TBOOLEAN); + force_weak = luaL_optint(L, 2, 0); + returnValue = ap_make_etag(r, force_weak); + lua_pushstring(L, returnValue); + return 1; +} + + + +/** + * ap_send_interim_response (request_rec *r, int send_headers) + * Send an interim (HTTP 1xx) response immediately. + * @param r The request + * @param send_headers Whether to send&clear headers in r->headers_out + */ +static int lua_ap_send_interim_response(lua_State *L) +{ + + request_rec *r; + int send_headers = 0; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + if (lua_isboolean(L, 2)) + send_headers = lua_toboolean(L, 2); + ap_send_interim_response(r, send_headers); + return 0; +} + + +/** + * ap_custom_response (request_rec *r, int status, const char *string) + * Install a custom response handler for a given status + * @param r The current request + * @param status The status for which the custom response should be used + * @param string The custom response. This can be a static string, a file + * or a URL + */ +static int lua_ap_custom_response(lua_State *L) +{ + + request_rec *r; + int status; + const char *string; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + luaL_checktype(L, 2, LUA_TNUMBER); + status = lua_tointeger(L, 2); + luaL_checktype(L, 3, LUA_TSTRING); + string = lua_tostring(L, 3); + ap_custom_response(r, status, string); + return 0; +} + + +/** + * ap_exists_config_define (const char *name) + * Check for a definition from the server command line + * @param name The define to check for + * @return 1 if defined, 0 otherwise + */ +static int lua_ap_exists_config_define(lua_State *L) +{ + + int returnValue; + const char *name; + luaL_checktype(L, 1, LUA_TSTRING); + name = lua_tostring(L, 1); + returnValue = ap_exists_config_define(name); + lua_pushinteger(L, returnValue); + return 1; +} + +static int lua_ap_get_server_name_for_url(lua_State *L) +{ + + const char *servername; + request_rec *r; + luaL_checktype(L, 1, LUA_TUSERDATA); + r = ap_lua_check_request_rec(L, 1); + servername = ap_get_server_name_for_url(r); + lua_pushstring(L, servername); + return 1; +} + + + +/** + * ap_state_query (int query_code) item starts a new field */ +static int lua_ap_state_query(lua_State *L) +{ + + int returnValue; + int query_code; + luaL_checktype(L, 1, LUA_TNUMBER); + query_code = lua_tointeger(L, 1); + returnValue = ap_state_query(query_code); + lua_pushinteger(L, returnValue); + return 1; +} + +static int lua_ap_sleep(lua_State *L) +{ + + int msec; + luaL_checktype(L, 1, LUA_TNUMBER); + msec = (lua_tonumber(L, 1) * 1000000); + apr_sleep(msec); + return 0; +} + /* END dispatch methods for request_rec fields */ static int req_dispatch(lua_State *L) @@ -967,8 +1907,77 @@ AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p) makefun(&lua_ap_sendfile, APL_REQ_FUNTYPE_LUACFUN, p)); apr_hash_set(dispatch, "dbacquire", APR_HASH_KEY_STRING, makefun(&lua_db_acquire, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "stat", APR_HASH_KEY_STRING, + makefun(&lua_ap_stat, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "regex", APR_HASH_KEY_STRING, + makefun(&lua_ap_regex, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "sleep", APR_HASH_KEY_STRING, + makefun(&lua_ap_sleep, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "base64_encode", APR_HASH_KEY_STRING, + makefun(&lua_apr_b64encode, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "base64_decode", APR_HASH_KEY_STRING, + makefun(&lua_apr_b64decode, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "md5", APR_HASH_KEY_STRING, + makefun(&lua_apr_md5, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "sha1", APR_HASH_KEY_STRING, + makefun(&lua_apr_sha1, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "escape", APR_HASH_KEY_STRING, + makefun(&lua_ap_escape, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "unescape", APR_HASH_KEY_STRING, + makefun(&lua_ap_unescape, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "banner", APR_HASH_KEY_STRING, + makefun(&lua_ap_banner, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "port", APR_HASH_KEY_STRING, + makefun(&lua_ap_port, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "mpm_query", APR_HASH_KEY_STRING, + makefun(&lua_ap_mpm_query, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "expr", APR_HASH_KEY_STRING, + makefun(&lua_ap_expr, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "scoreboard_process", APR_HASH_KEY_STRING, + makefun(&lua_ap_scoreboard_process, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "scoreboard_worker", APR_HASH_KEY_STRING, + makefun(&lua_ap_scoreboard_worker, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "started", APR_HASH_KEY_STRING, + makefun(&lua_ap_restarted, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "clock", APR_HASH_KEY_STRING, + makefun(&lua_ap_clock, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "requestbody", APR_HASH_KEY_STRING, + makefun(&lua_ap_requestbody, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "add_input_filter", APR_HASH_KEY_STRING, + makefun(&lua_ap_add_input_filter, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "module_info", APR_HASH_KEY_STRING, + makefun(&lua_ap_module_info, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "loaded_modules", APR_HASH_KEY_STRING, + makefun(&lua_ap_loaded_modules, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "runtime_dir_relative", APR_HASH_KEY_STRING, + makefun(&lua_ap_runtime_dir_relative, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "server_info", APR_HASH_KEY_STRING, + makefun(&lua_ap_server_info, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "set_document_root", APR_HASH_KEY_STRING, + makefun(&lua_ap_set_document_root, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "set_context_info", APR_HASH_KEY_STRING, + makefun(&lua_ap_set_context_info, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "os_escape_path", APR_HASH_KEY_STRING, + makefun(&lua_ap_os_escape_path, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "escape_logitem", APR_HASH_KEY_STRING, + makefun(&lua_ap_escape_logitem, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "strcmp_match", APR_HASH_KEY_STRING, + makefun(&lua_ap_strcmp_match, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "set_keepalive", APR_HASH_KEY_STRING, + makefun(&lua_ap_set_keepalive, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "make_etag", APR_HASH_KEY_STRING, + makefun(&lua_ap_make_etag, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "send_interim_response", APR_HASH_KEY_STRING, + makefun(&lua_ap_send_interim_response, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "custom_response", APR_HASH_KEY_STRING, + makefun(&lua_ap_custom_response, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "exists_config_define", APR_HASH_KEY_STRING, + makefun(&lua_ap_exists_config_define, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "state_query", APR_HASH_KEY_STRING, + makefun(&lua_ap_state_query, APL_REQ_FUNTYPE_LUACFUN, p)); + apr_hash_set(dispatch, "get_server_name_for_url", APR_HASH_KEY_STRING, + makefun(&lua_ap_get_server_name_for_url, APL_REQ_FUNTYPE_LUACFUN, p)); - lua_pushlightuserdata(L, dispatch); lua_setfield(L, LUA_REGISTRYINDEX, "Apache2.Request.dispatch"); diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index ebc60eddb0..6945ce28d0 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -88,7 +88,6 @@ static void lua_open_callback(lua_State *L, apr_pool_t *p, void *ctx) ap_lua_init(L, p); ap_lua_load_apache2_lmodule(L); ap_lua_load_request_lmodule(L, p); - ap_lua_load_httpd_functions(L); ap_lua_load_config_lmodule(L); }