On a new RS nesting level, the saved width starts from the default

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 8150308166ce9fffd1e04f471c76d0e9947c54b5..402be8f9e9d9607da3b1eb1b06a6c737f47fd956 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,15 +1,15 @@
-/*     $Id: cgi.c,v 1.97 2014/09/14 19:44:28 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.106 2015/03/27 21:33:20 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de>

  *
  * 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.
  *
  *
  * 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
  * 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
  * 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


@@ -33,7 +33,7 @@
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include "main.h"
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include "main.h"

-#include "manpath.h"
+#include "manconf.h"

 #include "mansearch.h"
 #include "cgi.h"
 
 #include "mansearch.h"
 #include "cgi.h"
 


@@ -58,10 +58,10 @@ 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 void             format(const struct req *, const char *);
 static void             html_print(const char *);
 static void             html_putchar(char);

-static int              http_decode(char *);
+static int              http_decode(char *);

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

-static void             http_putchar(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 *);
 static void             http_printquery(const struct req *, const char *);
 static void             pathgen(struct req *);
 static void             pg_error_badrequest(const char *);


@@ -163,8 +163,7 @@ http_printquery(const struct req *req, const char *sep)
                printf("%sarch=", sep);
                http_print(req->q.arch);
        }
                printf("%sarch=", sep);
                http_print(req->q.arch);
        }

-       if (NULL != req->q.manpath &&
-           strcmp(req->q.manpath, req->p[0])) {
+       if (strcmp(req->q.manpath, req->p[0])) {

                printf("%smanpath=", sep);
                http_print(req->q.manpath);
        }
                printf("%smanpath=", sep);
                http_print(req->q.manpath);
        }


@@ -187,7 +186,7 @@ http_print(const char *p)
 static void
 html_print(const char *p)
 {
 static void
 html_print(const char *p)
 {

-       
+

        if (NULL == p)
                return;
        while ('\0' != *p)
        if (NULL == p)
                return;
        while ('\0' != *p)


@@ -298,11 +297,6 @@ next:
                if (*qs != '\0')
                        qs++;
        }
                if (*qs != '\0')
                        qs++;
        }

-
-       /* Fall back to the default manpath. */
-
-       if (req->q.manpath == NULL)
-               req->q.manpath = mandoc_strdup(req->p[0]);

 }
 
 static void
 }
 
 static void


@@ -376,13 +370,10 @@ resp_begin_html(int code, const char *msg)
 
        resp_begin_http(code, msg);
 
 
        resp_begin_http(code, msg);
 

-       printf("<!DOCTYPE HTML PUBLIC "
-              " \"-//W3C//DTD HTML 4.01//EN\""
-              " \"http://www.w3.org/TR/html4/strict.dtd\">\n"
+       printf("<!DOCTYPE html>\n"

               "<HTML>\n"
               "<HEAD>\n"
               "<HTML>\n"
               "<HEAD>\n"

-              "<META HTTP-EQUIV=\"Content-Type\""
-              " CONTENT=\"text/html; charset=utf-8\">\n"
+              "<META 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\""
               "<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\""
               " TYPE=\"text/css\" media=\"all\">\n"
               "<LINK REL=\"stylesheet\" HREF=\"%s/man.css\""


@@ -472,8 +463,7 @@ resp_searchform(const struct req *req)
                puts("<SELECT NAME=\"manpath\">");
                for (i = 0; i < (int)req->psz; i++) {
                        printf("<OPTION ");
                puts("<SELECT NAME=\"manpath\">");
                for (i = 0; i < (int)req->psz; i++) {
                        printf("<OPTION ");

-                       if (NULL == req->q.manpath ? 0 == i :
-                           0 == strcmp(req->q.manpath, req->p[i]))
+                       if (strcmp(req->q.manpath, req->p[i]) == 0)

                                printf("SELECTED=\"selected\" ");
                        printf("VALUE=\"");
                        html_print(req->p[i]);
                                printf("SELECTED=\"selected\" ");
                        printf("VALUE=\"");
                        html_print(req->p[i]);


@@ -631,7 +621,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
        for (i = 0; i < sz; i++) {
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"
        for (i = 0; i < sz; i++) {
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"

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

                    scriptname, req->q.manpath, r[i].file);
                http_printquery(req, "&amp;");
                printf("\">");
                    scriptname, req->q.manpath, r[i].file);
                http_printquery(req, "&amp;");
                printf("\">");


@@ -711,7 +701,7 @@ 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++) {
        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).
                         * This means that the catpage is out of state.
                         * Ignore it and keep going (although the
                         * catpage is bogus).


@@ -752,7 +742,7 @@ catman(const struct req *req, const char *file)
                                continue;
                        }
 
                                continue;
                        }
 

-                       /* 
+                       /*

                         * Handle funny behaviour troff-isms.
                         * These grok'd from the original man2html.c.
                         */
                         * Handle funny behaviour troff-isms.
                         * These grok'd from the original man2html.c.
                         */


@@ -790,7 +780,7 @@ catman(const struct req *req, const char *file)
                        }
 
                        /* Bold mode. */
                        }
 
                        /* Bold mode. */

