mandoc/cgi.c - diff

Return to cgi.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/cgi.c between version 1.103 and 1.112

version 1.103, 2015/01/15 04:26:39

version 1.112, 2015/10/22 22:06:43

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

* copyright notice and this permission notice appear in all copies.

* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

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

Line 30

#include <string.h>

#include <unistd.h>

#include "mandoc.h"

#include "mandoc_aux.h"

#include "mandoc.h"

#include "roff.h"

#include "mdoc.h"

#include "man.h"

#include "main.h"

#include "manpath.h"

#include "manconf.h"

#include "mansearch.h"

#include "cgi.h"

Line 58 static void catman(const struct req *, const char *)

Line 61 static void catman(const struct req *, const char *)

static void format(const struct req *, const char *);

static void html_print(const char *);

static void html_putchar(char);

static int http_decode(char *);

static void http_parse(struct req *, const char *);

static void http_print(const char *);

static void http_putchar(char);

static void http_printquery(const struct req *, const char *);

static void pathgen(struct req *);

static void pg_error_badrequest(const char *);

Line 186 http_print(const char *p)

Line 189 http_print(const char *p)

static void

html_print(const char *p)

{

if (NULL == p)

return;

while ('\0' != *p)

Line 331 http_decode(char *p)

Line 334 http_decode(char *p)

for ( ; '\0' != *p; p++, q++) {

if ('%' == *p) {

if ('\0' == (hex[0] = *(p + 1)))

return(0);

return 0;

if ('\0' == (hex[1] = *(p + 2)))

return(0);

return 0;

if (1 != sscanf(hex, "%x", &c))

return(0);

return 0;

if ('\0' == c)

return(0);

return 0;

*q = (char)c;

p += 2;

Line 346 http_decode(char *p)

Line 349 http_decode(char *p)

}

*q = '\0';

return(1);

return 1;

}

static void

Line 498 validate_urifrag(const char *frag)

Line 501 validate_urifrag(const char *frag)

if ( ! (isalnum((unsigned char)*frag) ||

'-' == *frag || '.' == *frag ||

'/' == *frag || '_' == *frag))

return(0);

return 0;

frag++;

}

return(1);

return 1;

}

static int

Line 510 validate_manpath(const struct req *req, const char* ma

Line 513 validate_manpath(const struct req *req, const char* ma

size_t i;

if ( ! strcmp(manpath, "mandoc"))

return(1);

return 1;

for (i = 0; i < req->psz; i++)

if ( ! strcmp(manpath, req->p[i]))

return(1);

return 1;

return(0);

return 0;

}

static int

Line 526 validate_filename(const char *file)

Line 529 validate_filename(const char *file)

if ('.' == file[0] && '/' == file[1])

file += 2;

return ( ! (strstr(file, "../") || strstr(file, "/..") ||

return ! (strstr(file, "../") || strstr(file, "/..") ||

(strncmp(file, "man", 3) && strncmp(file, "cat", 3))));

(strncmp(file, "man", 3) && strncmp(file, "cat", 3)));

}

static void

Line 621 pg_searchres(const struct req *req, struct manpage *r,

Line 624 pg_searchres(const struct req *req, struct manpage *r,

for (i = 0; i < sz; i++) {

printf("<TR>\n"

"<TD CLASS=\"title\">\n"

"<A HREF=\"%s/%s/%s?",

scriptname, req->q.manpath, r[i].file);

http_printquery(req, "&");

printf("\">");

Line 701 catman(const struct req *req, const char *file)

Line 704 catman(const struct req *req, const char *file)

while (NULL != (p = fgetln(f, &len))) {

bold = italic = 0;

for (i = 0; i < (int)len - 1; i++) {

* This means that the catpage is out of state.

* Ignore it and keep going (although the

* catpage is bogus).

Line 742 catman(const struct req *req, const char *file)

Line 745 catman(const struct req *req, const char *file)

continue;

}

* Handle funny behaviour troff-isms.

* These grok'd from the original man2html.c.

Line 780 catman(const struct req *req, const char *file)

Line 783 catman(const struct req *req, const char *file)

}

/* Bold mode. */

if (italic)

printf("</I>");

if ( ! bold)

Line 791 catman(const struct req *req, const char *file)

Line 794 catman(const struct req *req, const char *file)

html_putchar(p[i]);

}

* Clean up the last character.

* We can get to a newline; don't print that.

if (italic)

Line 816 catman(const struct req *req, const char *file)

Line 819 catman(const struct req *req, const char *file)

static void

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

{

struct manoutput conf;

struct mparse *mp;

struct mchars *mchars;

struct roff_man *man;

struct mdoc *mdoc;

struct man *man;

void *vp;

char *opts;

int fd;

int usepath;

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

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

return;

}

mchars = mchars_alloc();

mchars_alloc();

mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL,

mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath);

mchars, req->q.manpath);

