=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.51 retrieving revision 1.82 diff -u -p -r1.51 -r1.82 --- mandoc/cgi.c 2014/04/23 21:40:47 1.51 +++ mandoc/cgi.c 2014/07/24 20:30:45 1.82 @@ -1,6 +1,7 @@ -/* $Id: cgi.c,v 1.51 2014/04/23 21:40:47 schwarze Exp $ */ +/* $Id: cgi.c,v 1.82 2014/07/24 20:30:45 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons + * Copyright (c) 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,77 +19,40 @@ #include "config.h" #endif -#include - -#include #include #include -#include #include #include -#include #include -#include -#include #include #include #include -#if defined(__sun) -/* for stat() */ -#include -#include -#include -#endif - -#include "apropos_db.h" #include "mandoc.h" #include "mandoc_aux.h" -#include "mdoc.h" -#include "man.h" #include "main.h" #include "manpath.h" -#include "mandocdb.h" +#include "mansearch.h" +#include "cgi.h" -#if defined(__linux__) || defined(__sun) -# include -#else -# include -#endif - -enum page { - PAGE_INDEX, - PAGE_SEARCH, - PAGE_SHOW, - PAGE__MAX -}; - -struct paths { - char *name; - char *path; -}; - /* * A query as passed to the search function. */ struct query { + const char *manpath; /* desired manual directory */ const char *arch; /* architecture */ const char *sec; /* manual section */ const char *expr; /* unparsed expression string */ - int manroot; /* manroot index (or -1)*/ - int legacy; /* whether legacy mode */ + int equal; /* match whole names, not substrings */ }; struct req { - struct query q; - struct paths *p; - size_t psz; - enum page page; + struct query q; + char **p; /* array of available manpaths */ + size_t psz; /* number of available manpaths */ }; -static int atou(const char *, unsigned *); static void catman(const struct req *, const char *); -static int cmp(const void *, const void *); static void format(const struct req *, const char *); static void html_print(const char *); static void html_printquery(const struct req *); @@ -98,56 +62,57 @@ static void http_parse(struct req *, char *); static void http_print(const char *); static void http_putchar(char); static void http_printquery(const struct req *); -static int pathstop(DIR *); -static void pathgen(DIR *, char *, struct req *); -static void pg_index(const struct req *, char *); -static void pg_search(const struct req *, char *); -static void pg_show(const struct req *, char *); -static void resp_bad(void); -static void resp_baddb(void); -static void resp_error400(void); -static void resp_error404(const char *); +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_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_index(const struct req *); -static void resp_search(struct res *, size_t, void *); static void resp_searchform(const struct req *); +static void resp_show(const struct req *, const char *); -static const char *progname; /* cgi script name */ -static const char *cache; /* cache directory */ -static const char *css; /* css directory */ -static const char *host; /* hostname */ +static const char *scriptname; /* CGI script name */ -static const char * const pages[PAGE__MAX] = { - "index", /* PAGE_INDEX */ - "search", /* PAGE_SEARCH */ - "show", /* PAGE_SHOW */ +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" }; +static const char *const sec_names[] = { + "All Sections", + "1 - General Commands", + "2 - System Calls", + "3 - Subroutines", + "3p - Perl Subroutines", + "4 - Special Files", + "5 - File Formats", + "6 - Games", + "7 - Macros and Conventions", + "8 - Maintenance Commands", + "9 - Kernel Interface" +}; +static const int sec_MAX = sizeof(sec_names) / sizeof(char *); -/* - * This is just OpenBSD's strtol(3) suggestion. - * I use it instead of strtonum(3) for portability's sake. - */ -static int -atou(const char *buf, unsigned *v) -{ - char *ep; - long lval; +static const char *const arch_names[] = { + "amd64", "alpha", "armish", "armv7", + "aviion", "hppa", "hppa64", "i386", + "ia64", "landisk", "loongson", "luna88k", + "macppc", "mips64", "octeon", "sgi", + "socppc", "solbourne", "sparc", "sparc64", + "vax", "zaurus", + "amiga", "arc", "arm32", "atari", + "beagle", "cats", "hp300", "mac68k", + "mvme68k", "mvme88k", "mvmeppc", "palm", + "pc532", "pegasos", "pmax", "powerpc", + "sun3", "wgrisc", "x68k" +}; +static const int arch_MAX = sizeof(arch_names) / sizeof(char *); - errno = 0; - lval = strtol(buf, &ep, 10); - if (buf[0] == '\0' || *ep != '\0') - return(0); - if ((errno == ERANGE && (lval == LONG_MAX || - lval == LONG_MIN)) || - (lval > INT_MAX || lval < 0)) - return(0); - - *v = (unsigned int)lval; - return(1); -} - /* * Print a character, escaping HTML along the way. * This will pass non-ASCII straight to output: be warned! @@ -174,29 +139,53 @@ html_putchar(char c) break; } } + static void http_printquery(const struct req *req) { - printf("&expr="); - http_print(req->q.expr ? req->q.expr : ""); - printf("&sec="); - http_print(req->q.sec ? req->q.sec : ""); - printf("&arch="); - http_print(req->q.arch ? req->q.arch : ""); + if (NULL != req->q.manpath) { + printf("&manpath="); + http_print(req->q.manpath); + } + if (NULL != req->q.sec) { + printf("&sec="); + http_print(req->q.sec); + } + if (NULL != req->q.arch) { + printf("&arch="); + http_print(req->q.arch); + } + if (NULL != req->q.expr) { + printf("&query="); + http_print(req->q.expr); + } + if (0 == req->q.equal) + printf("&apropos=1"); } - static void html_printquery(const struct req *req) { - printf("&expr="); - html_print(req->q.expr ? req->q.expr : ""); - printf("&sec="); - html_print(req->q.sec ? req->q.sec : ""); - printf("&arch="); - html_print(req->q.arch ? req->q.arch : ""); + if (NULL != req->q.manpath) { + printf("&manpath="); + html_print(req->q.manpath); + } + if (NULL != req->q.sec) { + printf("&sec="); + html_print(req->q.sec); + } + if (NULL != req->q.arch) { + printf("&arch="); + html_print(req->q.arch); + } + if (NULL != req->q.expr) { + printf("&query="); + html_print(req->q.expr); + } + if (0 == req->q.equal) + printf("&apropos=1"); } static void @@ -231,14 +220,12 @@ html_print(const char *p) static void http_parse(struct req *req, char *p) { - char *key, *val, *manroot; - int i, legacy; + char *key, *val; memset(&req->q, 0, sizeof(struct query)); + req->q.manpath = req->p[0]; + req->q.equal = 1; - legacy = -1; - manroot = NULL; - while ('\0' != *p) { key = p; val = NULL; @@ -259,46 +246,32 @@ http_parse(struct req *req, char *p) if (NULL != val && ! http_decode(val)) break; - if (0 == strcmp(key, "expr")) + if (0 == strcmp(key, "query")) req->q.expr = val; - else if (0 == strcmp(key, "query")) - req->q.expr = val; - else if (0 == strcmp(key, "sec")) - req->q.sec = val; - else if (0 == strcmp(key, "sektion")) - req->q.sec = val; - else if (0 == strcmp(key, "arch")) - req->q.arch = val; - else if (0 == strcmp(key, "manpath")) - manroot = val; - else if (0 == strcmp(key, "apropos")) - legacy = 0 == strcmp(val, "0"); + 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")) + req->q.equal = !strcmp(val, "0"); + 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; + } } - - /* Test for old man.cgi compatibility mode. */ - - req->q.legacy = legacy > 0; - - /* - * Section "0" means no section when in legacy mode. - * For some man.cgi scripts, "default" arch is none. - */ - - if (req->q.legacy && NULL != req->q.sec) - if (0 == strcmp(req->q.sec, "0")) - req->q.sec = NULL; - if (req->q.legacy && NULL != req->q.arch) - if (0 == strcmp(req->q.arch, "default")) - req->q.arch = NULL; - - /* Default to first manroot. */ - - if (NULL != manroot) { - for (i = 0; i < (int)req->psz; i++) - if (0 == strcmp(req->p[i].name, manroot)) - break; - req->q.manroot = i < (int)req->psz ? i : -1; - } } static void @@ -324,11 +297,13 @@ static int http_decode(char *p) { char hex[3]; + char *q; int c; hex[2] = '\0'; - for ( ; '\0' != *p; p++) { + q = p; + for ( ; '\0' != *p; p++, q++) { if ('%' == *p) { if ('\0' == (hex[0] = *(p + 1))) return(0); @@ -339,13 +314,13 @@ http_decode(char *p) if ('\0' == c) return(0); - *p = (char)c; - memmove(p + 1, p + 3, strlen(p + 3) + 1); + *q = (char)c; + p += 2; } else - *p = '+' == *p ? ' ' : *p; + *q = '+' == *p ? ' ' : *p; } - *p = '\0'; + *q = '\0'; return(1); } @@ -354,12 +329,12 @@ resp_begin_http(int code, const char *msg) { if (200 != code) - printf("Status: %d %s\n", code, msg); + printf("Status: %d %s\r\n", code, msg); - puts("Content-Type: text/html; charset=utf-8\n" - "Cache-Control: no-cache\n" - "Pragma: no-cache\n" - ""); + printf("Content-Type: text/html; charset=utf-8\r\n" + "Cache-Control: no-cache\r\n" + "Pragma: no-cache\r\n" + "\r\n"); fflush(stdout); } @@ -381,10 +356,11 @@ resp_begin_html(int code, const char *msg) " TYPE=\"text/css\" media=\"all\">\n" "\n" - "System Manpage Reference\n" + "%s\n" "\n" "\n" - "\n", css, css); + "\n", + CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE); } static void @@ -400,192 +376,288 @@ resp_searchform(const struct req *req) { int i; + puts(CUSTOMIZE_BEGIN); puts(""); printf("
\n" - "
\n" + "\n" "
\n" - "Search Parameters\n" - " for manuals satisfying \n" - "q.expr ? req->q.expr : ""); - printf("\">, section " - "q.sec ? req->q.sec : ""); - printf("\">, arch " - "q.arch ? req->q.arch : ""); - printf("\">"); + "Manual Page Search Parameters\n", + scriptname); + + /* Write query input box. */ + + printf( "
\n" + "q.expr) + html_print(req->q.expr); + puts("\" SIZE=\"40\">"); + + /* Write submission and reset buttons. */ + + printf( "\n" + "\n"); + + /* Write show radio button */ + + printf( "\n" + "q.equal) + printf("CHECKED "); + printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" + "\n"); + + /* Write section selector. */ + + printf( "
\n" + ""); + + /* Write architecture selector. */ + + printf( ""); + + /* Write manpath selector. */ + if (req->psz > 1) { - puts(", "); for (i = 0; i < (int)req->psz; i++) { - printf(""); } puts(""); } - puts(".\n" - "\n" + + /* Write search radio button */ + + printf( "\n" + "q.equal) + printf("CHECKED "); + printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n" + "\n"); + + puts("
\n" "
\n" "
\n" "
"); puts(""); } -static void -resp_index(const struct req *req) +static int +validate_urifrag(const char *frag) { - resp_begin_html(200, NULL); - resp_searchform(req); - resp_end_html(); + while ('\0' != *frag) { + if ( ! (isalnum((unsigned char)*frag) || + '-' == *frag || '.' == *frag || + '/' == *frag || '_' == *frag)) + return(0); + frag++; + } + return(1); } -static void -resp_error400(void) +static int +validate_manpath(const struct req *req, const char* manpath) { + size_t i; - resp_begin_html(400, "Query Malformed"); - printf("