-                       
+

                        if (italic)
                                printf("</I>");
                        if ( ! bold)
                        if (italic)
                                printf("</I>");
                        if ( ! bold)


@@ -801,9 +791,9 @@ catman(const struct req *req, const char *file)
                        html_putchar(p[i]);
                }
 
                        html_putchar(p[i]);
                }
 

-               /* 
+               /*

                 * Clean up the last character.
                 * Clean up the last character.

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

                 */
 
                if (italic)
                 */
 
                if (italic)


@@ -826,12 +816,12 @@ catman(const struct req *req, const char *file)
 static void
 format(const struct req *req, const char *file)
 {
 static void
 format(const struct req *req, const char *file)
 {

+       struct manoutput conf;

        struct mparse   *mp;
        struct mparse   *mp;

+       struct mchars   *mchars;

        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;
        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;

-       char            *opts;
-       enum mandoclevel rc;

        int              fd;
        int              usepath;
 
        int              fd;
        int              usepath;
 


@@ -840,21 +830,16 @@ format(const struct req *req, const char *file)
                return;
        }
 
                return;
        }
 

-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
-           req->q.manpath);
-       rc = mparse_readfd(mp, fd, file);
+       mchars = mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL,
+           mchars, req->q.manpath);
+       mparse_readfd(mp, fd, file);

        close(fd);
 
        close(fd);
 

-       if (rc >= MANDOCLEVEL_FATAL) {
-               fprintf(stderr, "fatal mandoc error: %s/%s\n",
-                   req->q.manpath, file);
-               pg_error_internal();
-               return;
-       }
-
+       memset(&conf, 0, sizeof(conf));
+       conf.fragment = 1;

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

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

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


@@ -867,10 +852,11 @@ format(const struct req *req, const char *file)
                    req->q.manpath, file);
                pg_error_internal();
                mparse_free(mp);
                    req->q.manpath, file);
                pg_error_internal();
                mparse_free(mp);

+               mchars_free(mchars);

                return;
        }
 
                return;
        }
 

-       vp = html_alloc(opts);
+       vp = html_alloc(mchars, &conf);

 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);
 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);


@@ -879,7 +865,8 @@ format(const struct req *req, const char *file)
 
        html_free(vp);
        mparse_free(mp);
 
        html_free(vp);
        mparse_free(mp);

-       free(opts);
+       mchars_free(mchars);
+       free(conf.man);

 }
 
 static void
 }
 
 static void


@@ -905,7 +892,7 @@ pg_show(struct req *req, const char *fullpath)
                pg_error_badrequest(
                    "You did not specify a page to show.");
                return;
                pg_error_badrequest(
                    "You did not specify a page to show.");
                return;

-       } 
+       }

        manpath = mandoc_strndup(fullpath, file - fullpath);
        file++;
 
        manpath = mandoc_strndup(fullpath, file - fullpath);
        file++;
 


@@ -976,6 +963,7 @@ pg_search(const struct req *req)
        search.sec = req->q.sec;
        search.outkey = "Nd";
        search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR;
        search.sec = req->q.sec;
        search.outkey = "Nd";
        search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR;

+       search.firstmatch = 1;

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


@@ -1036,9 +1024,9 @@ main(void)
 
        /* 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;
        if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) {
                fprintf(stderr, "setitimer: %s\n", strerror(errno));
        itimer.it_interval.tv_usec = 0;
        if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) {
                fprintf(stderr, "setitimer: %s\n", strerror(errno));


@@ -1069,7 +1057,7 @@ main(void)
                    MAN_DIR, strerror(errno));
                pg_error_internal();
                return(EXIT_FAILURE);
                    MAN_DIR, strerror(errno));
                pg_error_internal();
                return(EXIT_FAILURE);

-       } 
+       }

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


@@ -1079,8 +1067,9 @@ main(void)
        if (NULL != (querystring = getenv("QUERY_STRING")))
                http_parse(&req, querystring);
 
        if (NULL != (querystring = getenv("QUERY_STRING")))
                http_parse(&req, querystring);
 

-       if ( ! (NULL == req.q.manpath ||
-           validate_manpath(&req, req.q.manpath))) {
+       if (req.q.manpath == NULL)
+               req.q.manpath = mandoc_strdup(req.p[0]);
+       else if ( ! validate_manpath(&req, req.q.manpath)) {

                pg_error_badrequest(
                    "You specified an invalid manpath.");
                return(EXIT_FAILURE);
                pg_error_badrequest(
                    "You specified an invalid manpath.");
                return(EXIT_FAILURE);