mandoc/cgi.c - diff

Return to cgi.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/cgi.c between version 1.92 and 1.101

version 1.92, 2014/08/05 15:29:30

version 1.101, 2014/11/11 19:04:55

Line 15

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <sys/types.h>

#include <sys/time.h>

#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

Line 91 static const char *const sec_names[] = {

Line 92 static const char *const sec_names[] = {

"All Sections",

"1 - General Commands",

"2 - System Calls",

"3 - Subroutines",

"3 - Library Functions",

"3p - Perl Subroutines",

"3p - Perl Library",

"4 - Special Files",

"4 - Device Drivers",

"5 - File Formats",

"6 - Games",

"7 - Macros and Conventions",

"7 - Miscellaneous Information",

"8 - Maintenance Commands",

"8 - System Manager\'s Manual",

"9 - Kernel Interface"

"9 - Kernel Developer\'s Manual"

};

static const int sec_MAX = sizeof(sec_names) / sizeof(char *);

Line 375 resp_begin_html(int code, const char *msg)

Line 376 resp_begin_html(int code, const char *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"

"<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\""

" TYPE=\"text/css\" media=\"all\">\n"

"<LINK REL=\"stylesheet\" HREF=\"%s/man.css\""

Line 826 static void

Line 824 static void

format(const struct req *req, const char *file)

{

struct mparse *mp;

struct mchars *mchars;

struct mdoc *mdoc;

struct man *man;

void *vp;

Line 839 format(const struct req *req, const char *file)

Line 838 format(const struct req *req, const char *file)

return;

}

mchars = mchars_alloc();

mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,

req->q.manpath);

mchars, req->q.manpath);

rc = mparse_readfd(mp, fd, file);

close(fd);

Line 866 format(const struct req *req, const char *file)

req->q.manpath, file);

pg_error_internal();

mparse_free(mp);

mchars_free(mchars);

return;

}

vp = html_alloc(opts);

vp = html_alloc(mchars, opts);

if (NULL != mdoc)

html_mdoc(vp, mdoc);

Line 878 format(const struct req *req, const char *file)

Line 879 format(const struct req *req, const char *file)

html_free(vp);

mparse_free(mp);

mchars_free(mchars);

free(opts);

}

Line 953 pg_search(const struct req *req)

Line 955 pg_search(const struct req *req)

struct mansearch search;

struct manpaths paths;

struct manpage *res;

char **cp;

char **argv;

const char *ep, *start;

char *query, *rp, *wp;

size_t ressz;

int i, sz;

int argc;

* Begin by chdir()ing into the root of the manpath.

Line 973 pg_search(const struct req *req)

Line 975 pg_search(const struct req *req)

search.arch = req->q.arch;

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;

search.firstmatch = 1;

paths.sz = 1;

paths.paths = mandoc_malloc(sizeof(char *));

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, "Nd", &res, &ressz))

if (0 == mansearch(&search, &paths, argc, argv, &res, &ressz))

pg_noresult(req, "You entered an invalid query.");

else if (0 == ressz)

pg_noresult(req, "No results found.");

else

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);

}

Line 1029 int

Line 1031 int

main(void)

{

struct req req;

struct itimerval itimer;

const char *path;

const char *querystring;

int i;

/* Poor man's ReDoS mitigation. */

itimer.it_value.tv_sec = 2;

itimer.it_value.tv_usec = 0;

itimer.it_interval.tv_sec = 2;

itimer.it_interval.tv_usec = 0;

if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) {

fprintf(stderr, "setitimer: %s\n", strerror(errno));

pg_error_internal();

return(EXIT_FAILURE);

}

/* Scan our run-time environment. */

CVSweb