===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.69
retrieving revision 1.80
diff -u -p -r1.69 -r1.80
--- mandoc/cgi.c	2014/07/13 09:39:32	1.69
+++ mandoc/cgi.c	2014/07/22 18:14:13	1.80
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.69 2014/07/13 09:39:32 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.80 2014/07/22 18:14:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -64,23 +64,23 @@ static	void		 http_print(const char *);
 static	void 		 http_putchar(char);
 static	void		 http_printquery(const struct req *);
 static	void		 pathgen(struct req *);
+static	void		 pg_error_badrequest(const char *);
+static	void		 pg_error_internal(void);
+static	void		 pg_index(const struct req *);
+static	void		 pg_noresult(const struct req *, const char *);
 static	void		 pg_search(const struct req *);
-static	void		 pg_show(const struct req *, const char *);
+static	void		 pg_searchres(const struct req *,
+				struct manpage *, size_t);
+static	void		 pg_show(struct req *, const char *);
 static	void		 resp_begin_html(int, const char *);
 static	void		 resp_begin_http(int, const char *);
 static	void		 resp_end_html(void);
-static	void		 resp_error_badrequest(const char *);
-static	void		 resp_error_internal(void);
-static	void		 resp_index(const struct req *);
-static	void		 resp_noresult(const struct req *,
-				const char *);
-static	void		 resp_search(const struct req *,
-				struct manpage *, size_t);
 static	void		 resp_searchform(const struct req *);
+static	void		 resp_show(const struct req *, const char *);
 
 static	const char	 *scriptname; /* CGI script name */
-static	const char	 *httphost; /* hostname used in the URIs */
 
+static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static	const char *const sec_numbers[] = {
     "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9"
 };
@@ -249,14 +249,25 @@ http_parse(struct req *req, char *p)
 
 		if (0 == strcmp(key, "query"))
 			req->q.expr = val;
-		else if (0 == strcmp(key, "manpath"))
+		else if (0 == strcmp(key, "manpath")) {
+#ifdef COMPAT_OLDURI
+			if (0 == strncmp(val, "OpenBSD ", 8)) {
+				val[7] = '-';
+				if ('C' == val[8])
+					val[8] = 'c';
+			}
+#endif
 			req->q.manpath = val;
-		else if (0 == strcmp(key, "apropos"))
+		} else if (0 == strcmp(key, "apropos"))
 			req->q.equal = !strcmp(val, "0");
