version 1.72, 2014/07/13 12:55:45 |
version 1.76, 2014/07/19 11:35:12 |
Line 79 static void resp_searchform(const struct req *); |
|
Line 79 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 250 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 456 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_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 |
pg_index(const struct req *req) |
pg_index(const struct req *req) |
{ |
{ |
Line 513 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 534 pg_searchres(const struct req *req, struct manpage *r, |
|
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 |
* without any delay. |
* without any delay. |
*/ |
*/ |
printf("Status: 303 See Other\r\n"); |
printf("Status: 303 See Other\r\n"); |
printf("Location: http://%s%s/%s/%s?", |
printf("Location: %s/%s/%s?", |
httphost, scriptname, req->q.manpath, r[0].file); |
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 767 format(const struct req *req, const char *file) |
|
Line 797 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 800 pg_show(const struct req *req, const char *path) |
|
Line 831 pg_show(const struct req *req, const char *path) |
|
return; |
return; |
} |
} |
|
|
|
if ( ! validate_filename(sub)) { |
|
pg_error_badrequest( |
|
"You specified an invalid manual file."); |
|
return; |
|
} |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
resp_show(req, sub); |
resp_show(req, sub); |
|
|
if (NULL == (scriptname = getenv("SCRIPT_NAME"))) |
if (NULL == (scriptname = getenv("SCRIPT_NAME"))) |
scriptname = ""; |
scriptname = ""; |
|
|
if (NULL == (httphost = getenv("HTTP_HOST"))) |
|
httphost = "localhost"; |
|
|
|
/* |
/* |
* First we change directory into the MAN_DIR so that |
* First we change directory into the MAN_DIR so that |
* subsequent scanning for manpath directories is rooted |
* subsequent scanning for manpath directories is rooted |
Line 959 pathgen(struct req *req) |
|
Line 993 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]) |
Line 968 pathgen(struct req *req) |
|
Line 1006 pathgen(struct req *req) |
|
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); |
req->p[req->psz++] = mandoc_strndup(dp, dpsz); |
|
} |
|
|
|
if ( req->p == NULL ) { |
|
fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR); |
|
pg_error_internal(); |
|
exit(EXIT_FAILURE); |
} |
} |
} |
} |