X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/blobdiff_plain/1e8d78b987550c351f47b204d3c9649cc1872e45..815e510ac8f79ac0c3ba2032a98e919e43df1a02:/httpd.c diff --git a/httpd.c b/httpd.c index d03e1c5..aa40084 100644 --- a/httpd.c +++ b/httpd.c @@ -2,25 +2,8 @@ * httpd.c: implementation of httpd.h. */ -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "malloc.h" +#include "agedu.h" +#include "alloc.h" #include "html.h" #include "httpd.h" @@ -66,7 +49,7 @@ static char *http_error(char *code, char *errmsg, char *extraheader, { return dupfmt("HTTP/1.1 %s %s\r\n" "Date: %D\r\n" - "Server: agedu\r\n" + "Server: " PNAME "\r\n" "Connection: close\r\n" "%s" "Content-Type: text/html; charset=US-ASCII\r\n" @@ -87,7 +70,7 @@ static char *http_success(char *mimetype, int stuff_cr, char *document) return dupfmt("HTTP/1.1 200 OK\r\n" "Date: %D\r\n" "Expires: %D\r\n" - "Server: agedu\r\n" + "Server: " PNAME "\r\n" "Connection: close\r\n" "Content-Type: %s\r\n" "\r\n" @@ -107,7 +90,7 @@ char *got_data(struct connctx *ctx, char *data, int length, const struct html_config *cfg) { char *line, *p, *q, *r, *z1, *z2, c1, c2; - int auth_provided = 0, auth_correct = 0; + int auth_correct = 0; unsigned long index; char *document, *ret; @@ -186,7 +169,7 @@ char *got_data(struct connctx *ctx, char *data, int length, /* Restore the request to the way we received it. */ *z2 = c2; *z1 = c1; - text = dupfmt("agedu received the HTTP request" + text = dupfmt("" PNAME " received the HTTP request" " \"%h\", which contains no URL.", line); ret = http_error("400", "Bad request", NULL, text); @@ -252,7 +235,6 @@ char *got_data(struct connctx *ctx, char *data, int length, p = q; } if (p < q) { - auth_provided = 1; while (p < q && isspace((unsigned char)*p)) p++; r = p; @@ -277,25 +259,31 @@ char *got_data(struct connctx *ctx, char *data, int length, } if (!magic_access && !auth_correct) { - if (auth_string && !auth_provided) { + if (auth_string) { ret = http_error("401", "Unauthorized", - "WWW-Authenticate: Basic realm=\"agedu\"\r\n", - "Please authenticate to view these pages."); + "WWW-Authenticate: Basic realm=\""PNAME"\"\r\n", + "\nYou must authenticate to view these pages."); } else { ret = http_error("403", "Forbidden", NULL, "This is a restricted-access set of pages."); } } else { + char *q; p = ctx->url; p += strspn(p, "/?"); - index = strtoul(p, NULL, 10); - document = html_query(ctx->t, index, cfg); - if (document) { - ret = http_success("text/html", 1, document); - sfree(document); - } else { + index = strtoul(p, &q, 10); + if (*q) { ret = http_error("404", "Not Found", NULL, - "Pathname index out of range."); + "This is not a valid pathname index."); + } else { + document = html_query(ctx->t, index, cfg, 1); + if (document) { + ret = http_success("text/html", 1, document); + sfree(document); + } else { + ret = http_error("404", "Not Found", NULL, + "Pathname index out of range."); + } } } return ret; @@ -379,9 +367,11 @@ int check_owning_uid(int fd, int flip) while (fgets(linebuf, sizeof(linebuf), fp)) { if (strlen(linebuf) >= 75 && !strncmp(linebuf+6, matchbuf, strlen(matchbuf))) { + fclose(fp); return atoi(linebuf + 75); } } + fclose(fp); } return -1; @@ -420,16 +410,14 @@ static void base64_encode_atom(unsigned char *data, int n, char *out) void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, const struct html_config *incfg) { - int fd; + int fd, ret; int authtype; char *authstring = NULL; - unsigned long ipaddr; - struct fd *f; struct sockaddr_in addr; socklen_t addrlen; struct html_config cfg = *incfg; - cfg.format = "%lu"; + cfg.format = "%.0lu"; /* * Establish the listening socket and retrieve its port @@ -440,21 +428,40 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, fprintf(stderr, "socket(PF_INET): %s\n", strerror(errno)); exit(1); } + memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; if (!dcfg->address) { +#ifdef RANDOM_LOCALHOST + unsigned long ipaddr; srand(0L); ipaddr = 0x7f000000; ipaddr += (1 + rand() % 255) << 16; ipaddr += (1 + rand() % 255) << 8; ipaddr += (1 + rand() % 255); addr.sin_addr.s_addr = htonl(ipaddr); +#else + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); +#endif addr.sin_port = htons(0); } else { addr.sin_addr.s_addr = inet_addr(dcfg->address); - addr.sin_port = dcfg->port ? htons(dcfg->port) : 80; + addr.sin_port = dcfg->port ? htons(dcfg->port) : 0; } addrlen = sizeof(addr); - if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { + ret = bind(fd, (const struct sockaddr *)&addr, addrlen); +#ifdef RANDOM_LOCALHOST + if (ret < 0 && errno == EADDRNOTAVAIL && !dcfg->address) { + /* + * Some systems don't like us binding to random weird + * localhost-space addresses. Try again with the official + * INADDR_LOOPBACK. + */ + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + addr.sin_port = htons(0); + ret = bind(fd, (const struct sockaddr *)&addr, addrlen); + } +#endif + if (ret < 0) { fprintf(stderr, "bind: %s\n", strerror(errno)); exit(1); } @@ -487,7 +494,7 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, if (dcfg->basicauthdata) { userpass = dcfg->basicauthdata; } else { - sprintf(username, "agedu"); + strcpy(username, PNAME); rname = "/dev/urandom"; fd = open(rname, O_RDONLY); if (fd < 0) { @@ -551,22 +558,22 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, if (authmask != HTTPD_AUTH_NONE) printf("Web server is unauthenticated\n"); } else { - fprintf(stderr, "agedu: authentication method not supported\n"); + fprintf(stderr, PNAME ": authentication method not supported\n"); exit(1); } - if (!dcfg->address) { - if (ntohs(addr.sin_port) == 80) { - printf("URL: http://%s/\n", inet_ntoa(addr.sin_addr)); - } else { - printf("URL: http://%s:%d/\n", - inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); - } + if (ntohs(addr.sin_addr.s_addr) == INADDR_ANY) { + printf("Server port: %d\n", ntohs(addr.sin_port)); + } else if (ntohs(addr.sin_port) == 80) { + printf("URL: http://%s/\n", inet_ntoa(addr.sin_addr)); + } else { + printf("URL: http://%s:%d/\n", + inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); } /* * Now construct an fd structure to hold it. */ - f = new_fdstruct(fd, FD_LISTENER); + new_fdstruct(fd, FD_LISTENER); /* * Read from standard input, and treat EOF as a notification @@ -580,7 +587,9 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, */ while (1) { fd_set rfds, wfds; - int i, j, maxfd, ret; + int i, j; + SELECT_TYPE_ARG1 maxfd; + int ret; #define FD_SET_MAX(fd, set, max) \ do { FD_SET((fd),(set)); (max) = ((max)<=(fd)?(fd)+1:(max)); } while(0) @@ -604,6 +613,8 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, switch (fds[i].type) { case FD_CLIENT: + FD_SET_MAX(fds[i].fd, &rfds, maxfd); + break; case FD_LISTENER: FD_SET_MAX(fds[i].fd, &rfds, maxfd); break; @@ -629,7 +640,9 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg, } nfds = i; - ret = select(maxfd, &rfds, &wfds, NULL, NULL); + ret = select(maxfd, SELECT_TYPE_ARG234 &rfds, + SELECT_TYPE_ARG234 &wfds, SELECT_TYPE_ARG234 NULL, + SELECT_TYPE_ARG5 NULL); if (ret <= 0) { if (ret < 0 && (errno != EINTR)) { fprintf(stderr, "select: %s", strerror(errno));