version 1.71, 2014/07/13 12:45:23 |
version 1.80, 2014/07/22 18:14:13 |
Line 64 static void http_print(const char *); |
|
Line 64 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 *); |
static void pathgen(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_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_html(int, const char *); |
static void resp_begin_http(int, const char *); |
static void resp_begin_http(int, const char *); |
static void resp_end_html(void); |
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_searchform(const struct req *); |
static void resp_show(const struct req *, const char *); |
static void resp_show(const struct req *, const char *); |
|
|
static const char *scriptname; /* CGI script name */ |
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 int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
static const char *const sec_numbers[] = { |
static const char *const sec_numbers[] = { |
Line 251 http_parse(struct req *req, char *p) |
|
Line 249 http_parse(struct req *req, char *p) |
|
|
|
if (0 == strcmp(key, "query")) |
if (0 == strcmp(key, "query")) |
req->q.expr = val; |
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; |
req->q.manpath = val; |
else if (0 == strcmp(key, "apropos")) |
} else if (0 == strcmp(key, "apropos")) |
req->q.equal = !strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
else if (0 == strcmp(key, "sec") || |
else if (0 == strcmp(key, "sec")) { |
0 == strcmp(key, "sektion")) { |
|
if (strcmp(val, "0")) |
if (strcmp(val, "0")) |
req->q.sec = val; |
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")) { |
} else if (0 == strcmp(key, "arch")) { |
if (strcmp(val, "default")) |
if (strcmp(val, "default")) |
req->q.arch = val; |
req->q.arch = val; |
Line 457 resp_searchform(const struct req *req) |
|
Line 466 resp_searchform(const struct req *req) |
|
puts("<!-- End search form. //-->"); |
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 |
static void |
resp_index(const struct req *req) |
pg_index(const struct req *req) |
{ |
{ |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
Line 475 resp_index(const struct req *req) |
|
Line 524 resp_index(const struct req *req) |
|
} |
} |
|
|
static void |
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_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
Line 486 resp_noresult(const struct req *req, const char *msg) |
|
Line 535 resp_noresult(const struct req *req, const char *msg) |
|
} |
} |
|
|
static void |
static void |
resp_error_badrequest(const char *msg) |
pg_error_badrequest(const char *msg) |
{ |
{ |
|
|
resp_begin_html(400, "Bad Request"); |
resp_begin_html(400, "Bad Request"); |
Line 500 resp_error_badrequest(const char *msg) |
|
Line 549 resp_error_badrequest(const char *msg) |
|
} |
} |
|
|
static void |
static void |
resp_error_internal(void) |
pg_error_internal(void) |
{ |
{ |
resp_begin_html(500, "Internal Server Error"); |
resp_begin_html(500, "Internal Server Error"); |
puts("<P>Internal Server Error</P>"); |
puts("<P>Internal Server Error</P>"); |
Line 508 resp_error_internal(void) |
|
Line 557 resp_error_internal(void) |
|
} |
} |
|
|
static 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, iuse, isec; |
size_t i, iuse, isec; |
int prio, priouse; |
int prio, priouse; |
char sec; |
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 (1 == sz) { |
/* |
/* |
* If we have just one result, then jump there now |
* If we have just one result, then jump there now |
Line 521 resp_search(const struct req *req, struct manpage *r, |
|
Line 579 resp_search(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?", |
httphost, 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" |
Line 737 format(const struct req *req, const char *file) |
|
Line 795 format(const struct req *req, const char *file) |
|
if (rc >= MANDOCLEVEL_FATAL) { |
if (rc >= MANDOCLEVEL_FATAL) { |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
req->q.manpath, file); |
req->q.manpath, file); |
resp_error_internal(); |
pg_error_internal(); |
return; |
return; |
} |
} |
|
|
snprintf(opts, sizeof(opts), |
snprintf(opts, sizeof(opts), "fragment,man=%s?" |
"fragment,man=%s?query=%%N&sec=%%S", |
"manpath=%s&query=%%N&sec=%%S&arch=%s", |
scriptname); |
scriptname, req->q.manpath, |
|
req->q.arch ? req->q.arch : ""); |
|
|
mparse_result(mp, &mdoc, &man, NULL); |
mparse_result(mp, &mdoc, &man, NULL); |
if (NULL == man && NULL == mdoc) { |
if (NULL == man && NULL == mdoc) { |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
req->q.manpath, file); |
req->q.manpath, file); |
resp_error_internal(); |
pg_error_internal(); |
mparse_free(mp); |
mparse_free(mp); |
return; |
return; |
} |
} |
Line 768 format(const struct req *req, const char *file) |
|
Line 827 format(const struct req *req, const char *file) |
|
static void |
static void |
resp_show(const struct req *req, const char *file) |
resp_show(const struct req *req, const char *file) |
{ |
{ |
if ('.' == file[0] || '/' == file[1]) |
|
|
if ('.' == file[0] && '/' == file[1]) |
file += 2; |
file += 2; |
|
|
if ('c' == *file) |
if ('c' == *file) |
Line 778 resp_show(const struct req *req, const char *file) |
|
Line 838 resp_show(const struct req *req, const char *file) |
|
} |
} |
|
|
static void |
static void |
pg_show(const struct req *req, const char *path) |
pg_show(struct req *req, const char *path) |
{ |
{ |
char *sub; |
char *sub; |
|
|
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
resp_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'; |
*sub++ = '\0'; |
|
|
|
if ( ! validate_manpath(req, path)) { |
|
pg_error_badrequest( |
|
"You specified an invalid manpath."); |
|
return; |
|
} |
|
|
/* |
/* |
* Begin by chdir()ing into the manpath. |
* Begin by chdir()ing into the manpath. |
* This way we can pick up the database files, which are |
* This way we can pick up the database files, which are |
Line 796 pg_show(const struct req *req, const char *path) |
|
Line 862 pg_show(const struct req *req, const char *path) |
|
*/ |
*/ |
|
|
if (-1 == chdir(path)) { |
if (-1 == chdir(path)) { |
resp_error_badrequest( |
fprintf(stderr, "chdir %s: %s\n", |
"You specified an invalid manpath."); |
path, strerror(errno)); |
|
pg_error_internal(); |
return; |
return; |
} |
} |
|
|
|
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_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
resp_show(req, sub); |
resp_show(req, sub); |
Line 825 pg_search(const struct req *req) |
|
Line 901 pg_search(const struct req *req) |
|
*/ |
*/ |
|
|
if (-1 == (chdir(req->q.manpath))) { |
if (-1 == (chdir(req->q.manpath))) { |
resp_error_badrequest( |
fprintf(stderr, "chdir %s: %s\n", |
"You specified an invalid manpath."); |
req->q.manpath, strerror(errno)); |
|
pg_error_internal(); |
return; |
return; |
} |
} |
|
|
Line 863 pg_search(const struct req *req) |
|
Line 940 pg_search(const struct req *req) |
|
} |
} |
|
|
if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
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) |
else if (0 == ressz) |
resp_noresult(req, "No results found."); |
pg_noresult(req, "No results found."); |
else |
else |
resp_search(req, res, ressz); |
pg_searchres(req, res, ressz); |
|
|
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |
free(cp[i]); |
free(cp[i]); |
|
|
if (NULL == (scriptname = getenv("SCRIPT_NAME"))) |
if (NULL == (scriptname = getenv("SCRIPT_NAME"))) |
scriptname = ""; |
scriptname = ""; |
|
|
if (NULL == (httphost = getenv("HTTP_HOST"))) |
if ( ! validate_urifrag(scriptname)) { |
httphost = "localhost"; |
fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n", |
|
scriptname); |
|
pg_error_internal(); |
|
return(EXIT_FAILURE); |
|
} |
|
|
/* |
/* |
* First we change directory into the MAN_DIR so that |
* First we change directory into the MAN_DIR so that |
|
|
if (-1 == chdir(MAN_DIR)) { |
if (-1 == chdir(MAN_DIR)) { |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
MAN_DIR, strerror(errno)); |
MAN_DIR, strerror(errno)); |
resp_error_internal(); |
pg_error_internal(); |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
} |
} |
|
|
|
|
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)) { |
|
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. */ |
/* Dispatch to the three different pages. */ |
|
|
path = getenv("PATH_INFO"); |
path = getenv("PATH_INFO"); |
|
|
else if (NULL != req.q.expr) |
else if (NULL != req.q.expr) |
pg_search(&req); |
pg_search(&req); |
else |
else |
resp_index(&req); |
pg_index(&req); |
|
|
for (i = 0; i < (int)req.psz; i++) |
for (i = 0; i < (int)req.psz; i++) |
free(req.p[i]); |
free(req.p[i]); |
Line 960 pathgen(struct req *req) |
|
Line 1053 pathgen(struct req *req) |
|
char *dp; |
char *dp; |
size_t dpsz; |
size_t dpsz; |
|
|
if (NULL == (fp = fopen("manpath.conf", "r"))) |
if (NULL == (fp = fopen("manpath.conf", "r"))) { |
return; |
fprintf(stderr, "%s/manpath.conf: %s\n", |
|
MAN_DIR, strerror(errno)); |
|
pg_error_internal(); |
|
exit(EXIT_FAILURE); |
|
} |
|
|
while (NULL != (dp = fgetln(fp, &dpsz))) { |
while (NULL != (dp = fgetln(fp, &dpsz))) { |
if ('\n' == dp[dpsz - 1]) |
if ('\n' == dp[dpsz - 1]) |
dpsz--; |
dpsz--; |
req->p = mandoc_realloc(req->p, |
req->p = mandoc_realloc(req->p, |
(req->psz + 1) * sizeof(char *)); |
(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); |
} |
} |
} |
} |