-		else if (0 == strcmp(key, "sec") ||
-			 0 == strcmp(key, "sektion")) {
+		else if (0 == strcmp(key, "sec")) {
 			if (strcmp(val, "0"))
 				req->q.sec = val;
+#ifdef COMPAT_OLDURI
+		} else if (0 == strcmp(key, "sektion")) {
+			if (strcmp(val, "0"))
+				req->q.sec = val;
+#endif
 		} else if (0 == strcmp(key, "arch")) {
 			if (strcmp(val, "default"))
 				req->q.arch = val;
@@ -455,8 +466,48 @@ resp_searchform(const struct req *req)
 	puts("<!-- End search form. //-->");
 }
 
+static int
+validate_urifrag(const char *frag)
+{
+
+	while ('\0' != *frag) {
+		if ( ! (isalnum((unsigned char)*frag) ||
+		    '-' == *frag || '.' == *frag ||
+		    '/' == *frag || '_' == *frag))
+			return(0);
+		frag++;
+	}
+	return(1);
+}
+
+static int
+validate_manpath(const struct req *req, const char* manpath)
+{
+	size_t	 i;
+
+	if ( ! strcmp(manpath, "mandoc"))
+		return(1);
+
+	for (i = 0; i < req->psz; i++)
+		if ( ! strcmp(manpath, req->p[i]))
+			return(1);
+
+	return(0);
+}
+
+static int
+validate_filename(const char *file)
+{
+
+	if ('.' == file[0] && '/' == file[1])
+		file += 2;
+
+	return ( ! (strstr(file, "../") || strstr(file, "/..") ||
+	    (strncmp(file, "man", 3) && strncmp(file, "cat", 3))));
+}
+
 static void
-resp_index(const struct req *req)
+pg_index(const struct req *req)
 {
 
 	resp_begin_html(200, NULL);
@@ -473,7 +524,7 @@ resp_index(const struct req *req)
 }
 
 static void
-resp_noresult(const struct req *req, const char *msg)
+pg_noresult(const struct req *req, const char *msg)
 {
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
@@ -484,7 +535,7 @@ resp_noresult(const struct req *req, const char *msg)
 }
 
 static void
-resp_error_badrequest(const char *msg)
+pg_error_badrequest(const char *msg)
 {
 
 	resp_begin_html(400, "Bad Request");
@@ -498,7 +549,7 @@ resp_error_badrequest(const char *msg)
 }
 
 static void
-resp_error_internal(void)
+pg_error_internal(void)
 {
 	resp_begin_html(500, "Internal Server Error");
 	puts("<P>Internal Server Error</P>");
@@ -506,10 +557,21 @@ resp_error_internal(void)
 }
 
 static void
-resp_search(const struct req *req, struct manpage *r, size_t sz)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)
 {
-	size_t		 i;
+	size_t		 i, iuse, isec;
+	int		 prio, priouse;
+	char		 sec;
 
+	for (i = 0; i < sz; i++) {
+		if (validate_filename(r[i].file))
+			continue;
+		fprintf(stderr, "invalid filename %s in %s database\n",
+		    r[i].file, req->q.manpath);
+		pg_error_internal();
+		return;
+	}
+
 	if (1 == sz) {
 		/*
 		 * If we have just one result, then jump there now
@@ -517,7 +579,7 @@ resp_search(const struct req *req, struct manpage *r, 
 		 */
 		printf("Status: 303 See Other\r\n");
 		printf("Location: http://%s%s/%s/%s?",
-		    httphost, scriptname, req->q.manpath, r[0].file);
+		    HTTP_HOST, scriptname, req->q.manpath, r[0].file);
 		http_printquery(req);
 		printf("\r\n"
 		     "Content-Type: text/html; charset=utf-8\r\n"
@@ -550,6 +612,30 @@ resp_search(const struct req *req, struct manpage *r, 
 
 	puts("</TABLE>\n"
 	     "</DIV>");
+
+	/*
+	 * In man(1) mode, show one of the pages
+	 * even if more than one is found.
+	 */
+
+	if (req->q.equal) {
+		puts("<HR>");
+		iuse = 0;
+		priouse = 10;
+		for (i = 0; i < sz; i++) {
+			isec = strcspn(r[i].file, "123456789");
+			sec = r[i].file[isec];
+			if ('\0' == sec)
+				continue;
+			prio = sec_prios[sec - '1'];
+			if (prio >= priouse)
+				continue;
+			priouse = prio;
+			iuse = i;
+		}
+		resp_show(req, r[iuse].file);
+	}
+
 	resp_end_html();
 }
 
@@ -563,13 +649,10 @@ catman(const struct req *req, const char *file)
 	int		 italic, bold;
 
 	if (NULL == (f = fopen(file, "r"))) {
-		resp_error_badrequest(
-		    "You specified an invalid manual file.");
+		puts("<P>You specified an invalid manual file.</P>");
 		return;
 	}
 
-	resp_begin_html(200, NULL);
-	resp_searchform(req);
 	puts("<DIV CLASS=\"catman\">\n"
 	     "<PRE>");
 
@@ -683,9 +766,7 @@ catman(const struct req *req, const char *file)
 	}
 
 	puts("</PRE>\n"
-	     "</DIV>\n"
-	     "</BODY>\n"
-	     "</HTML>");
+	     "</DIV>");
 
 	fclose(f);
 }
