version 1.98, 2014/09/27 11:17:36 |
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 469 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 837 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 864 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 876 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 973 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 *)); |
|
|
|
|
/* 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); |