aniani
/
gmnisrv
mirror of https://git.sr.ht/~sircmpwn/gmnisrv
1
0
Fork 1
Code

CGI: Fix paths which end in '/'

This commit is contained in:
Eyal Sawady 2020-11-15 10:54:36 -05:00 committed by Drew DeVault
parent 05a71905f9
commit 0646fd020c
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/serve.c
View File

@ -407,21 +407,34 @@ serve_request(struct gmnisrv_client *client)
if ((n = stat(real_path, &st)) != 0) {
if (route->cgi) {
const char *new;
strcpy(temp_path, client_path);
new = basename((char *)temp_path);
size_t r = strlen(real_path);
if (real_path[r - 1] == '/') {
new = "";
} else {
strcpy(temp_path, client_path);
new = basename((char *)temp_path);
}
size_t l = strlen(new), q = strlen(pathinfo);
memmove(&pathinfo[l + 1], pathinfo, q);
pathinfo[0] = '/';
memcpy(&pathinfo[1], new, l);
strcpy(temp_path, client_path);
new = dirname((char *)temp_path);
strcpy(client_path, new);
if (real_path[r - 1] == '/') {
client_path[strlen(client_path) - 1] = '\0';
} else {
strcpy(temp_path, client_path);
new = dirname((char *)temp_path);
strcpy(client_path, new);
}
strcpy(temp_path, real_path);
new = dirname((char *)temp_path);
strcpy(real_path, new);
if (real_path[r - 1] == '/') {
real_path[r - 1] = '\0';
} else {
strcpy(temp_path, real_path);
new = dirname((char *)temp_path);
strcpy(real_path, new);
}
if (route_match(route, client_path, &url_path)) {
n = snprintf(real_path, sizeof(real_path),