@@ -702,8 +783,7 @@ format(const struct req *req, const char *file)
 	char		 opts[PATH_MAX + 128];
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
-		resp_error_badrequest(
-		    "You specified an invalid manual file.");
+		puts("<P>You specified an invalid manual file.</P>");
 		return;
 	}
 
@@ -715,26 +795,24 @@ format(const struct req *req, const char *file)
 	if (rc >= MANDOCLEVEL_FATAL) {
 		fprintf(stderr, "fatal mandoc error: %s/%s\n",
 		    req->q.manpath, file);
-		resp_error_internal();
+		pg_error_internal();
 		return;
 	}
 
-	snprintf(opts, sizeof(opts),
-	    "fragment,man=%s?query=%%N&amp;sec=%%S",
-	    scriptname);
+	snprintf(opts, sizeof(opts), "fragment,man=%s?"
+	    "manpath=%s&amp;query=%%N&amp;sec=%%S&amp;arch=%s",
+	    scriptname, req->q.manpath,
+	    req->q.arch ? req->q.arch : "");
 
 	mparse_result(mp, &mdoc, &man, NULL);
 	if (NULL == man && NULL == mdoc) {
 		fprintf(stderr, "fatal mandoc error: %s/%s\n",
 		    req->q.manpath, file);
-		resp_error_internal();
+		pg_error_internal();
 		mparse_free(mp);
 		return;
 	}
 
-	resp_begin_html(200, NULL);
-	resp_searchform(req);
-
 	vp = html_alloc(opts);
 
 	if (NULL != mdoc)
@@ -742,25 +820,41 @@ format(const struct req *req, const char *file)
 	else
 		html_man(vp, man);
 
-	puts("</BODY>\n"
-	     "</HTML>");
-
 	html_free(vp);
 	mparse_free(mp);
 }
 
 static void
-pg_show(const struct req *req, const char *path)
+resp_show(const struct req *req, const char *file)
 {
+
+	if ('.' == file[0] && '/' == file[1])
+		file += 2;
+
+	if ('c' == *file)
+		catman(req, file);
+	else
+		format(req, file);
+}
+
+static void
+pg_show(struct req *req, const char *path)
+{
 	char		*sub;
 
 	if (NULL == path || NULL == (sub = strchr(path, '/'))) {
-		resp_error_badrequest(
+		pg_error_badrequest(
 		    "You did not specify a page to show.");
 		return;
 	} 
 	*sub++ = '\0';
 
+	if ( ! validate_manpath(req, path)) {
+		pg_error_badrequest(
+		    "You specified an invalid manpath.");
+		return;
+	}
+
 	/*
 	 * Begin by chdir()ing into the manpath.
 	 * This way we can pick up the database files, which are
@@ -768,15 +862,25 @@ pg_show(const struct req *req, const char *path)
 	 */
 
 	if (-1 == chdir(path)) {
-		resp_error_badrequest(
-		    "You specified an invalid manpath.");
+		fprintf(stderr, "chdir %s: %s\n",
+		    path, strerror(errno));
+		pg_error_internal();
 		return;
 	}
 
-	if ('c' == *sub)
-		catman(req, sub);
-	else
-		format(req, sub);
+	if ( ! validate_filename(sub)) {
+		pg_error_badrequest(
+		    "You specified an invalid manual file.");
+		return;
+	}
+
+	if (strcmp(path, "mandoc"))
+		req->q.manpath = path;
+
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
+	resp_show(req, sub);
+	resp_end_html();
 }
 
 static void
@@ -797,8 +901,9 @@ pg_search(const struct req *req)
 	 */
 
 	if (-1 == (chdir(req->q.manpath))) {
-		resp_error_badrequest(
-		    "You specified an invalid manpath.");
+		fprintf(stderr, "chdir %s: %s\n",
+		    req->q.manpath, strerror(errno));
+		pg_error_internal();
 		return;
 	}
 
@@ -835,11 +940,11 @@ pg_search(const struct req *req)
 	}
 
 	if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
