X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/blobdiff_plain/995db5990865ab0772e0f0902ba39c1fb9336fa3..00c5e40cdda24456519762da186538e34b81968a:/httpd.c

diff --git a/httpd.c b/httpd.c
index 8087a28..90d4e42 100644
--- a/httpd.c
+++ b/httpd.c
@@ -2,24 +2,6 @@
  * 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 "agedu.h"
 #include "alloc.h"
 #include "html.h"
@@ -278,25 +260,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=\""PNAME"\"\r",
-				 "\nPlease 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;
@@ -380,9 +368,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;
@@ -421,10 +411,9 @@ 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;
@@ -441,21 +430,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);
     }
@@ -555,13 +563,13 @@ void run_httpd(const void *t, int authmask, const struct httpd_config *dcfg,
 	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));
     }
 
     /*
@@ -581,7 +589,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)
@@ -605,6 +615,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;
@@ -630,7 +642,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));