dany/antd-cgi-plugin
1
0
Fork 0
mirror of https://github.com/lxsang/antd-cgi-plugin synced 2024-12-27 10:28:22 +01:00
Code Issues Projects Releases Wiki Activity

fix cgi read output bug

Browse Source
This commit is contained in:
lxsang 2018-10-08 22:30:13 +02:00
parent 4f3d783df2
commit 227f78c777
1 changed files with 120 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
cgi.c
View File

@ -23,8 +23,8 @@ void init()
{ {
use_raw_body(); use_raw_body();
cgi_bin = dict(); cgi_bin = dict();
char* cnf = config_dir(); char *cnf = config_dir();
char* file = __s("%s/cgi.ini", cnf); char *file = __s("%s/cgi.ini", cnf);
// read ini file // read ini file
if (ini_parse(file, ini_handle, NULL) < 0) if (ini_parse(file, ini_handle, NULL) < 0)
{ {
@ -35,70 +35,75 @@ void init()
} }
void destroy() void destroy()
{ {
if(cgi_bin) if (cgi_bin)
freedict(cgi_bin); freedict(cgi_bin);
} }
static void add_vars(list* l, char* k, char* v) static void add_vars(list *l, char *k, char *v)
{ {
if(!v || !l || !k) return; if (!v || !l || !k)
char* data = __s("%s=%s", k, v); return;
char *data = __s("%s=%s", k, v);
list_put_s(l, data); list_put_s(l, data);
free(data); free(data);
} }
static void write_request_body(antd_request_t* rq, int fd) static void write_request_body(antd_request_t *rq, int fd)
{ {
char* tmp = (char*)dvalue(rq->request, "METHOD"); char *tmp = (char *)dvalue(rq->request, "METHOD");
if(!tmp || EQU(tmp,"GET") || EQU(tmp,"HEAD")) return; if (!tmp || EQU(tmp, "GET") || EQU(tmp, "HEAD"))
return;
int clen = -1; int clen = -1;
dictionary header = (dictionary) dvalue(rq->request,"REQUEST_HEADER"); dictionary header = (dictionary)dvalue(rq->request, "REQUEST_HEADER");
tmp = (char*)dvalue(header, "Content-Length"); tmp = (char *)dvalue(header, "Content-Length");
if(tmp) if (tmp)
clen = atoi(tmp); clen = atoi(tmp);
if(clen == -1) return; if (clen == -1)
return;
// read data and write to the fd // read data and write to the fd
char buf[BUFFLEN]; char buf[BUFFLEN];
int readlen = clen > BUFFLEN?BUFFLEN:clen; int readlen = clen > BUFFLEN ? BUFFLEN : clen;
int read = 0, stat = 1; int read = 0, stat = 1;
while(readlen > 0 && stat > 0) while (readlen > 0 && stat > 0)
{ {
stat = antd_recv(rq->client, buf, readlen); stat = antd_recv(rq->client, buf, readlen);
if(stat > 0) if (stat > 0)
{ {
read += stat; read += stat;
readlen = (clen - read) > BUFFLEN?BUFFLEN:(clen-read); readlen = (clen - read) > BUFFLEN ? BUFFLEN : (clen - read);
write(fd, buf, stat); write(fd, buf, stat);
} }
} }
} }
static char * get_cgi_bin(antd_request_t* rq) static char *get_cgi_bin(antd_request_t *rq)
{ {
char* tmp = (char*)dvalue(rq->request, "RESOURCE_PATH"); char *tmp = (char *)dvalue(rq->request, "RESOURCE_PATH");
if(!tmp) return NULL; if (!tmp)
return NULL;
tmp = ext(tmp); tmp = ext(tmp);
if(!tmp) return NULL; if (!tmp)
char* bin = (char*)dvalue(cgi_bin,tmp); return NULL;
char *bin = (char *)dvalue(cgi_bin, tmp);
free(tmp); free(tmp);
return bin; return bin;
} }
static list get_env_vars(antd_request_t* rq) static list get_env_vars(antd_request_t *rq)
{ {
char* tmp = NULL; char *tmp = NULL;
char* sub = NULL; char *sub = NULL;
plugin_header_t* __plugin__ = meta(); plugin_header_t *__plugin__ = meta();
dictionary request = (dictionary) rq->request; dictionary request = (dictionary)rq->request;
dictionary header = (dictionary) dvalue(rq->request,"REQUEST_HEADER"); dictionary header = (dictionary)dvalue(rq->request, "REQUEST_HEADER");
list env_vars = list_init(); list env_vars = list_init();
add_vars(&env_vars, "GATEWAY_INTERFACE", "CGI/1.1"); add_vars(&env_vars, "GATEWAY_INTERFACE", "CGI/1.1");
add_vars(&env_vars, "SERVER_SOFTWARE",SERVER_NAME); add_vars(&env_vars, "SERVER_SOFTWARE", SERVER_NAME);
tmp = (char*)dvalue(request, "REQUEST_QUERY"); tmp = (char *)dvalue(request, "REQUEST_QUERY");
if(!tmp) if (!tmp)
add_vars(&env_vars, "QUERY_STRING", ""); add_vars(&env_vars, "QUERY_STRING", "");
else else
{ {
sub = strchr(tmp,'?'); sub = strchr(tmp, '?');
if(sub) if (sub)
{ {
sub++; sub++;
add_vars(&env_vars, "QUERY_STRING", sub); add_vars(&env_vars, "QUERY_STRING", sub);
@ -106,30 +111,30 @@ static list get_env_vars(antd_request_t* rq)
else else
add_vars(&env_vars, "QUERY_STRING", ""); add_vars(&env_vars, "QUERY_STRING", "");
} }
tmp = (char*)dvalue(request, "METHOD"); tmp = (char *)dvalue(request, "METHOD");
if(tmp) if (tmp)
add_vars(&env_vars, "REQUEST_METHOD", tmp); add_vars(&env_vars, "REQUEST_METHOD", tmp);
tmp = (char*)dvalue(header, "Content-Type"); tmp = (char *)dvalue(header, "Content-Type");
if(tmp) if (tmp)
add_vars(&env_vars, "CONTENT_TYPE", tmp); add_vars(&env_vars, "CONTENT_TYPE", tmp);
else else
add_vars(&env_vars, "CONTENT_TYPE", ""); add_vars(&env_vars, "CONTENT_TYPE", "");
tmp = (char*)dvalue(header, "Content-Length"); tmp = (char *)dvalue(header, "Content-Length");
if(tmp) if (tmp)
add_vars(&env_vars, "CONTENT_LENGTH", tmp); add_vars(&env_vars, "CONTENT_LENGTH", tmp);
else else
add_vars(&env_vars, "CONTENT_LENGTH", ""); add_vars(&env_vars, "CONTENT_LENGTH", "");
add_vars(&env_vars, "DOCUMENT_ROOT", __plugin__->htdocs); add_vars(&env_vars, "DOCUMENT_ROOT", __plugin__->htdocs);
tmp = (char*) dvalue(request, "REQUEST_PATH"); tmp = (char *)dvalue(request, "REQUEST_PATH");
if(tmp) if (tmp)
add_vars(&env_vars, "PATH_INFO", tmp); add_vars(&env_vars, "PATH_INFO", tmp);
else else
add_vars(&env_vars, "PATH_INFO", ""); add_vars(&env_vars, "PATH_INFO", "");
tmp = (char*) dvalue(header,"REMOTE_ADDR"); tmp = (char *)dvalue(header, "REMOTE_ADDR");
add_vars(&env_vars, "REMOTE_ADDR", tmp); add_vars(&env_vars, "REMOTE_ADDR", tmp);
add_vars(&env_vars, "REMOTE_HOST", tmp); add_vars(&env_vars, "REMOTE_HOST", tmp);
add_vars(&env_vars, "SERVER_NAME", SERVER_NAME); add_vars(&env_vars, "SERVER_NAME", SERVER_NAME);
add_vars(&env_vars, "SERVER_PORT", (char*) dvalue(header, "SERVER_PORT")); add_vars(&env_vars, "SERVER_PORT", (char *)dvalue(header, "SERVER_PORT"));
add_vars(&env_vars, "SERVER_PROTOCOL", "HTTP/1.1"); add_vars(&env_vars, "SERVER_PROTOCOL", "HTTP/1.1");
// add remaining header to the vars // add remaining header to the vars
association it; association it;
@ -137,21 +142,22 @@ static list get_env_vars(antd_request_t* rq)
{ {
tmp = __s("HTTP_%s", it->key); tmp = __s("HTTP_%s", it->key);
char *s = tmp; char *s = tmp;
while (*s) { while (*s)
if(*s == '-') {
if (*s == '-')
*s = '_'; *s = '_';
else if(*s != '_') else if (*s != '_')
*s = toupper((char) *s); *s = toupper((char)*s);
s++; s++;
} }
add_vars(&env_vars, tmp, (char*)it->value); add_vars(&env_vars, tmp, (char *)it->value);
free(tmp); free(tmp);
} }
tmp = (char*)dvalue(request, "RESOURCE_PATH"); tmp = (char *)dvalue(request, "RESOURCE_PATH");
if(tmp) if (tmp)
{ {
add_vars(&env_vars, "SCRIPT_NAME", tmp); add_vars(&env_vars, "SCRIPT_NAME", tmp);
tmp = __s("%s/%s",__plugin__->htdocs, tmp); tmp = __s("%s/%s", __plugin__->htdocs, tmp);
add_vars(&env_vars, "SCRIPT_FILENAME", tmp); add_vars(&env_vars, "SCRIPT_FILENAME", tmp);
add_vars(&env_vars, "PATH_TRANSLATED", tmp); add_vars(&env_vars, "PATH_TRANSLATED", tmp);
free(tmp); free(tmp);
@ -163,25 +169,25 @@ static list get_env_vars(antd_request_t* rq)
add_vars(&env_vars, "SCRIPT_NAME", ""); add_vars(&env_vars, "SCRIPT_NAME", "");
} }
// redirect status for php // redirect status for php
add_vars(&env_vars,"REDIRECT_STATUS","200"); add_vars(&env_vars, "REDIRECT_STATUS", "200");
return env_vars; return env_vars;
} }
void* handle(void* data) void *handle(void *data)
{ {
antd_request_t *rq = (antd_request_t *)data; antd_request_t *rq = (antd_request_t *)data;
void *cl = (void *)rq->client; void *cl = (void *)rq->client;
pid_t pid = 0, wpid; pid_t pid = 0;
int inpipefd[2]; int inpipefd[2];
int outpipefd[2]; int outpipefd[2];
char buf[BUFFLEN]; char buf[BUFFLEN];
int status; int status;
antd_task_t* task = NULL; antd_task_t *task = NULL;
task = antd_create_task(NULL, data, NULL); task = antd_create_task(NULL, data, NULL);
task->priority++; task->priority++;
list env_vars = NULL; list env_vars = NULL;
char* bin = get_cgi_bin(rq); char *bin = get_cgi_bin(rq);
if(!bin) if (!bin)
{ {
LOG("No cgi bin found\n"); LOG("No cgi bin found\n");
unknow(cl); unknow(cl);
@ -191,10 +197,10 @@ void* handle(void* data)
// now exec the cgi bin // now exec the cgi bin
item np = env_vars; item np = env_vars;
int size = list_size(env_vars); int size = list_size(env_vars);
char** envs = (char**) malloc((size+1)*sizeof(*envs)); char **envs = (char **)malloc((size + 1) * sizeof(*envs));
envs[size] = NULL; envs[size] = NULL;
int i = 0; int i = 0;
while(np) while (np)
{ {
envs[i] = np->value.s; envs[i] = np->value.s;
np = np->next; np = np->next;
@ -213,7 +219,7 @@ void* handle(void* data)
//ask kernel to deliver SIGTERM in case the parent dies //ask kernel to deliver SIGTERM in case the parent dies
//prctl(PR_SET_PDEATHSIG, SIGTERM); //prctl(PR_SET_PDEATHSIG, SIGTERM);
char *argv[] = { bin, 0 }; char *argv[] = {bin, 0};
execve(argv[0], &argv[0], envs); execve(argv[0], &argv[0], envs);
// Nothing below this line should be executed by child process. If so, // Nothing below this line should be executed by child process. If so,
// it means that the execl function wasn't successfull, so lets exit: // it means that the execl function wasn't successfull, so lets exit:
@ -227,10 +233,36 @@ void* handle(void* data)
// Now, we can write to outpipefd[1] and read from inpipefd[0] : // Now, we can write to outpipefd[1] and read from inpipefd[0] :
write_request_body(rq, outpipefd[1]); write_request_body(rq, outpipefd[1]);
LOG("Wait for respond\n");
set_status(cl, 200, "OK");
wpid = 0;
set_status(cl, 200, "OK");
//wpid = 0;
//waitpid(pid, &status, 0); // wait for the child finish
// WNOHANG
while (1)
{
memset(buf, 0, sizeof(buf));
ssize_t count = read(inpipefd[0], buf, BUFFLEN);
if (count == -1)
{
if (errno == EINTR)
{
continue;
}
else
{
break;
}
}
else if (count == 0)
{
break;
}
else
{
antd_send(cl, buf, count);
}
}
/*
do { do {
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
int r = read(inpipefd[0], buf, BUFFLEN-1); int r = read(inpipefd[0], buf, BUFFLEN-1);
@ -238,8 +270,10 @@ void* handle(void* data)
{ {
__t(cl, buf); __t(cl, buf);
} }
wpid = waitpid(pid, &status, WNOHANG);
} while(wpid == 0); } while(wpid == 0);
*/
kill(pid, SIGKILL);
waitpid(pid, &status, 0);
free(envs); free(envs);
list_free(&env_vars); list_free(&env_vars);
return task; return task;