-		resp_noresult(req, "You entered an invalid query.");
+		pg_noresult(req, "You entered an invalid query.");
 	else if (0 == ressz)
-		resp_noresult(req, "No results found.");
+		pg_noresult(req, "No results found.");
 	else
-		resp_search(req, res, ressz);
+		pg_searchres(req, res, ressz);
 
 	for (i = 0; i < sz; i++)
 		free(cp[i]);
@@ -869,8 +974,12 @@ main(void)
 	if (NULL == (scriptname = getenv("SCRIPT_NAME")))
 		scriptname = "";
 
-	if (NULL == (httphost = getenv("HTTP_HOST")))
-		httphost = "localhost";
+	if ( ! validate_urifrag(scriptname)) {
+		fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n",
+		    scriptname);
+		pg_error_internal();
+		return(EXIT_FAILURE);
+	}
 
 	/*
 	 * First we change directory into the MAN_DIR so that
@@ -881,7 +990,7 @@ main(void)
 	if (-1 == chdir(MAN_DIR)) {
 		fprintf(stderr, "MAN_DIR: %s: %s\n",
 		    MAN_DIR, strerror(errno));
-		resp_error_internal();
+		pg_error_internal();
 		return(EXIT_FAILURE);
 	} 
 
@@ -893,6 +1002,18 @@ main(void)
 	if (NULL != (querystring = getenv("QUERY_STRING")))
 		http_parse(&req, querystring);
 
+	if ( ! validate_manpath(&req, req.q.manpath)) {
+		pg_error_badrequest(
+		    "You specified an invalid manpath.");
+		return(EXIT_FAILURE);
+	}
+
+	if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) {
+		pg_error_badrequest(
+		    "You specified an invalid architecture.");
+		return(EXIT_FAILURE);
+	}
+
 	/* Dispatch to the three different pages. */
 
 	path = getenv("PATH_INFO");
@@ -906,7 +1027,7 @@ main(void)
 	else if (NULL != req.q.expr)
 		pg_search(&req);
 	else
-		resp_index(&req);
+		pg_index(&req);
 
 	for (i = 0; i < (int)req.psz; i++)
 		free(req.p[i]);
@@ -932,14 +1053,37 @@ pathgen(struct req *req)
 	char	*dp;
 	size_t	 dpsz;
 
-	if (NULL == (fp = fopen("manpath.conf", "r")))
-		return;
+	if (NULL == (fp = fopen("manpath.conf", "r"))) {
+		fprintf(stderr, "%s/manpath.conf: %s\n",
+			MAN_DIR, strerror(errno));
+		pg_error_internal();
+		exit(EXIT_FAILURE);
+	}
 
 	while (NULL != (dp = fgetln(fp, &dpsz))) {
 		if ('\n' == dp[dpsz - 1])
 			dpsz--;
 		req->p = mandoc_realloc(req->p,
 		    (req->psz + 1) * sizeof(char *));
-		req->p[req->psz++] = mandoc_strndup(dp, dpsz);
+		dp = mandoc_strndup(dp, dpsz);
+		if ( ! validate_urifrag(dp)) {
+			fprintf(stderr, "%s/manpath.conf contains "
+			    "unsafe path \"%s\"\n", MAN_DIR, dp);
+			pg_error_internal();
+			exit(EXIT_FAILURE);
+		}
+		if (NULL != strchr(dp, '/')) {
+			fprintf(stderr, "%s/manpath.conf contains "
+			    "path with slash \"%s\"\n", MAN_DIR, dp);
+			pg_error_internal();
+			exit(EXIT_FAILURE);
+		}
+		req->p[req->psz++] = dp;
+	}
+
+	if ( req->p == NULL ) {
+		fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR);
+		pg_error_internal();
+		exit(EXIT_FAILURE);
 	}
 }