fix user chroot issue + style
This commit is contained in:
parent
843d1f0ab7
commit
15d09d2c01
133
main.c
133
main.c
|
@ -24,9 +24,9 @@
|
||||||
#define GEMINI_PART 9
|
#define GEMINI_PART 9
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* number of bytes to read with fgets() : 2014 + 1
|
* number of bytes to read with fgets() : 2014 + 1.
|
||||||
* fgets() reads at most size-1 (1024 here)
|
* fgets() reads at most size-1 (1024 here).
|
||||||
* see https://gemini.circumlunar.space/docs/specification.html.
|
* See https://gemini.circumlunar.space/docs/specification.html.
|
||||||
*/
|
*/
|
||||||
#define GEMINI_REQUEST_MAX 1025
|
#define GEMINI_REQUEST_MAX 1025
|
||||||
|
|
||||||
|
@ -69,24 +69,22 @@ uridecode(char *uri)
|
||||||
long l = 0;
|
long l = 0;
|
||||||
char *pos = NULL;
|
char *pos = NULL;
|
||||||
|
|
||||||
if ((pos = strchr(uri, '%')) == NULL) {
|
if ((pos = strchr(uri, '%')) == NULL)
|
||||||
return n;
|
return n;
|
||||||
}
|
|
||||||
while ((pos = strchr(pos, '%')) != NULL) {
|
while ((pos = strchr(pos, '%')) != NULL) {
|
||||||
if (strlen(pos) < 3) {
|
if (strlen(pos) < 3)
|
||||||
return n;
|
return n;
|
||||||
}
|
|
||||||
|
|
||||||
char hex[3] = {'\0'};
|
char hex[3] = {'\0'};
|
||||||
for (size_t i=0; i < 2; i++) {
|
for (size_t i = 0; i < 2; i++)
|
||||||
hex[i] = tolower(pos[i + 1]);
|
hex[i] = tolower(pos[i + 1]);
|
||||||
}
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
l = strtol(hex, 0, 16);
|
l = strtol(hex, 0, 16);
|
||||||
if (errno == ERANGE && (l == LONG_MAX || l == LONG_MIN)) {
|
if (errno == ERANGE && (l == LONG_MAX || l == LONG_MIN))
|
||||||
/* conversion failed */
|
continue; /* conversion failed */
|
||||||
continue;
|
|
||||||
}
|
|
||||||
c = (char)l;
|
c = (char)l;
|
||||||
pos[0] = c;
|
pos[0] = c;
|
||||||
/* rewind of two char to remove %hex */
|
/* rewind of two char to remove %hex */
|
||||||
|
@ -109,17 +107,17 @@ drop_privileges(const char *user, const char *path)
|
||||||
if (strlen(user) > 0) {
|
if (strlen(user) > 0) {
|
||||||
|
|
||||||
/* is root? */
|
/* is root? */
|
||||||
if (getuid() != 0) {
|
if (getuid() != 0)
|
||||||
errlog("chroot requires program to be run as root");
|
errlog("chroot requires program to be run as root");
|
||||||
}
|
|
||||||
/* search user uid from name */
|
/* search user uid from name */
|
||||||
if ((pw = getpwnam(user)) == NULL) {
|
if ((pw = getpwnam(user)) == NULL)
|
||||||
errlog("the user %s can't be found on the system", user);
|
errlog("the user %s can't be found on the system", user);
|
||||||
}
|
|
||||||
/* chroot worked? */
|
/* chroot worked? */
|
||||||
if (chroot(path) != 0) {
|
if (chroot(path) != 0)
|
||||||
errlog("the chroot_dir %s can't be used for chroot", path);
|
errlog("the chroot_dir %s can't be used for chroot", path);
|
||||||
}
|
|
||||||
chrooted = 1;
|
chrooted = 1;
|
||||||
echdir("/");
|
echdir("/");
|
||||||
/* drop privileges */
|
/* drop privileges */
|
||||||
|
@ -129,41 +127,40 @@ drop_privileges(const char *user, const char *path)
|
||||||
errlog("dropping privileges to user %s (uid=%i) failed",
|
errlog("dropping privileges to user %s (uid=%i) failed",
|
||||||
user, pw->pw_uid);
|
user, pw->pw_uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#ifdef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
/*
|
/*
|
||||||
* prevent access to files other than the one in path
|
* prevent access to files other than the one in path
|
||||||
*/
|
*/
|
||||||
if (chrooted) {
|
if (chrooted)
|
||||||
eunveil("/", "r");
|
eunveil("/", "r");
|
||||||
} else {
|
else
|
||||||
eunveil(path, "r");
|
eunveil(path, "r");
|
||||||
}
|
|
||||||
/* permission to execute what's inside cgidir */
|
/* permission to execute what's inside cgidir */
|
||||||
if (strlen(cgidir) > 0) {
|
if (strlen(cgidir) > 0)
|
||||||
eunveil(cgidir, "rx");
|
eunveil(cgidir, "rx");
|
||||||
}
|
|
||||||
eunveil(NULL, NULL); /* no more call to unveil() */
|
eunveil(NULL, NULL); /* no more call to unveil() */
|
||||||
|
|
||||||
/* promise permissions */
|
/* promise permissions */
|
||||||
if (strlen(cgidir) > 0) {
|
if (strlen(cgidir) > 0)
|
||||||
epledge("stdio rpath exec", NULL);
|
epledge("stdio rpath exec", NULL);
|
||||||
} else {
|
else
|
||||||
epledge("stdio rpath", NULL);
|
epledge("stdio rpath", NULL);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
if (!chrooted)
|
||||||
|
echdir(path); /* move to the gemini data directory */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
status(const int code, const char *file_mime)
|
status(const int code, const char *file_mime)
|
||||||
{
|
{
|
||||||
if (strcmp(file_mime, "text/gemini") == 0) {
|
if (strcmp(file_mime, "text/gemini") == 0)
|
||||||
printf("%i %s; %s\r\n", code, file_mime, lang);
|
printf("%i %s; %s\r\n", code, file_mime, lang);
|
||||||
} else {
|
else
|
||||||
printf("%i %s\r\n", code, file_mime);
|
printf("%i %s\r\n", code, file_mime);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
status_redirect(const int code, const char *url)
|
status_redirect(const int code, const char *url)
|
||||||
|
@ -188,9 +185,13 @@ display_file(const char *fname)
|
||||||
const char *file_mime;
|
const char *file_mime;
|
||||||
char *buffer[BUFSIZ];
|
char *buffer[BUFSIZ];
|
||||||
char target[FILENAME_MAX] = {'\0'};
|
char target[FILENAME_MAX] = {'\0'};
|
||||||
char tmp[PATH_MAX] = {'\0'}; /* used to build temporary path */
|
char tmp[PATH_MAX] = {'\0'}; /* used to build
|
||||||
|
* temporary path */
|
||||||
|
|
||||||
/* special case : fname empty. The user requested just the directory name */
|
/*
|
||||||
|
* special case : fname empty. The user requested just the directory
|
||||||
|
* name
|
||||||
|
*/
|
||||||
if (strlen(fname) == 0) {
|
if (strlen(fname) == 0) {
|
||||||
if (stat("index.gmi", &sb) == 0) {
|
if (stat("index.gmi", &sb) == 0) {
|
||||||
/* there is index.gmi in the current directory */
|
/* there is index.gmi in the current directory */
|
||||||
|
@ -204,17 +205,17 @@ display_file(const char *fname)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* this is to check if path exists and obtain metadata later */
|
/* this is to check if path exists and obtain metadata later */
|
||||||
if (stat(fname, &sb) == -1) {
|
if (stat(fname, &sb) == -1) {
|
||||||
/* check if fname is a symbolic link
|
/*
|
||||||
* if so, redirect using its target */
|
* check if fname is a symbolic link if so, redirect using
|
||||||
|
* its target
|
||||||
|
*/
|
||||||
if (lstat(fname, &sb) != -1 && S_ISLNK(sb.st_mode) == 1)
|
if (lstat(fname, &sb) != -1 && S_ISLNK(sb.st_mode) == 1)
|
||||||
goto redirect;
|
goto redirect;
|
||||||
else
|
else
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if directory */
|
/* check if directory */
|
||||||
if (S_ISDIR(sb.st_mode) != 0) {
|
if (S_ISDIR(sb.st_mode) != 0) {
|
||||||
/* no ending "/", redirect to "fname/" */
|
/* no ending "/", redirect to "fname/" */
|
||||||
|
@ -223,9 +224,9 @@ display_file(const char *fname)
|
||||||
status_redirect(31, tmp);
|
status_redirect(31, tmp);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* open the file requested */
|
/* open the file requested */
|
||||||
if ((fd = fopen(fname, "r")) == NULL) { goto err; }
|
if ((fd = fopen(fname, "r")) == NULL)
|
||||||
|
goto err;
|
||||||
|
|
||||||
file_mime = get_file_mime(fname, default_mime);
|
file_mime = get_file_mime(fname, default_mime);
|
||||||
|
|
||||||
|
@ -247,18 +248,16 @@ err:
|
||||||
|
|
||||||
redirect:
|
redirect:
|
||||||
/* read symbolic link target to redirect */
|
/* read symbolic link target to redirect */
|
||||||
if (readlink(fname, target, FILENAME_MAX) == -1) {
|
if (readlink(fname, target, FILENAME_MAX) == -1)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
|
||||||
|
|
||||||
status_redirect(30, target);
|
status_redirect(30, target);
|
||||||
syslog(LOG_DAEMON, "redirection from %s to %s", fname, target);
|
syslog(LOG_DAEMON, "redirection from %s to %s", fname, target);
|
||||||
|
|
||||||
closefd:
|
closefd:
|
||||||
if (S_ISREG(sb.st_mode) != 0) {
|
if (S_ISREG(sb.st_mode) != 0)
|
||||||
fclose(fd);
|
fclose(fd);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
autoindex(const char *path)
|
autoindex(const char *path)
|
||||||
|
@ -284,11 +283,10 @@ autoindex(const char *path)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
/* add "/" at the end of a directory path */
|
/* add "/" at the end of a directory path */
|
||||||
if (namelist[j]->d_type == DT_DIR) {
|
if (namelist[j]->d_type == DT_DIR)
|
||||||
printf("=> ./%s/ %s/\n", namelist[j]->d_name, namelist[j]->d_name);
|
printf("=> ./%s/ %s/\n", namelist[j]->d_name, namelist[j]->d_name);
|
||||||
} else {
|
else
|
||||||
printf("=> ./%s %s\n", namelist[j]->d_name, namelist[j]->d_name);
|
printf("=> ./%s %s\n", namelist[j]->d_name, namelist[j]->d_name);
|
||||||
}
|
|
||||||
free(namelist[j]);
|
free(namelist[j]);
|
||||||
}
|
}
|
||||||
free(namelist);
|
free(namelist);
|
||||||
|
@ -381,13 +379,11 @@ main(int argc, char **argv)
|
||||||
errlog("Error while reading request: %s", request);
|
errlog("Error while reading request: %s", request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if string ends with '\n', or to long */
|
/* check if string ends with '\n', or to long */
|
||||||
if (request[strnlen(request, GEMINI_REQUEST_MAX) - 1] != '\n') {
|
if (request[strnlen(request, GEMINI_REQUEST_MAX) - 1] != '\n') {
|
||||||
status(59, "request is too long (1024 max)");
|
status(59, "request is too long (1024 max)");
|
||||||
errlog("request is too long (1024 max): %s", request);
|
errlog("request is too long (1024 max): %s", request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* remove \r\n at the end of string */
|
/* remove \r\n at the end of string */
|
||||||
pos = strchr(request, '\r');
|
pos = strchr(request, '\r');
|
||||||
if (pos != NULL)
|
if (pos != NULL)
|
||||||
|
@ -408,11 +404,8 @@ main(int argc, char **argv)
|
||||||
memmove(request, request + GEMINI_PART, strlen(request) + 1 - GEMINI_PART);
|
memmove(request, request + GEMINI_PART, strlen(request) + 1 - GEMINI_PART);
|
||||||
|
|
||||||
/* remove all "/.." for safety reasons */
|
/* remove all "/.." for safety reasons */
|
||||||
while ((pos = strstr(request, "/..")) != NULL ) {
|
while ((pos = strstr(request, "/..")) != NULL)
|
||||||
memmove(request, pos + 3, strlen(pos) + 1 - 3); /* "/.." = 3 */
|
memmove(request, pos + 3, strlen(pos) + 1 - 3); /* "/.." = 3 */
|
||||||
}
|
|
||||||
|
|
||||||
echdir(chroot_dir); /* move to chroot */
|
|
||||||
|
|
||||||
/* look for hostname in request : first thing before first / if any */
|
/* look for hostname in request : first thing before first / if any */
|
||||||
pos = strchr(request, '/');
|
pos = strchr(request, '/');
|
||||||
|
@ -422,21 +415,18 @@ main(int argc, char **argv)
|
||||||
/* just keep hostname in request : stop the string with \0 */
|
/* just keep hostname in request : stop the string with \0 */
|
||||||
pos[0] = '\0';
|
pos[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check if client added :port at end of hostname and remove it */
|
/* check if client added :port at end of hostname and remove it */
|
||||||
pos = strchr(request, ':');
|
pos = strchr(request, ':');
|
||||||
if (pos != NULL) {
|
if (pos != NULL) {
|
||||||
/* end string at : */
|
/* end string at : */
|
||||||
pos[0] = '\0';
|
pos[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
/* copy hostname from request */
|
/* copy hostname from request */
|
||||||
estrlcpy(hostname, request, sizeof(hostname));
|
estrlcpy(hostname, request, sizeof(hostname));
|
||||||
|
|
||||||
/* remove leading '/' in dir */
|
/* remove leading '/' in dir */
|
||||||
while (dir[0] == '/') {
|
while (dir[0] == '/')
|
||||||
memmove(dir, dir + 1, strlen(dir + 1) + 1);
|
memmove(dir, dir + 1, strlen(dir + 1) + 1);
|
||||||
}
|
|
||||||
|
|
||||||
if (virtualhost) {
|
if (virtualhost) {
|
||||||
/* add hostname at the beginning of the dir path */
|
/* add hostname at the beginning of the dir path */
|
||||||
|
@ -446,42 +436,45 @@ main(int argc, char **argv)
|
||||||
estrlcat(tmp, dir, sizeof(tmp));
|
estrlcat(tmp, dir, sizeof(tmp));
|
||||||
estrlcpy(dir, tmp, sizeof(dir));
|
estrlcpy(dir, tmp, sizeof(dir));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* percent decode */
|
/* percent decode */
|
||||||
uridecode(dir);
|
uridecode(dir);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* split dir and filename.
|
* split dir and filename. file is last part after last '/'. if none
|
||||||
* file is last part after last '/'.
|
* found, then requested file is actually a directory
|
||||||
* if none found, then requested file is actually a directory
|
|
||||||
*/
|
*/
|
||||||
if (strlen(dir) > 0) {
|
if (strlen(dir) > 0) {
|
||||||
pos = strrchr(dir, '/');
|
pos = strrchr(dir, '/');
|
||||||
if (pos != NULL) {
|
if (pos != NULL) {
|
||||||
estrlcpy(file, pos + 1, sizeof(file)); /* +1 : no leading '/' */
|
estrlcpy(file, pos + 1, sizeof(file)); /* +1 : no leading '/' */
|
||||||
pos[0] = '\0';
|
pos[0] = '\0';
|
||||||
if (strlen(dir) > 0) {
|
|
||||||
echdir(dir); /* change directory to requested directory */
|
/* change directory to requested directory */
|
||||||
}
|
if (strlen(dir) > 0)
|
||||||
|
echdir(dir);
|
||||||
} else {
|
} else {
|
||||||
estrlcpy(file, dir, sizeof(file));
|
estrlcpy(file, dir, sizeof(file));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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(cgifp));
|
estrlcpy(cgifp, chroot_dir, sizeof(cgifp));
|
||||||
if (cgifp[strlen(cgifp)-1] != '/') {
|
if (cgifp[strlen(cgifp) - 1] != '/')
|
||||||
estrlcat(cgifp, "/", sizeof(cgifp));
|
estrlcat(cgifp, "/", sizeof(cgifp));
|
||||||
}
|
|
||||||
estrlcat(cgifp, dir, sizeof(cgifp));
|
estrlcat(cgifp, dir, sizeof(cgifp));
|
||||||
if (strcmp(cgifp, cgidir) != 0) {
|
|
||||||
/* not cgipath, display file content */
|
/* not cgipath, display file content */
|
||||||
|
if (strcmp(cgifp, cgidir) != 0)
|
||||||
goto file_to_stdout;
|
goto file_to_stdout;
|
||||||
}
|
|
||||||
/* set env variables for CGI */
|
/* set env variables for CGI */
|
||||||
/* see https://lists.orbitalfox.eu/archives/gemini/2020/000315.html */
|
/*
|
||||||
|
* see
|
||||||
|
* https://lists.orbitalfox.eu/archives/gemini/2020/000315.htm
|
||||||
|
* l
|
||||||
|
*/
|
||||||
esetenv("GATEWAY_INTERFACE", "CGI/1.1", 1);
|
esetenv("GATEWAY_INTERFACE", "CGI/1.1", 1);
|
||||||
esetenv("SERVER_PROTOCOL", "GEMINI", 1);
|
esetenv("SERVER_PROTOCOL", "GEMINI", 1);
|
||||||
esetenv("SERVER_SOFTWARE", "vger/1", 1);
|
esetenv("SERVER_SOFTWARE", "vger/1", 1);
|
||||||
|
@ -493,7 +486,6 @@ main(int argc, char **argv)
|
||||||
esetenv("QUERY_STRING", query, 1);
|
esetenv("QUERY_STRING", query, 1);
|
||||||
pos[0] = '\0';
|
pos[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
/* look for an extension to find PATH_INFO */
|
/* look for an extension to find PATH_INFO */
|
||||||
pos = strrchr(file, '.');
|
pos = strrchr(file, '.');
|
||||||
if (pos != NULL) {
|
if (pos != NULL) {
|
||||||
|
@ -510,7 +502,6 @@ main(int argc, char **argv)
|
||||||
cgi(file);
|
cgi(file);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
file_to_stdout:
|
file_to_stdout:
|
||||||
/* regular file to stdout */
|
/* regular file to stdout */
|
||||||
display_file(file);
|
display_file(file);
|
||||||
|
|
Loading…
Reference in New Issue