* httpd.c: implementation of httpd.h.
*/
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <syslog.h>
-
-#include "malloc.h"
+#include "agedu.h"
+#include "alloc.h"
#include "html.h"
#include "httpd.h"
{
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"
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"
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;
/* Restore the request to the way we received it. */
*z2 = c2;
*z1 = c1;
- text = dupfmt("<code>agedu</code> received the HTTP request"
+ text = dupfmt("<code>" PNAME "</code> received the HTTP request"
" \"<code>%h</code>\", which contains no URL.",
line);
ret = http_error("400", "Bad request", NULL, text);
p = q;
}
if (p < q) {
- auth_provided = 1;
while (p < q && isspace((unsigned char)*p))
p++;
r = p;
}
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 {
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 {
+ if (!html_parse_path(ctx->t, p, cfg, &index)) {
ret = http_error("404", "Not Found", NULL,
- "Pathname index out of range.");
+ "This is not a valid pathname.");
+ } else {
+ char *canonpath = html_format_path(ctx->t, cfg, index);
+ if (!strcmp(canonpath, p)) {
+ /*
+ * This is a canonical path. Return the document.
+ */
+ 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,
+ "This is not a valid pathname.");
+ }
+ } else {
+ /*
+ * This is a non-canonical path. Return a redirect
+ * to the right one.
+ *
+ * To do this, we must search the request headers
+ * for Host:, to see what the client thought it
+ * was calling our server.
+ */
+
+ char *host = NULL;
+ q = ctx->data + ctx->datalen;
+ for (p = ctx->headers; p < q; p++) {
+ const char *hdr = "Host:";
+ int i;
+ for (i = 0; hdr[i]; i++) {
+ if (p >= q || tolower((unsigned char)*p) !=
+ tolower((unsigned char)hdr[i]))
+ break;
+ p++;
+ }
+ if (!hdr[i])
+ break; /* found our header */
+ p = memchr(p, '\n', q - p);
+ if (!p)
+ p = q;
+ }
+ if (p < q) {
+ while (p < q && isspace((unsigned char)*p))
+ p++;
+ r = p;
+ while (p < q) {
+ if (*p == '\r' && (p+1 >= q || p[1] == '\n'))
+ break;
+ p++;
+ }
+ host = snewn(p-r+1, char);
+ memcpy(host, r, p-r);
+ host[p-r] = '\0';
+ }
+ if (host) {
+ char *header = dupfmt("Location: http://%s%s\r\n",
+ host, canonpath);
+ ret = http_error("301", "Moved", header,
+ "This is not the canonical form of"
+ " this pathname.");
+ sfree(header);
+ } else {
+ ret = http_error("400", "Bad Request", NULL,
+ "Needed a Host: header to return"
+ " the intended redirection.");
+ }
+ }
+ sfree(canonpath);
}
}
return ret;
int check_owning_uid(int fd, int flip)
{
- struct sockaddr_in sock, peer;
+ struct sockaddr_storage sock, peer;
+ int connected;
socklen_t addrlen;
- char linebuf[4096], matchbuf[80];
+ char linebuf[4096], matchbuf[128];
+ char *filename;
+ int matchcol, uidcol;
FILE *fp;
addrlen = sizeof(sock);
exit(1);
}
addrlen = sizeof(peer);
+ connected = 1;
if (getpeername(fd, (struct sockaddr *)&peer, &addrlen)) {
if (errno == ENOTCONN) {
- peer.sin_addr.s_addr = htonl(0);
- peer.sin_port = htons(0);
+ connected = 0;
+ memset(&peer, 0, sizeof(peer));
+ peer.ss_family = sock.ss_family;
} else {
fprintf(stderr, "getpeername: %s\n", strerror(errno));
exit(1);
}
if (flip) {
- struct sockaddr_in tmp = sock;
+ struct sockaddr_storage tmp = sock;
sock = peer;
peer = tmp;
}
- sprintf(matchbuf, "%08X:%04X %08X:%04X",
- peer.sin_addr.s_addr, ntohs(peer.sin_port),
- sock.sin_addr.s_addr, ntohs(sock.sin_port));
- fp = fopen("/proc/net/tcp", "r");
+#ifndef NO_IPV4
+ if (peer.ss_family == AF_INET) {
+ struct sockaddr_in *sock4 = (struct sockaddr_in *)&sock;
+ struct sockaddr_in *peer4 = (struct sockaddr_in *)&peer;
+
+ assert(peer4->sin_family == AF_INET);
+
+ sprintf(matchbuf, "%08X:%04X %08X:%04X",
+ peer4->sin_addr.s_addr, ntohs(peer4->sin_port),
+ sock4->sin_addr.s_addr, ntohs(sock4->sin_port));
+ filename = "/proc/net/tcp";
+ matchcol = 6;
+ uidcol = 75;
+ } else
+#endif
+#ifndef NO_IPV6
+ if (peer.ss_family == AF_INET6) {
+ struct sockaddr_in6 *sock6 = (struct sockaddr_in6 *)&sock;
+ struct sockaddr_in6 *peer6 = (struct sockaddr_in6 *)&peer;
+ char *p;
+
+ assert(peer6->sin6_family == AF_INET6);
+
+ p = matchbuf;
+ for (int i = 0; i < 4; i++)
+ p += sprintf(p, "%08X",
+ ((uint32_t *)peer6->sin6_addr.s6_addr)[i]);
+ p += sprintf(p, ":%04X ", ntohs(peer6->sin6_port));
+ for (int i = 0; i < 4; i++)
+ p += sprintf(p, "%08X",
+ ((uint32_t *)sock6->sin6_addr.s6_addr)[i]);
+ p += sprintf(p, ":%04X", ntohs(sock6->sin6_port));
+
+ filename = "/proc/net/tcp6";
+ matchcol = 6;
+ uidcol = 123;
+ } else
+#endif
+ {
+ return -1; /* unidentified family */
+ }
+
+ fp = fopen(filename, "r");
if (fp) {
while (fgets(linebuf, sizeof(linebuf), fp)) {
- if (strlen(linebuf) >= 75 &&
- !strncmp(linebuf+6, matchbuf, strlen(matchbuf))) {
- return atoi(linebuf + 75);
+ if (strlen(linebuf) >= uidcol &&
+ !strncmp(linebuf+matchcol, matchbuf, strlen(matchbuf))) {
+ fclose(fp);
+ return atoi(linebuf + uidcol);
}
}
+ fclose(fp);
}
return -1;
out[3] = '=';
}
-void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg,
- const struct html_config *incfg)
+struct listenfds {
+ int v4, v6;
+};
+
+static int make_listening_sockets(struct listenfds *fds, const char *address,
+ const char *portstr, char **outhostname)
{
- int fd;
- int authtype;
- char *authstring = NULL;
- unsigned long ipaddr;
- struct fd *f;
- struct sockaddr_in addr;
+ /*
+ * Establish up to 2 listening sockets, for IPv4 and IPv6, on the
+ * same arbitrarily selected port. Return them in fds.v4 and
+ * fds.v6, with each entry being -1 if that socket was not
+ * established at all. Main return value is the port chosen, or <0
+ * if the whole process failed.
+ */
+ struct sockaddr_in6 addr6;
+ struct sockaddr_in addr4;
+ int got_v6, got_v4;
socklen_t addrlen;
- struct html_config cfg = *incfg;
+ int ret, port = 0;
- cfg.format = "%lu";
+ /*
+ * Special case of the address parameter: if it's "0.0.0.0", treat
+ * it like NULL, because that was how you specified listen-on-any-
+ * address in versions before the IPv6 revamp.
+ */
+ {
+ int u,v,w,x;
+ if (address &&
+ 4 == sscanf(address, "%d.%d.%d.%d", &u, &v, &w, &x) &&
+ u==0 && v==0 && w==0 && x==0)
+ address = NULL;
+ }
+
+ if (portstr && !*portstr)
+ portstr = NULL; /* normalise NULL and empty string */
+
+ if (!address) {
+ char hostname[HOST_NAME_MAX];
+ if (gethostname(hostname, sizeof(hostname)) < 0) {
+ perror("hostname");
+ return -1;
+ }
+ *outhostname = dupstr(hostname);
+ } else {
+ *outhostname = dupstr(address);
+ }
+
+ fds->v6 = fds->v4 = -1;
+ got_v6 = got_v4 = 0;
+
+#if defined HAVE_GETADDRINFO
/*
- * Establish the listening socket and retrieve its port
- * number.
+ * Resolve the given address using getaddrinfo, yielding an IPv6
+ * address or an IPv4 one or both.
*/
- fd = socket(PF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
- fprintf(stderr, "socket(PF_INET): %s\n", strerror(errno));
- exit(1);
+
+ struct addrinfo hints;
+ struct addrinfo *addrs, *ai;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ hints.ai_flags = AI_PASSIVE;
+ ret = getaddrinfo(address, portstr, &hints, &addrs);
+ if (ret) {
+ fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(ret));
+ return -1;
+ }
+ for (ai = addrs; ai; ai = ai->ai_next) {
+#ifndef NO_IPV6
+ if (!got_v6 && ai->ai_family == AF_INET6) {
+ memcpy(&addr6, ai->ai_addr, ai->ai_addrlen);
+ if (portstr && !port)
+ port = ntohs(addr6.sin6_port);
+ got_v6 = 1;
+ }
+#endif
+#ifndef NO_IPV4
+ if (!got_v4 && ai->ai_family == AF_INET) {
+ memcpy(&addr4, ai->ai_addr, ai->ai_addrlen);
+ if (portstr && !port)
+ port = ntohs(addr4.sin_port);
+ got_v4 = 1;
+ }
+#endif
}
- addr.sin_family = AF_INET;
- 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);
+
+#elif defined HAVE_GETHOSTBYNAME
+
+ /*
+ * IPv4-only setup using inet_addr and gethostbyname.
+ */
+ struct hostent *h;
+
+ memset(&addr4, 0, sizeof(addr4));
+ addr4.sin_family = AF_INET;
+
+ if (!address) {
+ addr4.sin_addr.s_addr = htons(INADDR_ANY);
+ got_v4 = 1;
+ } else if (inet_aton(address, &addr4.sin_addr)) {
+ got_v4 = 1; /* numeric address */
+ } else if ((h = gethostbyname(address)) != NULL) {
+ memcpy(&addr4.sin_addr, h->h_addr, sizeof(addr4.sin_addr));
+ got_v4 = 1;
} else {
- addr.sin_addr.s_addr = inet_addr(dcfg->address);
- addr.sin_port = dcfg->port ? htons(dcfg->port) : 80;
+ fprintf(stderr, "gethostbyname: %s\n", hstrerror(h_errno));
+ return -1;
}
- addrlen = sizeof(addr);
- if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) {
- fprintf(stderr, "bind: %s\n", strerror(errno));
- exit(1);
+
+ if (portstr) {
+ struct servent *s;
+ if (!portstr[strspn(portstr, "0123456789")]) {
+ port = atoi(portstr);
+ } else if ((s = getservbyname(portstr, NULL)) != NULL) {
+ port = ntohs(s->s_port);
+ } else {
+ fprintf(stderr, "getservbyname: port '%s' not understood\n",
+ portstr);
+ return -1;
+ }
}
- if (listen(fd, 5) < 0) {
- fprintf(stderr, "listen: %s\n", strerror(errno));
- exit(1);
+
+#endif
+
+#ifndef NO_IPV6
+#ifndef NO_IPV4
+ retry:
+#endif
+ if (got_v6) {
+ fds->v6 = socket(PF_INET6, SOCK_STREAM, 0);
+ if (fds->v6 < 0) {
+ fprintf(stderr, "socket(PF_INET6): %s\n", strerror(errno));
+ goto done_v6;
+ }
+#ifdef IPV6_V6ONLY
+ {
+ int i = 1;
+ if (setsockopt(fds->v6, IPPROTO_IPV6, IPV6_V6ONLY,
+ (char *)&i, sizeof(i)) < 0) {
+ fprintf(stderr, "setsockopt(IPV6_V6ONLY): %s\n",
+ strerror(errno));
+ close(fds->v6);
+ fds->v6 = -1;
+ goto done_v6;
+ }
+ }
+#endif /* IPV6_V6ONLY */
+ addr6.sin6_port = htons(port);
+ addrlen = sizeof(addr6);
+ if (bind(fds->v6, (const struct sockaddr *)&addr6, addrlen) < 0) {
+ fprintf(stderr, "bind: %s\n", strerror(errno));
+ close(fds->v6);
+ fds->v6 = -1;
+ goto done_v6;
+ }
+ if (listen(fds->v6, 5) < 0) {
+ fprintf(stderr, "listen: %s\n", strerror(errno));
+ close(fds->v6);
+ fds->v6 = -1;
+ goto done_v6;
+ }
+ if (port == 0) {
+ addrlen = sizeof(addr6);
+ if (getsockname(fds->v6, (struct sockaddr *)&addr6,
+ &addrlen) < 0) {
+ fprintf(stderr, "getsockname: %s\n", strerror(errno));
+ close(fds->v6);
+ fds->v6 = -1;
+ goto done_v6;
+ }
+ port = ntohs(addr6.sin6_port);
+ }
}
- addrlen = sizeof(addr);
- if (getsockname(fd, (struct sockaddr *)&addr, &addrlen)) {
- fprintf(stderr, "getsockname: %s\n", strerror(errno));
- exit(1);
+ done_v6:
+#endif
+
+#ifndef NO_IPV4
+ if (got_v4) {
+ fds->v4 = socket(PF_INET, SOCK_STREAM, 0);
+ if (fds->v4 < 0) {
+ fprintf(stderr, "socket(PF_INET): %s\n", strerror(errno));
+ goto done_v4;
+ }
+ addr4.sin_port = htons(port);
+ addrlen = sizeof(addr4);
+ if (bind(fds->v4, (const struct sockaddr *)&addr4, addrlen) < 0) {
+#ifndef NO_IPV6
+ if (fds->v6 >= 0) {
+ /*
+ * If we support both v6 and v4, it's a failure
+ * condition if we didn't manage to bind to both. If
+ * the port number was arbitrary, we go round and try
+ * again. Otherwise, give up.
+ */
+ close(fds->v6);
+ close(fds->v4);
+ fds->v6 = fds->v4 = -1;
+ port = 0;
+ if (!portstr)
+ goto retry;
+ }
+#endif
+ fprintf(stderr, "bind: %s\n", strerror(errno));
+ close(fds->v4);
+ fds->v4 = -1;
+ goto done_v4;
+ }
+ if (listen(fds->v4, 5) < 0) {
+ fprintf(stderr, "listen: %s\n", strerror(errno));
+ close(fds->v4);
+ fds->v4 = -1;
+ goto done_v4;
+ }
+ if (port == 0) {
+ addrlen = sizeof(addr4);
+ if (getsockname(fds->v4, (struct sockaddr *)&addr4,
+ &addrlen) < 0) {
+ fprintf(stderr, "getsockname: %s\n", strerror(errno));
+ close(fds->v4);
+ fds->v4 = -1;
+ goto done_v4;
+ }
+ port = ntohs(addr4.sin_port);
+ }
}
+ done_v4:
+#endif
+
+ if (fds->v6 >= 0 || fds->v4 >= 0)
+ return port;
+ else
+ return -1;
+}
+
+void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg,
+ const struct html_config *incfg)
+{
+ struct listenfds lfds;
+ int ret, port;
+ int authtype;
+ char *authstring = NULL;
+ char *hostname;
+ struct sockaddr_in addr;
+ socklen_t addrlen;
+ struct html_config cfg = *incfg;
+
+ /*
+ * Establish the listening socket(s) and retrieve its port
+ * number.
+ */
+ port = make_listening_sockets(&lfds, dcfg->address, dcfg->port, &hostname);
+ if (port < 0)
+ exit(1); /* already reported an error */
+
if ((authmask & HTTPD_AUTH_MAGIC) &&
- (check_owning_uid(fd, 1) == getuid())) {
+ (lfds.v4 < 0 || check_owning_uid(lfds.v4, 1) == getuid()) &&
+ (lfds.v6 < 0 || check_owning_uid(lfds.v6, 1) == getuid())) {
authtype = HTTPD_AUTH_MAGIC;
if (authmask != HTTPD_AUTH_MAGIC)
printf("Using Linux /proc/net magic authentication\n");
if (dcfg->basicauthdata) {
userpass = dcfg->basicauthdata;
} else {
- sprintf(username, "agedu");
+ strcpy(username, PNAME);
rname = "/dev/urandom";
fd = open(rname, O_RDONLY);
if (fd < 0) {
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 (port == 80) {
+ printf("URL: http://%s/\n", hostname);
+ } else {
+ printf("URL: http://%s:%d/\n", hostname, port);
}
+ fflush(stdout);
/*
- * Now construct an fd structure to hold it.
- */
- f = new_fdstruct(fd, FD_LISTENER);
-
- /*
- * Read from standard input, and treat EOF as a notification
- * to exit.
+ * Now construct fd structure(s) to hold the listening sockets.
*/
- new_fdstruct(0, FD_CLIENT);
+ if (lfds.v4 >= 0)
+ new_fdstruct(lfds.v4, FD_LISTENER);
+ if (lfds.v6 >= 0)
+ new_fdstruct(lfds.v6, FD_LISTENER);
+
+ if (dcfg->closeoneof) {
+ /*
+ * Read from standard input, and treat EOF as a notification
+ * to exit.
+ */
+ new_fdstruct(0, FD_CLIENT);
+ }
/*
* Now we're ready to run our main loop. Keep looping round on
*/
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)
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;
}
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));
~mdw / sgt / agedu / blobdiff