Malformed Query

\n" - "

\n" - "The query your entered was malformed.\n" - "Try again from the\n" - "main page.\n" - "

", progname); - resp_end_html(); + 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_error404(const char *page) +pg_index(const struct req *req) { - resp_begin_html(404, "Not Found"); - puts("

Page Not Found

\n" - "

\n" - "The page you're looking for, "); - printf(""); - html_print(page); - printf(",\n" - "could not be found.\n" - "Try searching from the\n" - "main page.\n" - "

", progname); + resp_begin_html(200, NULL); + resp_searchform(req); + printf("

\n" + "This web interface is documented in the " + "man.cgi " + "manual, and the " + "apropos " + "manual explains the query syntax.\n" + "

\n", + scriptname, scriptname); resp_end_html(); } static void -resp_bad(void) +pg_noresult(const struct req *req, const char *msg) { - resp_begin_html(500, "Internal Server Error"); - puts("

Generic badness happened.

"); + resp_begin_html(200, NULL); + resp_searchform(req); + puts("

"); + puts(msg); + puts("

"); resp_end_html(); } static void -resp_baddb(void) +pg_error_badrequest(const char *msg) { + resp_begin_html(400, "Bad Request"); + puts("

Bad Request

\n" + "

\n"); + puts(msg); + printf("Try again from the\n" + "main page.\n" + "

