/*
* uhttpd - Tiny single-threaded httpd
*
- * Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
#include <libubox/blobmsg.h>
#include <lua.h>
#include <lauxlib.h>
int len;
int r;
- len = luaL_checknumber(L, 1);
+ len = luaL_optnumber(L, 1, LUAL_BUFFERSIZE);
luaL_buffinit(L, &B);
while(len > 0) {
char *buf;
buf = luaL_prepbuffer(&B);
- r = read(STDIN_FILENO, buf, LUAL_BUFFERSIZE);
+ r = read(STDIN_FILENO, buf,
+ len < LUAL_BUFFERSIZE ? len : LUAL_BUFFERSIZE);
if (r < 0) {
if (errno == EWOULDBLOCK || errno == EAGAIN) {
pfd.revents = 0;
luaL_addsize(&B, r);
data_len += r;
+ len -= r;
if (r != LUAL_BUFFERSIZE)
break;
}
return uh_lua_strconvert(L, ops->urlencode);
}
-static lua_State *uh_lua_state_init(void)
+static lua_State *uh_lua_state_init(struct lua_prefix *lua)
{
const char *msg = "(unknown error)";
const char *status;
lua_State *L;
int ret;
- L = lua_open();
+ L = luaL_newstate();
luaL_openlibs(L);
/* build uhttpd api table */
lua_setglobal(L, "uhttpd");
- ret = luaL_loadfile(L, conf.lua_handler);
+ ret = luaL_loadfile(L, lua->handler);
if (ret) {
status = "loading";
goto error;
lua_getglobal(L, UH_LUA_CB);
if (!lua_isfunction(L, -1)) {
- fprintf(stderr, "Error: Lua handler provides no " UH_LUA_CB "() callback.\n");
+ fprintf(stderr, "Error: Lua handler %s provides no "
+ UH_LUA_CB "() callback.\n", lua->handler);
exit(1);
}
+ lua->ctx = L;
+
return L;
error:
if (!lua_isnil(L, -1))
msg = lua_tostring(L, -1);
- fprintf(stderr, "Error %s Lua handler: %s\n", status, msg);
+ fprintf(stderr, "Error %s %s Lua handler: %s\n",
+ status, lua->handler, msg);
exit(1);
return NULL;
}
/* new env table for this request */
lua_newtable(L);
- prefix_len = strlen(conf.lua_prefix);
+ prefix_len = strlen(pi->name);
path_len = strlen(url);
str = strchr(url, '?');
if (str) {
- pi->query = str;
+ if (*(str + 1))
+ pi->query = str + 1;
path_len = str - url;
}
+
+ if (prefix_len > 0 && pi->name[prefix_len - 1] == '/')
+ prefix_len--;
+
if (path_len > prefix_len) {
lua_pushlstring(L, url + prefix_len,
path_len - prefix_len);
printf("Status: 500 Internal Server Error\r\n\r\n"
"Unable to launch the requested Lua program:\n"
- " %s: %s\n", pi->phys, strerror(errno));
+ " %s: %s\n", pi->phys, error);
}
exit(0);
static void lua_handle_request(struct client *cl, char *url, struct path_info *pi)
{
+ struct lua_prefix *p;
static struct path_info _pi;
- pi = &_pi;
- pi->name = conf.lua_prefix;
- pi->phys = conf.lua_handler;
+ list_for_each_entry(p, &conf.lua_prefix, list) {
+ if (!ops->path_match(p->prefix, url))
+ continue;
+
+ pi = &_pi;
+ pi->name = p->prefix;
+ pi->phys = p->handler;
+
+ _L = p->ctx;
- if (!ops->create_process(cl, pi, url, lua_main)) {
- ops->client_error(cl, 500, "Internal Server Error",
- "Failed to create CGI process: %s", strerror(errno));
+ if (!ops->create_process(cl, pi, url, lua_main)) {
+ ops->client_error(cl, 500, "Internal Server Error",
+ "Failed to create CGI process: %s",
+ strerror(errno));
+ }
+
+ return;
}
+
+ ops->client_error(cl, 500, "Internal Server Error",
+ "Failed to lookup matching handler");
}
static bool check_lua_url(const char *url)
{
- return ops->path_match(conf.lua_prefix, url);
+ struct lua_prefix *p;
+
+ list_for_each_entry(p, &conf.lua_prefix, list)
+ if (ops->path_match(p->prefix, url))
+ return true;
+
+ return false;
}
static struct dispatch_handler lua_dispatch = {
+ .script = true,
.check_url = check_lua_url,
.handle_request = lua_handle_request,
};
static int lua_plugin_init(const struct uhttpd_ops *o, struct config *c)
{
+ struct lua_prefix *p;
+
ops = o;
_conf = c;
- _L = uh_lua_state_init();
+
+ list_for_each_entry(p, &conf.lua_prefix, list)
+ uh_lua_state_init(p);
+
ops->dispatch_add(&lua_dispatch);
return 0;
}
-const struct uhttpd_plugin uhttpd_plugin = {
+struct uhttpd_plugin uhttpd_plugin = {
.init = lua_plugin_init,
};
projects / project / uhttpd.git / blobdiff