mparse_readfd(mp, fd, file);

close(fd);

memset(&conf, 0, sizeof(conf));

conf.fragment = 1;

usepath = strcmp(req->q.manpath, req->p[0]);

mandoc_asprintf(&opts,

mandoc_asprintf(&conf.man, "%s?query=%%N&sec=%%S%s%s%s%s",

"fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",

scriptname,

req->q.arch ? "&arch=" : "",

req->q.arch ? req->q.arch : "",

usepath ? "&manpath=" : "",

usepath ? req->q.manpath : "");

mparse_result(mp, &mdoc, &man, NULL);

mparse_result(mp, &man, NULL);

if (NULL == man && NULL == mdoc) {

if (man == NULL) {

fprintf(stderr, "fatal mandoc error: %s/%s\n",

req->q.manpath, file);

pg_error_internal();

mparse_free(mp);

mchars_free(mchars);

mchars_free();

return;

}

vp = html_alloc(mchars, opts);

vp = html_alloc(&conf);

if (NULL != mdoc)

if (man->macroset == MACROSET_MDOC) {

html_mdoc(vp, mdoc);

mdoc_validate(man);

else

html_mdoc(vp, man);

} else {

man_validate(man);

html_man(vp, man);

}

html_free(vp);

mparse_free(mp);

mchars_free(mchars);

mchars_free();

free(opts);

free(conf.man);

}

static void

Line 891 pg_show(struct req *req, const char *fullpath)

Line 895 pg_show(struct req *req, const char *fullpath)

pg_error_badrequest(

"You did not specify a page to show.");

return;

}

manpath = mandoc_strndup(fullpath, file - fullpath);

file++;

Line 1030 main(void)

Line 1034 main(void)

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

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

pg_error_internal();

return(EXIT_FAILURE);

return EXIT_FAILURE;

}

/* Scan our run-time environment. */

Line 1042 main(void)

Line 1046 main(void)

fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n",

scriptname);

pg_error_internal();

return(EXIT_FAILURE);

return EXIT_FAILURE;

}

Line 1055 main(void)

Line 1059 main(void)

fprintf(stderr, "MAN_DIR: %s: %s\n",

MAN_DIR, strerror(errno));

pg_error_internal();

return(EXIT_FAILURE);

return EXIT_FAILURE;

}

memset(&req, 0, sizeof(struct req));

pathgen(&req);

Line 1071 main(void)

Line 1075 main(void)

else if ( ! validate_manpath(&req, req.q.manpath)) {

pg_error_badrequest(

"You specified an invalid manpath.");

return(EXIT_FAILURE);

return EXIT_FAILURE;

}

if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) {

pg_error_badrequest(

"You specified an invalid architecture.");

return(EXIT_FAILURE);

return EXIT_FAILURE;

}

/* Dispatch to the three different pages. */

Line 1102 main(void)

Line 1106 main(void)

for (i = 0; i < (int)req.psz; i++)

free(req.p[i]);

free(req.p);

return(EXIT_SUCCESS);

return EXIT_SUCCESS;

}

CVSweb