", scriptname); + resp_end_html(); +} + +static void +pg_error_internal(void) +{ resp_begin_html(500, "Internal Server Error"); - puts("

Your database is broken.

"); + puts("

Internal Server Error

"); resp_end_html(); } static void -resp_search(struct res *r, size_t sz, void *arg) +pg_searchres(const struct req *req, struct manpage *r, size_t sz) { - size_t i, matched; - const struct req *req; + char *arch, *archend; + size_t i, iuse, isec; + int archprio, archpriouse; + int prio, priouse; + char sec; - req = (const struct req *)arg; + 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 (sz > 0) - assert(req->q.manroot >= 0); - - for (matched = i = 0; i < sz; i++) - if (r[i].matched) - matched++; - - if (1 == matched) { - for (i = 0; i < sz; i++) - if (r[i].matched) - break; + if (1 == sz) { /* * If we have just one result, then jump there now * without any delay. */ - puts("Status: 303 See Other"); - printf("Location: http://%s%s/show/%d/%u/%u.html?", - host, progname, req->q.manroot, - r[i].volume, r[i].rec); + printf("Status: 303 See Other\r\n"); + printf("Location: http://%s%s/%s/%s?", + HTTP_HOST, scriptname, req->q.manpath, r[0].file); http_printquery(req); - puts("\n" - "Content-Type: text/html; charset=utf-8\n"); + printf("\r\n" + "Content-Type: text/html; charset=utf-8\r\n" + "\r\n"); return; } resp_begin_html(200, NULL); resp_searchform(req); - puts("
"); - - if (0 == matched) { - puts("

