mike/vger
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix cgi error (file not found) and useless 'unveil' pledge promise

Browse source
This commit is contained in:
prx 2021-04-30 09:38:12 +02:00
parent 4972df5999
commit f8aff7fe05
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main.c
View file

@ -150,7 +150,7 @@ drop_privileges(const char *user, const char *path)
if (strlen(cgidir) > 0) { if (strlen(cgidir) > 0) {
epledge("stdio rpath exec", NULL); epledge("stdio rpath exec", NULL);
} else { } else {
epledge("stdio rpath unveil", NULL); epledge("stdio rpath", NULL);
} }
#endif #endif
} }
@ -299,10 +299,10 @@ void
cgi(const char *cgicmd) cgi(const char *cgicmd)
{ {
/* run cgicmd replacing current process */ /* run cgicmd replacing current process */
execlp(cgicmd, cgicmd, NULL); execl(cgicmd, cgicmd, NULL);
/* if execlp is ok, this will never be reached */ /* if execl is ok, this will never be reached */
status(42, "Couldn't execute CGI script"); status(42, "Couldn't execute CGI script");
errlog("error when trying to execlp %s", cgicmd); errlog("error when trying to execl %s", cgicmd);
exit(1); exit(1);
} }
@ -471,11 +471,11 @@ main(int argc, char **argv)
if (docgi) { if (docgi) {
/* check if directory is cgidir */ /* check if directory is cgidir */
char cgifp[PATH_MAX] = {'\0'}; char cgifp[PATH_MAX] = {'\0'};
estrlcpy(cgifp, chroot_dir, sizeof(chroot_dir)); estrlcpy(cgifp, chroot_dir, sizeof(cgifp));
if (cgifp[strlen(cgifp)-1] != '/') { if (cgifp[strlen(cgifp)-1] != '/') {
estrlcat(cgifp, "/", sizeof(chroot_dir)); estrlcat(cgifp, "/", sizeof(cgifp));
} }
estrlcat(cgifp, dir, sizeof(chroot_dir)); estrlcat(cgifp, dir, sizeof(cgifp));
if (strcmp(cgifp, cgidir) != 0) { if (strcmp(cgifp, cgidir) != 0) {
/* not cgipath, display file content */ /* not cgipath, display file content */
goto file_to_stdout; goto file_to_stdout;