X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/blobdiff_plain/f2e528936aac5fb2f68693ce8cda348c2a7c1a91..56cae6e16d22dfba1aafe91dc3465a684d808124:/httpd.c diff --git a/httpd.c b/httpd.c index b08f6ef..bbe82ab 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" @@ -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); @@ -277,10 +260,10 @@ 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", + "\nYou must authenticate to view these pages."); } else { ret = http_error("403", "Forbidden", NULL, "This is a restricted-access set of pages."); @@ -417,18 +400,19 @@ static void base64_encode_atom(unsigned char *data, int n, char *out) out[3] = '='; } -void run_httpd(const void *t, int authmask, const struct html_config *incfg) +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, authbuf[512]; + 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,15 +424,32 @@ void run_httpd(const void *t, int authmask, const struct html_config *incfg) exit(1); } addr.sin_family = AF_INET; - 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); - addr.sin_port = htons(0); + if (!dcfg->address) { + 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); + addr.sin_port = htons(0); + + } else { + addr.sin_addr.s_addr = inet_addr(dcfg->address); + 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); + 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); + } + if (ret < 0) { fprintf(stderr, "bind: %s\n", strerror(errno)); exit(1); } @@ -464,73 +465,98 @@ void run_httpd(const void *t, int authmask, const struct html_config *incfg) if ((authmask & HTTPD_AUTH_MAGIC) && (check_owning_uid(fd, 1) == getuid())) { authtype = HTTPD_AUTH_MAGIC; - printf("Using Linux /proc/net magic authentication\n"); + if (authmask != HTTPD_AUTH_MAGIC) + printf("Using Linux /proc/net magic authentication\n"); } else if ((authmask & HTTPD_AUTH_BASIC)) { - char username[128], password[128], userpass[259]; + char username[128], password[128], userpassbuf[259]; + const char *userpass; const char *rname; unsigned char passbuf[10]; int i, j, k, fd; authtype = HTTPD_AUTH_BASIC; - sprintf(username, "agedu"); - rname = "/dev/urandom"; - fd = open(rname, O_RDONLY); - if (fd < 0) { - int err = errno; - rname = "/dev/random"; + if (authmask != HTTPD_AUTH_BASIC) + printf("Using HTTP Basic authentication\n"); + + if (dcfg->basicauthdata) { + userpass = dcfg->basicauthdata; + } else { + strcpy(username, PNAME); + rname = "/dev/urandom"; fd = open(rname, O_RDONLY); if (fd < 0) { - int err2 = errno; - fprintf(stderr, "/dev/urandom: open: %s\n", strerror(err)); - fprintf(stderr, "/dev/random: open: %s\n", strerror(err2)); - exit(1); + int err = errno; + rname = "/dev/random"; + fd = open(rname, O_RDONLY); + if (fd < 0) { + int err2 = errno; + fprintf(stderr, "/dev/urandom: open: %s\n", strerror(err)); + fprintf(stderr, "/dev/random: open: %s\n", strerror(err2)); + exit(1); + } } - } - for (i = 0; i < 10 ;) { - j = read(fd, passbuf + i, 10 - i); - if (j <= 0) { - fprintf(stderr, "%s: read: %s\n", rname, - j < 0 ? strerror(errno) : "unexpected EOF"); - exit(1); + for (i = 0; i < 10 ;) { + j = read(fd, passbuf + i, 10 - i); + if (j <= 0) { + fprintf(stderr, "%s: read: %s\n", rname, + j < 0 ? strerror(errno) : "unexpected EOF"); + exit(1); + } + i += j; } - i += j; - } - close(fd); - for (i = 0; i < 16; i++) { - /* 32 characters out of the 36 alphanumerics gives me the - * latitude to discard i,l,o for being too numeric-looking, - * and w because it has two too many syllables and one too - * many presidential associations. */ - static const char chars[32] = "0123456789abcdefghjkmnpqrstuvxyz"; - int v = 0; - - k = i / 8 * 5; - for (j = 0; j < 5; j++) - v |= ((passbuf[k+j] >> (i%8)) & 1) << j; - - password[i] = chars[v]; - } - password[i] = '\0'; + close(fd); + for (i = 0; i < 16; i++) { + /* + * 32 characters out of the 36 alphanumerics gives + * me the latitude to discard i,l,o for being too + * numeric-looking, and w because it has two too + * many syllables and one too many presidential + * associations. + */ + static const char chars[32] = + "0123456789abcdefghjkmnpqrstuvxyz"; + int v = 0; - printf("Using HTTP Basic authentication\nUsername: %s\nPassword: %s\n", - username, password); + k = i / 8 * 5; + for (j = 0; j < 5; j++) + v |= ((passbuf[k+j] >> (i%8)) & 1) << j; + + password[i] = chars[v]; + } + password[i] = '\0'; + + sprintf(userpassbuf, "%s:%s", username, password); + userpass = userpassbuf; + + printf("Username: %s\nPassword: %s\n", username, password); + } - k = sprintf(userpass, "%s:%s", username, password); + k = strlen(userpass); + authstring = snewn(k * 4 / 3 + 16, char); for (i = j = 0; i < k ;) { int s = k-i < 3 ? k-i : 3; - base64_encode_atom((unsigned char *)(userpass+i), s, authbuf+j); + base64_encode_atom((unsigned char *)(userpass+i), s, authstring+j); i += s; j += 4; } - authbuf[j] = '\0'; - authstring = authbuf; - } else { + authstring[j] = '\0'; + } else if ((authmask & HTTPD_AUTH_NONE)) { authtype = HTTPD_AUTH_NONE; - printf("Web server is unauthenticated\n"); + if (authmask != HTTPD_AUTH_NONE) + printf("Web server is unauthenticated\n"); + } else { + fprintf(stderr, PNAME ": authentication method not supported\n"); + exit(1); + } + 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)); } - printf("URL: http://%s:%d/\n", - inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); /* * Now construct an fd structure to hold it. @@ -549,7 +575,9 @@ void run_httpd(const void *t, int authmask, const struct html_config *incfg) */ 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) @@ -573,6 +601,8 @@ void run_httpd(const void *t, int authmask, const struct html_config *incfg) 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; @@ -598,7 +628,9 @@ void run_httpd(const void *t, int authmask, const struct html_config *incfg) } 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));