\n" - "No results found.\n" - "

\n" - "
"); - resp_end_html(); - return; - } - - qsort(r, sz, sizeof(struct res), cmp); - puts(""); for (i = 0; i < sz; i++) { - if ( ! r[i].matched) - continue; printf("\n" "\n" "\n" ""); } puts("
\n" - "q.manroot, - r[i].volume, r[i].rec); + "q.manpath, r[i].file); html_printquery(req); printf("\">"); - html_print(r[i].title); - putchar('('); - html_print(r[i].cat); - if (r[i].arch && '\0' != *r[i].arch) { - putchar('/'); - html_print(r[i].arch); - } - printf(")\n" + html_print(r[i].names); + printf("\n" ""); - html_print(r[i].desc); + html_print(r[i].output); puts("
\n" ""); - resp_end_html(); -} -/* ARGSUSED */ -static void -pg_index(const struct req *req, char *path) -{ + /* + * In man(1) mode, show one of the pages + * even if more than one is found. + */ - resp_index(req); + if (req->q.equal) { + puts("
"); + iuse = 0; + priouse = 10; + archpriouse = 3; + 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 (NULL == req->q.arch) { + archprio = + (NULL == (arch = strchr( + r[i].file + isec, '/'))) ? 3 : + (NULL == (archend = strchr( + arch + 1, '/'))) ? 0 : + strncmp(arch, "amd64/", + archend - arch) ? 2 : 1; + if (archprio < archpriouse) { + archpriouse = archprio; + priouse = prio; + iuse = i; + continue; + } + if (archprio > archpriouse) + continue; + } + if (prio >= priouse) + continue; + priouse = prio; + iuse = i; + } + resp_show(req, r[iuse].file); + } + + resp_end_html(); } static void @@ -598,12 +670,10 @@ catman(const struct req *req, const char *file) int italic, bold; if (NULL == (f = fopen(file, "r"))) { - resp_baddb(); + puts("

You specified an invalid manual file.

"); return; } - resp_begin_html(200, NULL); - resp_searchform(req); puts("
\n" "
");
 
@@ -717,9 +787,7 @@ catman(const struct req *req, const char *file)
 	}
 
 	puts("
\n" - "
\n" - "\n" - ""); + ""); fclose(f); } @@ -736,34 +804,36 @@ format(const struct req *req, const char *file) char opts[PATH_MAX + 128]; if (-1 == (fd = open(file, O_RDONLY, 0))) { - resp_baddb(); + puts("

You specified an invalid manual file.

"); return; } - mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, NULL); + mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, + req->q.manpath); rc = mparse_readfd(mp, fd, file); close(fd); if (rc >= MANDOCLEVEL_FATAL) { - resp_baddb(); + fprintf(stderr, "fatal mandoc error: %s/%s\n", + req->q.manpath, file); + pg_error_internal(); return; } - snprintf(opts, sizeof(opts), "fragment," - "man=%s/search.html?sec=%%S&expr=Nm~^%%N$," - /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/, - progname); + snprintf(opts, sizeof(opts), "fragment,man=%s?" + "manpath=%s&query=%%N&sec=%%S&arch=%s", + scriptname, req->q.manpath, + req->q.arch ? req->q.arch : ""); mparse_result(mp, &mdoc, &man, NULL); if (NULL == man && NULL == mdoc) { - resp_baddb(); + fprintf(stderr, "fatal mandoc error: %s/%s\n", + req->q.manpath, file); + pg_error_internal(); mparse_free(mp); return; } - resp_begin_html(200, NULL); - resp_searchform(req); - vp = html_alloc(opts); if (NULL != mdoc) @@ -771,170 +841,113 @@ format(const struct req *req, const char *file) else html_man(vp, man); - puts("\n" - ""); - html_free(vp); mparse_free(mp); } static void -pg_show(const struct req *req, char *path) +resp_show(const struct req *req, const char *file) { - struct manpaths ps; - size_t sz; - char *sub; - char file[PATH_MAX]; - const char *cp; - int rc, catm; - unsigned int vol, rec, mr; - DB *idx; - DBT key, val; - idx = NULL; + if ('.' == file[0] && '/' == file[1]) + file += 2; - /* Parse out mroot, volume, and record from the path. */ + 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_error400(); + pg_error_badrequest( + "You did not specify a page to show."); return; } *sub++ = '\0'; - if ( ! atou(path, &mr)) { - resp_error400(); + + if ( ! validate_manpath(req, path)) { + pg_error_badrequest( + "You specified an invalid manpath."); return; } - path = sub; - if (NULL == (sub = strchr(path, '/'))) { - resp_error400(); - return; - } - *sub++ = '\0'; - if ( ! atou(path, &vol) || ! atou(sub, &rec)) { - resp_error400(); - return; - } else if (mr >= (unsigned int)req->psz) { - resp_error400(); - return; - } /* - * Begin by chdir()ing into the manroot. + * Begin by chdir()ing into the manpath. * This way we can pick up the database files, which are * relative to the manpath root. */ - if (-1 == chdir(req->p[(int)mr].path)) { - perror(req->p[(int)mr].path); - resp_baddb(); + if (-1 == chdir(path)) { + fprintf(stderr, "chdir %s: %s\n", + path, strerror(errno)); + pg_error_internal(); return; } - memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf(&ps, "etc/catman.conf"); - - if (vol >= (unsigned int)ps.sz) { - resp_error400(); - goto out; + if ( ! validate_filename(sub)) { + pg_error_badrequest( + "You specified an invalid manual file."); + return; } - sz = strlcpy(file, ps.paths[vol], PATH_MAX); - assert(sz < PATH_MAX); - strlcat(file, "/", PATH_MAX); - strlcat(file, MANDOC_IDX, PATH_MAX); + if (strcmp(path, "mandoc")) + req->q.manpath = path; - /* Open the index recno(3) database. */ - - idx = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL); - if (NULL == idx) { - perror(file); - resp_baddb(); - goto out; - } - - key.data = &rec; - key.size = 4; - - if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { - rc < 0 ? resp_baddb() : resp_error400(); - goto out; - } else if (0 == val.size) { - resp_baddb(); - goto out; - } - - cp = (char *)val.data; - catm = 'c' == *cp++; - - if (NULL == memchr(cp, '\0', val.size - 1)) - resp_baddb(); - else { - file[(int)sz] = '\0'; - strlcat(file, "/", PATH_MAX); - strlcat(file, cp, PATH_MAX); - if (catm) - catman(req, file); - else - format(req, file); - } -out: - if (idx) - (*idx->close)(idx); - manpath_free(&ps); + resp_begin_html(200, NULL); + resp_searchform(req); + resp_show(req, sub); + resp_end_html(); } static void -pg_search(const struct req *req, char *path) +pg_search(const struct req *req) { - size_t tt, ressz; - struct manpaths ps; - int i, sz, rc; - const char *ep, *start; - struct res *res; - char **cp; - struct opts opt; - struct expr *expr; + struct mansearch search; + struct manpaths paths; + struct manpage *res; + char **cp; + const char *ep, *start; + size_t ressz; + int i, sz; - if (req->q.manroot < 0 || 0 == req->psz) { - resp_search(NULL, 0, (void *)req); - return; - } - - memset(&opt, 0, sizeof(struct opts)); - - ep = req->q.expr; - opt.arch = req->q.arch; - opt.cat = req->q.sec; - rc = -1; - sz = 0; - cp = NULL; - ressz = 0; - res = NULL; - /* * Begin by chdir()ing into the root of the manpath. * This way we can pick up the database files, which are * relative to the manpath root. */ - assert(req->q.manroot < (int)req->psz); - if (-1 == (chdir(req->p[req->q.manroot].path))) { - perror(req->p[req->q.manroot].path); - resp_search(NULL, 0, (void *)req); + if (-1 == (chdir(req->q.manpath))) { + fprintf(stderr, "chdir %s: %s\n", + req->q.manpath, strerror(errno)); + pg_error_internal(); return; } - memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf(&ps, "etc/catman.conf"); + search.arch = req->q.arch; + search.sec = req->q.sec; + search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd); + search.flags = req->q.equal ? MANSEARCH_MAN : 0; + paths.sz = 1; + paths.paths = mandoc_malloc(sizeof(char *)); + paths.paths[0] = mandoc_strdup("."); + /* * Poor man's tokenisation: just break apart by spaces. * Yes, this is half-ass. But it works for now. */ + ep = req->q.expr; while (ep && isspace((unsigned char)*ep)) ep++; + sz = 0; + cp = NULL; while (ep && '\0' != *ep) { cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *)); start = ep; @@ -947,287 +960,143 @@ pg_search(const struct req *req, char *path) ep++; } - /* - * Pump down into apropos backend. - * The resp_search() function is called with the results. - */ + if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) + pg_noresult(req, "You entered an invalid query."); + else if (0 == ressz) + pg_noresult(req, "No results found."); + else + pg_searchres(req, res, ressz); - expr = req->q.legacy ? - termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt); - - if (NULL != expr) - rc = apropos_search - (ps.sz, ps.paths, &opt, expr, tt, - (void *)req, &ressz, &res, resp_search); - - /* ...unless errors occured. */ - - if (0 == rc) - resp_baddb(); - else if (-1 == rc) - resp_search(NULL, 0, NULL); - for (i = 0; i < sz; i++) free(cp[i]); - free(cp); - resfree(res, ressz); - exprfree(expr); - manpath_free(&ps); + + for (i = 0; i < (int)ressz; i++) { + free(res[i].file); + free(res[i].names); + free(res[i].output); + } + free(res); + + free(paths.paths[0]); + free(paths.paths); } int main(void) { - int i; - char buf[PATH_MAX]; - DIR *cwd; struct req req; - char *p, *path, *subpath; + const char *path; + char *querystring; + int i; /* Scan our run-time environment. */ - if (NULL == (cache = getenv("CACHE_DIR"))) - cache = "/cache/man.cgi"; + if (NULL == (scriptname = getenv("SCRIPT_NAME"))) + scriptname = ""; - if (NULL == (progname = getenv("SCRIPT_NAME"))) - progname = ""; + if ( ! validate_urifrag(scriptname)) { + fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n", + scriptname); + pg_error_internal(); + return(EXIT_FAILURE); + } - if (NULL == (css = getenv("CSS_DIR"))) - css = ""; - - if (NULL == (host = getenv("HTTP_HOST"))) - host = "localhost"; - /* - * First we change directory into the cache directory so that + * First we change directory into the MAN_DIR so that * subsequent scanning for manpath directories is rooted * relative to the same position. */ - if (-1 == chdir(cache)) { - perror(cache); - resp_bad(); + if (-1 == chdir(MAN_DIR)) { + fprintf(stderr, "MAN_DIR: %s: %s\n", + MAN_DIR, strerror(errno)); + pg_error_internal(); return(EXIT_FAILURE); - } else if (NULL == (cwd = opendir(cache))) { - perror(cache); - resp_bad(); - return(EXIT_FAILURE); } memset(&req, 0, sizeof(struct req)); + pathgen(&req); - strlcpy(buf, ".", PATH_MAX); - pathgen(cwd, buf, &req); - closedir(cwd); - /* Next parse out the query string. */ - if (NULL != (p = getenv("QUERY_STRING"))) - http_parse(&req, p); + if (NULL != (querystring = getenv("QUERY_STRING"))) + http_parse(&req, querystring); - /* - * Now juggle paths to extract information. - * We want to extract our filetype (the file suffix), the - * initial path component, then the trailing component(s). - * Start with leading subpath component. - */ + if ( ! validate_manpath(&req, req.q.manpath)) { + pg_error_badrequest( + "You specified an invalid manpath."); + return(EXIT_FAILURE); + } - subpath = path = NULL; - req.page = PAGE__MAX; + if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) { + pg_error_badrequest( + "You specified an invalid architecture."); + return(EXIT_FAILURE); + } - if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path) - req.page = PAGE_INDEX; + /* Dispatch to the three different pages. */ - if (NULL != path && '/' == *path && '\0' == *++path) - req.page = PAGE_INDEX; + path = getenv("PATH_INFO"); + if (NULL == path) + path = ""; + else if ('/' == *path) + path++; - /* Strip file suffix. */ + if ('\0' != *path) + pg_show(&req, path); + else if (NULL != req.q.expr) + pg_search(&req); + else + pg_index(&req); - if (NULL != path && NULL != (p = strrchr(path, '.'))) - if (NULL != p && NULL == strchr(p, '/')) - *p++ = '\0'; - - /* Resolve subpath component. */ - - if (NULL != path && NULL != (subpath = strchr(path, '/'))) - *subpath++ = '\0'; - - /* Map path into one we recognise. */ - - if (NULL != path && '\0' != *path) - for (i = 0; i < (int)PAGE__MAX; i++) - if (0 == strcmp(pages[i], path)) { - req.page = (enum page)i; - break; - } - - /* Route pages. */ - - switch (req.page) { - case (PAGE_INDEX): - pg_index(&req, subpath); - break; - case (PAGE_SEARCH): - pg_search(&req, subpath); - break; - case (PAGE_SHOW): - pg_show(&req, subpath); - break; - default: - resp_error404(path); - break; - } - - for (i = 0; i < (int)req.psz; i++) { - free(req.p[i].path); - free(req.p[i].name); - } - + for (i = 0; i < (int)req.psz; i++) + free(req.p[i]); free(req.p); return(EXIT_SUCCESS); } -static int -cmp(const void *p1, const void *p2) -{ - - return(strcasecmp(((const struct res *)p1)->title, - ((const struct res *)p2)->title)); -} - /* - * Check to see if an "etc" path consists of a catman.conf file. If it - * does, that means that the path contains a tree created by catman(8) - * and should be used for indexing. - */ -static int -pathstop(DIR *dir) -{ - struct dirent *d; -#if defined(__sun) - struct stat sb; -#endif - - while (NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (S_IFREG & sb.st_mode) -#else - if (DT_REG == d->d_type) -#endif - if (0 == strcmp(d->d_name, "catman.conf")) - return(1); - } - - return(0); -} - -/* * Scan for indexable paths. - * This adds all paths with "etc/catman.conf" to the buffer. */ static void -pathgen(DIR *dir, char *path, struct req *req) +pathgen(struct req *req) { - struct dirent *d; - char *cp; - DIR *cd; - int rc; - size_t sz, ssz; -#if defined(__sun) - struct stat sb; -#endif + FILE *fp; + char *dp; + size_t dpsz; - sz = strlcat(path, "/", PATH_MAX); - if (sz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); - return; - } - - /* - * First, scan for the "etc" directory. - * If it's found, then see if it should cause us to stop. This - * happens when a catman.conf is found in the directory. - */ - - rc = 0; - while (0 == rc && NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (!(S_IFDIR & sb.st_mode) -#else - if (DT_DIR != d->d_type -#endif - || strcmp(d->d_name, "etc")) - continue; - - path[(int)sz] = '\0'; - ssz = strlcat(path, d->d_name, PATH_MAX); - - if (ssz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); - return; - } else if (NULL == (cd = opendir(path))) { - perror(path); - return; - } - - rc = pathstop(cd); - closedir(cd); + if (NULL == (fp = fopen("manpath.conf", "r"))) { + fprintf(stderr, "%s/manpath.conf: %s\n", + MAN_DIR, strerror(errno)); + pg_error_internal(); + exit(EXIT_FAILURE); } - if (rc > 0) { - /* This also strips the trailing slash. */ - path[(int)--sz] = '\0'; - req->p = mandoc_reallocarray(req->p, - req->psz + 1, sizeof(struct paths)); - /* - * Strip out the leading "./" unless we're just a ".", - * in which case use an empty string as our name. - */ - req->p[(int)req->psz].path = mandoc_strdup(path); - req->p[(int)req->psz].name = - cp = mandoc_strdup(path + (1 == sz ? 1 : 2)); - req->psz++; - /* - * The name is just the path with all the slashes taken - * out of it. Simple but effective. - */ - for ( ; '\0' != *cp; cp++) - if ('/' == *cp) - *cp = ' '; - return; - } - - /* - * If no etc/catman.conf was found, recursively enter child - * directory and continue scanning. - */ - - rewinddir(dir); - while (NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (!(S_IFDIR & sb.st_mode) -#else - if (DT_DIR != d->d_type -#endif - || '.' == d->d_name[0]) - continue; - - path[(int)sz] = '\0'; - ssz = strlcat(path, d->d_name, PATH_MAX); - - if (ssz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); - return; - } else if (NULL == (cd = opendir(path))) { - perror(path); - return; + while (NULL != (dp = fgetln(fp, &dpsz))) { + if ('\n' == dp[dpsz - 1]) + dpsz--; + req->p = mandoc_realloc(req->p, + (req->psz + 1) * sizeof(char *)); + 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; + } - pathgen(cd, path, req); - closedir(cd); + if ( req->p == NULL ) { + fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR); + pg_error_internal(); + exit(EXIT_FAILURE); } }