version 1.96, 2014/08/26 11:21:40 |
version 1.102, 2014/11/26 17:55:27 |
Line 163 http_printquery(const struct req *req, const char *sep |
|
Line 163 http_printquery(const struct req *req, const char *sep |
|
printf("%sarch=", sep); |
printf("%sarch=", sep); |
http_print(req->q.arch); |
http_print(req->q.arch); |
} |
} |
if (NULL != req->q.manpath && |
if (strcmp(req->q.manpath, req->p[0])) { |
strcmp(req->q.manpath, req->p[0])) { |
|
printf("%smanpath=", sep); |
printf("%smanpath=", sep); |
http_print(req->q.manpath); |
http_print(req->q.manpath); |
} |
} |
|
|
if (*qs != '\0') |
if (*qs != '\0') |
qs++; |
qs++; |
} |
} |
|
|
/* Fall back to the default manpath. */ |
|
|
|
if (req->q.manpath == NULL) |
|
req->q.manpath = mandoc_strdup(req->p[0]); |
|
} |
} |
|
|
static void |
static void |
Line 376 resp_begin_html(int code, const char *msg) |
|
Line 370 resp_begin_html(int code, const char *msg) |
|
|
|
resp_begin_http(code, msg); |
resp_begin_http(code, msg); |
|
|
printf("<!DOCTYPE HTML PUBLIC " |
printf("<!DOCTYPE html>\n" |
" \"-//W3C//DTD HTML 4.01//EN\"" |
|
" \"http://www.w3.org/TR/html4/strict.dtd\">\n" |
|
"<HTML>\n" |
"<HTML>\n" |
"<HEAD>\n" |
"<HEAD>\n" |
"<META HTTP-EQUIV=\"Content-Type\"" |
"<META CHARSET=\"UTF-8\" />\n" |
" CONTENT=\"text/html; charset=utf-8\">\n" |
|
"<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\"" |
"<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\"" |
" TYPE=\"text/css\" media=\"all\">\n" |
" TYPE=\"text/css\" media=\"all\">\n" |
"<LINK REL=\"stylesheet\" HREF=\"%s/man.css\"" |
"<LINK REL=\"stylesheet\" HREF=\"%s/man.css\"" |
Line 472 resp_searchform(const struct req *req) |
|
Line 463 resp_searchform(const struct req *req) |
|
puts("<SELECT NAME=\"manpath\">"); |
puts("<SELECT NAME=\"manpath\">"); |
for (i = 0; i < (int)req->psz; i++) { |
for (i = 0; i < (int)req->psz; i++) { |
printf("<OPTION "); |
printf("<OPTION "); |
if (NULL == req->q.manpath ? 0 == i : |
if (strcmp(req->q.manpath, req->p[i]) == 0) |
0 == strcmp(req->q.manpath, req->p[i])) |
|
printf("SELECTED=\"selected\" "); |
printf("SELECTED=\"selected\" "); |
printf("VALUE=\""); |
printf("VALUE=\""); |
html_print(req->p[i]); |
html_print(req->p[i]); |
|
|
format(const struct req *req, const char *file) |
format(const struct req *req, const char *file) |
{ |
{ |
struct mparse *mp; |
struct mparse *mp; |
|
struct mchars *mchars; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct man *man; |
struct man *man; |
void *vp; |
void *vp; |
Line 840 format(const struct req *req, const char *file) |
|
Line 831 format(const struct req *req, const char *file) |
|
return; |
return; |
} |
} |
|
|
|
mchars = mchars_alloc(); |
mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, |
mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, |
req->q.manpath); |
mchars, req->q.manpath); |
rc = mparse_readfd(mp, fd, file); |
rc = mparse_readfd(mp, fd, file); |
close(fd); |
close(fd); |
|
|
Line 867 format(const struct req *req, const char *file) |
|
Line 859 format(const struct req *req, const char *file) |
|
req->q.manpath, file); |
req->q.manpath, file); |
pg_error_internal(); |
pg_error_internal(); |
mparse_free(mp); |
mparse_free(mp); |
|
mchars_free(mchars); |
return; |
return; |
} |
} |
|
|
vp = html_alloc(opts); |
vp = html_alloc(mchars, opts); |
|
|
if (NULL != mdoc) |
if (NULL != mdoc) |
html_mdoc(vp, mdoc); |
html_mdoc(vp, mdoc); |
Line 879 format(const struct req *req, const char *file) |
|
Line 872 format(const struct req *req, const char *file) |
|
|
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
|
mchars_free(mchars); |
free(opts); |
free(opts); |
} |
} |
|
|
Line 954 pg_search(const struct req *req) |
|
Line 948 pg_search(const struct req *req) |
|
struct mansearch search; |
struct mansearch search; |
struct manpaths paths; |
struct manpaths paths; |
struct manpage *res; |
struct manpage *res; |
char **cp; |
char **argv; |
const char *ep, *start; |
char *query, *rp, *wp; |
size_t ressz; |
size_t ressz; |
int i, sz; |
int argc; |
|
|
/* |
/* |
* Begin by chdir()ing into the root of the manpath. |
* Begin by chdir()ing into the root of the manpath. |
Line 976 pg_search(const struct req *req) |
|
Line 970 pg_search(const struct req *req) |
|
search.sec = req->q.sec; |
search.sec = req->q.sec; |
search.outkey = "Nd"; |
search.outkey = "Nd"; |
search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR; |
search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR; |
|
search.firstmatch = 1; |
|
|
paths.sz = 1; |
paths.sz = 1; |
paths.paths = mandoc_malloc(sizeof(char *)); |
paths.paths = mandoc_malloc(sizeof(char *)); |
paths.paths[0] = mandoc_strdup("."); |
paths.paths[0] = mandoc_strdup("."); |
|
|
/* |
/* |
* Poor man's tokenisation: just break apart by spaces. |
* Break apart at spaces with backslash-escaping. |
* Yes, this is half-ass. But it works for now. |
|
*/ |
*/ |
|
|
ep = req->q.query; |
argc = 0; |
while (ep && isspace((unsigned char)*ep)) |
argv = NULL; |
ep++; |
rp = query = mandoc_strdup(req->q.query); |
|
for (;;) { |
sz = 0; |
while (isspace((unsigned char)*rp)) |
cp = NULL; |
rp++; |
while (ep && '\0' != *ep) { |
if (*rp == '\0') |
cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *)); |
break; |
start = ep; |
argv = mandoc_reallocarray(argv, argc + 1, sizeof(char *)); |
while ('\0' != *ep && ! isspace((unsigned char)*ep)) |
argv[argc++] = wp = rp; |
ep++; |
for (;;) { |
cp[sz] = mandoc_malloc((ep - start) + 1); |
if (isspace((unsigned char)*rp)) { |
memcpy(cp[sz], start, ep - start); |
*wp = '\0'; |
cp[sz++][ep - start] = '\0'; |
rp++; |
while (isspace((unsigned char)*ep)) |
break; |
ep++; |
} |
|
if (rp[0] == '\\' && rp[1] != '\0') |
|
rp++; |
|
if (wp != rp) |
|
*wp = *rp; |
|
if (*rp == '\0') |
|
break; |
|
wp++; |
|
rp++; |
|
} |
} |
} |
|
|
if (0 == mansearch(&search, &paths, sz, cp, &res, &ressz)) |
if (0 == mansearch(&search, &paths, argc, argv, &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."); |
else |
else |
pg_searchres(req, res, ressz); |
pg_searchres(req, res, ressz); |
|
|
for (i = 0; i < sz; i++) |
free(query); |
free(cp[i]); |
mansearch_free(res, ressz); |
free(cp); |
|
|
|
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[0]); |
free(paths.paths); |
free(paths.paths); |
} |
} |
|
|
|
|
/* Poor man's ReDoS mitigation. */ |
/* Poor man's ReDoS mitigation. */ |
|
|
itimer.it_value.tv_sec = 1; |
itimer.it_value.tv_sec = 2; |
itimer.it_value.tv_usec = 0; |
itimer.it_value.tv_usec = 0; |
itimer.it_interval.tv_sec = 1; |
itimer.it_interval.tv_sec = 2; |
itimer.it_interval.tv_usec = 0; |
itimer.it_interval.tv_usec = 0; |
if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) { |
if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) { |
fprintf(stderr, "setitimer: %s\n", strerror(errno)); |
fprintf(stderr, "setitimer: %s\n", strerror(errno)); |
|
|
if (NULL != (querystring = getenv("QUERY_STRING"))) |
if (NULL != (querystring = getenv("QUERY_STRING"))) |
http_parse(&req, querystring); |
http_parse(&req, querystring); |
|
|
if ( ! (NULL == req.q.manpath || |
if (req.q.manpath == NULL) |
validate_manpath(&req, req.q.manpath))) { |
req.q.manpath = mandoc_strdup(req.p[0]); |
|
else if ( ! 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); |