version 1.83, 2014/07/25 16:07:13 |
version 1.94, 2014/08/17 03:24:47 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
|
#include <sys/types.h> |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#include <limits.h> |
#include <limits.h> |
|
#include <stdint.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
char *manpath; /* desired manual directory */ |
char *manpath; /* desired manual directory */ |
char *arch; /* architecture */ |
char *arch; /* architecture */ |
char *sec; /* manual section */ |
char *sec; /* manual section */ |
char *expr; /* unparsed expression string */ |
char *query; /* unparsed query expression */ |
int equal; /* match whole names, not substrings */ |
int equal; /* match whole names, not substrings */ |
}; |
}; |
|
|
|
|
static void catman(const struct req *, const char *); |
static void catman(const struct req *, const char *); |
static void format(const struct req *, const char *); |
static void format(const struct req *, const char *); |
static void html_print(const char *); |
static void html_print(const char *); |
static void html_printquery(const struct req *); |
|
static void html_putchar(char); |
static void html_putchar(char); |
static int http_decode(char *); |
static int http_decode(char *); |
static void http_parse(struct req *, const char *); |
static void http_parse(struct req *, const char *); |
static void http_print(const char *); |
static void http_print(const char *); |
static void http_putchar(char); |
static void http_putchar(char); |
static void http_printquery(const struct req *); |
static void http_printquery(const struct req *, const char *); |
static void pathgen(struct req *); |
static void pathgen(struct req *); |
static void pg_error_badrequest(const char *); |
static void pg_error_badrequest(const char *); |
static void pg_error_internal(void); |
static void pg_error_internal(void); |
Line 76 static void resp_begin_http(int, const char *); |
|
Line 76 static void resp_begin_http(int, const char *); |
|
static void resp_end_html(void); |
static void resp_end_html(void); |
static void resp_searchform(const struct req *); |
static void resp_searchform(const struct req *); |
static void resp_show(const struct req *, const char *); |
static void resp_show(const struct req *, const char *); |
|
static void set_query_attr(char **, char **); |
|
static int validate_filename(const char *); |
|
static int validate_manpath(const struct req *, const char *); |
|
static int validate_urifrag(const char *); |
|
|
static const char *scriptname; /* CGI script name */ |
static const char *scriptname; /* CGI script name */ |
|
|
Line 141 html_putchar(char c) |
|
Line 145 html_putchar(char c) |
|
} |
} |
|
|
static void |
static void |
http_printquery(const struct req *req) |
http_printquery(const struct req *req, const char *sep) |
{ |
{ |
|
|
if (NULL != req->q.manpath) { |
if (NULL != req->q.query) { |
printf("&manpath="); |
printf("query="); |
http_print(req->q.manpath); |
http_print(req->q.query); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("%sapropos=1", sep); |
if (NULL != req->q.sec) { |
if (NULL != req->q.sec) { |
printf("&sec="); |
printf("%ssec=", sep); |
http_print(req->q.sec); |
http_print(req->q.sec); |
} |
} |
if (NULL != req->q.arch) { |
if (NULL != req->q.arch) { |
printf("&arch="); |
printf("%sarch=", sep); |
http_print(req->q.arch); |
http_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.manpath && |
printf("&query="); |
strcmp(req->q.manpath, req->p[0])) { |
http_print(req->q.expr); |
printf("%smanpath=", sep); |
|
http_print(req->q.manpath); |
} |
} |
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
|
} |
} |
|
|
static void |
static void |
html_printquery(const struct req *req) |
|
{ |
|
|
|
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 |
|
http_print(const char *p) |
http_print(const char *p) |
{ |
{ |
|
|
Line 242 http_parse(struct req *req, const char *qs) |
|
Line 223 http_parse(struct req *req, const char *qs) |
|
req->q.manpath = NULL; |
req->q.manpath = NULL; |
req->q.arch = NULL; |
req->q.arch = NULL; |
req->q.sec = NULL; |
req->q.sec = NULL; |
req->q.expr = NULL; |
req->q.query = NULL; |
req->q.equal = 1; |
req->q.equal = 1; |
|
|
key = val = NULL; |
key = val = NULL; |
Line 270 http_parse(struct req *req, const char *qs) |
|
Line 251 http_parse(struct req *req, const char *qs) |
|
/* Handle key-value pairs. */ |
/* Handle key-value pairs. */ |
|
|
if ( ! strcmp(key, "query")) |
if ( ! strcmp(key, "query")) |
set_query_attr(&req->q.expr, &val); |
set_query_attr(&req->q.query, &val); |
|
|
else if ( ! strcmp(key, "apropos")) |
else if ( ! strcmp(key, "apropos")) |
req->q.equal = !strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
Line 437 resp_searchform(const struct req *req) |
|
Line 418 resp_searchform(const struct req *req) |
|
|
|
printf( "<TABLE><TR><TD>\n" |
printf( "<TABLE><TR><TD>\n" |
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
if (NULL != req->q.expr) |
if (NULL != req->q.query) |
html_print(req->q.expr); |
html_print(req->q.query); |
puts("\" SIZE=\"40\">"); |
puts("\" SIZE=\"40\">"); |
|
|
/* Write submission and reset buttons. */ |
/* Write submission and reset buttons. */ |
Line 451 resp_searchform(const struct req *req) |
|
Line 432 resp_searchform(const struct req *req) |
|
printf( "</TD><TD>\n" |
printf( "</TD><TD>\n" |
"<INPUT TYPE=\"radio\" "); |
"<INPUT TYPE=\"radio\" "); |
if (req->q.equal) |
if (req->q.equal) |
printf("CHECKED "); |
printf("CHECKED=\"checked\" "); |
printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" |
printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" |
"<LABEL FOR=\"show\">Show named manual page</LABEL>\n"); |
"<LABEL FOR=\"show\">Show named manual page</LABEL>\n"); |
|
|
/* Write section selector. */ |
/* Write section selector. */ |
|
|
printf( "</TD></TR><TR><TD>\n" |
puts( "</TD></TR><TR><TD>\n" |
"<SELECT NAME=\"sec\">"); |
"<SELECT NAME=\"sec\">"); |
for (i = 0; i < sec_MAX; i++) { |
for (i = 0; i < sec_MAX; i++) { |
printf("<OPTION VALUE=\"%s\"", sec_numbers[i]); |
printf("<OPTION VALUE=\"%s\"", sec_numbers[i]); |
if (NULL != req->q.sec && |
if (NULL != req->q.sec && |
0 == strcmp(sec_numbers[i], req->q.sec)) |
0 == strcmp(sec_numbers[i], req->q.sec)) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
printf(">%s</OPTION>\n", sec_names[i]); |
printf(">%s</OPTION>\n", sec_names[i]); |
} |
} |
puts("</SELECT>"); |
puts("</SELECT>"); |
Line 473 resp_searchform(const struct req *req) |
|
Line 454 resp_searchform(const struct req *req) |
|
printf( "<SELECT NAME=\"arch\">\n" |
printf( "<SELECT NAME=\"arch\">\n" |
"<OPTION VALUE=\"default\""); |
"<OPTION VALUE=\"default\""); |
if (NULL == req->q.arch) |
if (NULL == req->q.arch) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
puts(">All Architectures</OPTION>"); |
puts(">All Architectures</OPTION>"); |
for (i = 0; i < arch_MAX; i++) { |
for (i = 0; i < arch_MAX; i++) { |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
if (NULL != req->q.arch && |
if (NULL != req->q.arch && |
0 == strcmp(arch_names[i], req->q.arch)) |
0 == strcmp(arch_names[i], req->q.arch)) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
printf(">%s</OPTION>\n", arch_names[i]); |
printf(">%s</OPTION>\n", arch_names[i]); |
} |
} |
puts("</SELECT>"); |
puts("</SELECT>"); |
Line 492 resp_searchform(const struct req *req) |
|
Line 473 resp_searchform(const struct req *req) |
|
printf("<OPTION "); |
printf("<OPTION "); |
if (NULL == req->q.manpath ? 0 == i : |
if (NULL == req->q.manpath ? 0 == i : |
0 == strcmp(req->q.manpath, req->p[i])) |
0 == strcmp(req->q.manpath, req->p[i])) |
printf("SELECTED "); |
printf("SELECTED=\"selected\" "); |
printf("VALUE=\""); |
printf("VALUE=\""); |
html_print(req->p[i]); |
html_print(req->p[i]); |
printf("\">"); |
printf("\">"); |
Line 507 resp_searchform(const struct req *req) |
|
Line 488 resp_searchform(const struct req *req) |
|
printf( "</TD><TD>\n" |
printf( "</TD><TD>\n" |
"<INPUT TYPE=\"radio\" "); |
"<INPUT TYPE=\"radio\" "); |
if (0 == req->q.equal) |
if (0 == req->q.equal) |
printf("CHECKED "); |
printf("CHECKED=\"checked\" "); |
printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n" |
printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n" |
"<LABEL FOR=\"search\">Search with apropos query</LABEL>\n"); |
"<LABEL FOR=\"search\">Search with apropos query</LABEL>\n"); |
|
|
Line 565 pg_index(const struct req *req) |
|
Line 546 pg_index(const struct req *req) |
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
printf("<P>\n" |
printf("<P>\n" |
"This web interface is documented in the " |
"This web interface is documented in the\n" |
"<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> " |
"<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A>\n" |
"manual, and the " |
"manual, and the\n" |
"<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> " |
"<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A>\n" |
"manual explains the query syntax.\n" |
"manual explains the query syntax.\n" |
"</P>\n", |
"</P>\n", |
scriptname, scriptname); |
scriptname, scriptname); |
Line 634 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 615 pg_searchres(const struct req *req, struct manpage *r, |
|
printf("Status: 303 See Other\r\n"); |
printf("Status: 303 See Other\r\n"); |
printf("Location: http://%s%s/%s/%s?", |
printf("Location: http://%s%s/%s/%s?", |
HTTP_HOST, scriptname, req->q.manpath, r[0].file); |
HTTP_HOST, scriptname, req->q.manpath, r[0].file); |
http_printquery(req); |
http_printquery(req, "&"); |
printf("\r\n" |
printf("\r\n" |
"Content-Type: text/html; charset=utf-8\r\n" |
"Content-Type: text/html; charset=utf-8\r\n" |
"\r\n"); |
"\r\n"); |
Line 651 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 632 pg_searchres(const struct req *req, struct manpage *r, |
|
"<TD CLASS=\"title\">\n" |
"<TD CLASS=\"title\">\n" |
"<A HREF=\"%s/%s/%s?", |
"<A HREF=\"%s/%s/%s?", |
scriptname, req->q.manpath, r[i].file); |
scriptname, req->q.manpath, r[i].file); |
html_printquery(req); |
http_printquery(req, "&"); |
printf("\">"); |
printf("\">"); |
html_print(r[i].names); |
html_print(r[i].names); |
printf("</A>\n" |
printf("</A>\n" |
|
|
format(const struct req *req, const char *file) |
format(const struct req *req, const char *file) |
{ |
{ |
struct mparse *mp; |
struct mparse *mp; |
int fd; |
|
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
void *vp; |
void *vp; |
|
char *opts; |
enum mandoclevel rc; |
enum mandoclevel rc; |
char opts[PATH_MAX + 128]; |
int fd; |
|
int usepath; |
|
|
if (-1 == (fd = open(file, O_RDONLY, 0))) { |
if (-1 == (fd = open(file, O_RDONLY, 0))) { |
puts("<P>You specified an invalid manual file.</P>"); |
puts("<P>You specified an invalid manual file.</P>"); |
Line 869 format(const struct req *req, const char *file) |
|
Line 851 format(const struct req *req, const char *file) |
|
return; |
return; |
} |
} |
|
|
snprintf(opts, sizeof(opts), "fragment,man=%s?" |
usepath = strcmp(req->q.manpath, req->p[0]); |
"manpath=%s&query=%%N&sec=%%S&arch=%s", |
mandoc_asprintf(&opts, |
scriptname, req->q.manpath, |
"fragment,man=%s?query=%%N&sec=%%S%s%s%s%s", |
req->q.arch ? req->q.arch : ""); |
scriptname, |
|
req->q.arch ? "&arch=" : "", |
|
req->q.arch ? req->q.arch : "", |
|
usepath ? "&manpath=" : "", |
|
usepath ? req->q.manpath : ""); |
|
|
mparse_result(mp, &mdoc, &man, NULL); |
mparse_result(mp, &mdoc, &man, NULL); |
if (NULL == man && NULL == mdoc) { |
if (NULL == man && NULL == mdoc) { |
Line 892 format(const struct req *req, const char *file) |
|
Line 878 format(const struct req *req, const char *file) |
|
|
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
|
free(opts); |
} |
} |
|
|
static void |
static void |
Line 908 resp_show(const struct req *req, const char *file) |
|
Line 895 resp_show(const struct req *req, const char *file) |
|
} |
} |
|
|
static void |
static void |
pg_show(struct req *req, const char *path) |
pg_show(struct req *req, const char *fullpath) |
{ |
{ |
char *sub; |
char *manpath; |
|
const char *file; |
|
|
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
if ((file = strchr(fullpath, '/')) == NULL) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You did not specify a page to show."); |
"You did not specify a page to show."); |
return; |
return; |
} |
} |
*sub++ = '\0'; |
manpath = mandoc_strndup(fullpath, file - fullpath); |
|
file++; |
|
|
if ( ! validate_manpath(req, path)) { |
if ( ! validate_manpath(req, manpath)) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manpath."); |
"You specified an invalid manpath."); |
|
free(manpath); |
return; |
return; |
} |
} |
|
|
Line 931 pg_show(struct req *req, const char *path) |
|
Line 921 pg_show(struct req *req, const char *path) |
|
* relative to the manpath root. |
* relative to the manpath root. |
*/ |
*/ |
|
|
if (-1 == chdir(path)) { |
if (chdir(manpath) == -1) { |
fprintf(stderr, "chdir %s: %s\n", |
fprintf(stderr, "chdir %s: %s\n", |
path, strerror(errno)); |
manpath, strerror(errno)); |
pg_error_internal(); |
pg_error_internal(); |
|
free(manpath); |
return; |
return; |
} |
} |
|
|
if ( ! validate_filename(sub)) { |
if (strcmp(manpath, "mandoc")) { |
|
free(req->q.manpath); |
|
req->q.manpath = manpath; |
|
} else |
|
free(manpath); |
|
|
|
if ( ! validate_filename(file)) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manual file."); |
"You specified an invalid manual file."); |
return; |
return; |
} |
} |
|
|
if (strcmp(path, "mandoc")) { |
|
free(req->q.manpath); |
|
req->q.manpath = mandoc_strdup(path); |
|
} |
|
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
resp_show(req, sub); |
resp_show(req, file); |
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
Line 981 pg_search(const struct req *req) |
|
Line 973 pg_search(const struct req *req) |
|
|
|
search.arch = req->q.arch; |
search.arch = req->q.arch; |
search.sec = req->q.sec; |
search.sec = req->q.sec; |
search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd); |
search.outkey = "Nd"; |
search.flags = req->q.equal ? MANSEARCH_MAN : 0; |
search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR; |
|
|
paths.sz = 1; |
paths.sz = 1; |
paths.paths = mandoc_malloc(sizeof(char *)); |
paths.paths = mandoc_malloc(sizeof(char *)); |
Line 993 pg_search(const struct req *req) |
|
Line 985 pg_search(const struct req *req) |
|
* Yes, this is half-ass. But it works for now. |
* Yes, this is half-ass. But it works for now. |
*/ |
*/ |
|
|
ep = req->q.expr; |
ep = req->q.query; |
while (ep && isspace((unsigned char)*ep)) |
while (ep && isspace((unsigned char)*ep)) |
ep++; |
ep++; |
|
|
Line 1011 pg_search(const struct req *req) |
|
Line 1003 pg_search(const struct req *req) |
|
ep++; |
ep++; |
} |
} |
|
|
if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
if (0 == mansearch(&search, &paths, sz, cp, &res, &ressz)) |
pg_noresult(req, "You entered an invalid query."); |
pg_noresult(req, "You entered an invalid query."); |
else if (0 == ressz) |
else if (0 == ressz) |
pg_noresult(req, "No results found."); |
pg_noresult(req, "No results found."); |
|
|
if (NULL != (querystring = getenv("QUERY_STRING"))) |
if (NULL != (querystring = getenv("QUERY_STRING"))) |
http_parse(&req, querystring); |
http_parse(&req, querystring); |
|
|
if ( ! validate_manpath(&req, req.q.manpath)) { |
if ( ! (NULL == req.q.manpath || |
|
validate_manpath(&req, req.q.manpath))) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manpath."); |
"You specified an invalid manpath."); |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
|
|
|
|
if ('\0' != *path) |
if ('\0' != *path) |
pg_show(&req, path); |
pg_show(&req, path); |
else if (NULL != req.q.expr) |
else if (NULL != req.q.query) |
pg_search(&req); |
pg_search(&req); |
else |
else |
pg_index(&req); |
pg_index(&req); |
|
|
free(req.q.manpath); |
free(req.q.manpath); |
free(req.q.arch); |
free(req.q.arch); |
free(req.q.sec); |
free(req.q.sec); |
free(req.q.expr); |
free(req.q.query); |
for (i = 0; i < (int)req.psz; i++) |
for (i = 0; i < (int)req.psz; i++) |
free(req.p[i]); |
free(req.p[i]); |
free(req.p); |
free(req.p); |