summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/cgi.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fatal errors no longer exist.schwarze2015-01-151-11/+3
| | | | | | If a file can be opened, mandoc will produce some output; at worst, the output may be almost empty. Simplifies error handling and frees a message type for future use.
* Make the code sipler and more robust by always assigning a valueschwarze2014-11-261-13/+6
| | | | to q.manpath and dropping the (incomplete) later NULL checks.
* In man(1) mode without -a, stop searching after the first manual treeschwarze2014-11-111-1/+2
| | | | | that contained at least one match in order to not prefer mdoc(1) from ports over mdoc(7). As a bonus, this results in a speedup.
* Make the character table available to libroff so it can check theschwarze2014-10-281-3/+7
| | | | | | | | validity of character escape names and warn about unknown ones. This requires mchars_spec2cp() to report unknown names again. Fortunately, that doesn't require changing the calling code because according to groff, invalid character escapes should not produce output anyway, and now that we warn about them, that's fine.
* be a bit more patient, 1s is sometimes insufficient for legitimate queriesschwarze2014-10-071-3/+3
|
* Switch HTML output to polyglot HTML5; have only one single -Thml mode.schwarze2014-10-071-6/+3
| | | | | | | | Replace hard-coded widths and alignments with a minimal embedded stylesheet. Do not use <p> because it cannot appear inside block macros. Remove the "summary" attribute because it is not HTML5. Written by kristaps@ some months ago, finished during EuroBSDCon.
* Support backslash-escaping of white space in the query expression,schwarze2014-09-141-34/+33
| | | | | | to be more similar to apropos(1) called from the shell. Missing feature reported by Marcus MERIGHI <mcmer dash openbsd at tor dot at> on misc@.
* Add an implementation of man(1) into the /usr/bin/mandoc binary andschwarze2014-08-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | provide a unified set of command line options for mandoc(1), man(1), apropos(1), and whatis(1), each option doing the same for all four. Not adding any completely new options, only extending exiting ones from one tool to the others. New options are: * apropos & whatis -acfkw (in the past, these were man(1) only) * apropos & whatis -a -IOTW (in the past, mandoc(1) only) * mandoc -ac (in the past, man(1) only) * man -IOTW (in the past, mandoc(1) only) Before we can decide whether or not we want to replace src/usr.bin/man with this implementation, considerable bugfixing, testing, and performance measurements are needed, which i'd rather do in the tree than outside. Note that these bugs only affect the new man(1) mode, existing mandoc(1), apropos(1), and whatis(1) is fine. The new functionality in mandoc(1), apropos(1), and whatis(1) is fully enabled. To play with the new man(1), you can try: # mv /usr/bin/man /usr/bin/oman # ln -s /usr/bin/mandoc /usr/bin/man Positive feedback about the general direction from sthen@ and jmc@, and deraadt@ is not against it.
* Unify console and CGI section titles, bringing them closer to groff,schwarze2014-08-261-7/+7
| | | | | | | | | | | | | | is an attempt to reduce confusion for users switching between media and between different operating systems. Not using the groff title for section 4 is intentional, it is just too awful ("Kernel Interfaces Manual"), and the difference from sections 2 and 9 would be too hard to see. Positive feedback from at least deraadt@ millert@ bluhm@ jca@. Previously also agreed with the general direction: jmc@ Nick@. The title for 3p was polished by bluhm@. The existing mismatches were originally noticed by jsg@.
* limit CGI process execution time to make REDoS attacks less effective;schwarze2014-08-211-1/+18
| | | | attack surface pointed out by Sebastien Marie
* mansearch.h uses uint64_t, so it needs stdint.h; found on Linuxschwarze2014-08-081-1/+2
|
* Choosing the right encoding is a tricky business...schwarze2014-07-251-35/+9
| | | | | | | | | | | | | | Printing query strings for URIs *always* needs URI-encoding, and when embedding the URI into an HTML document, it needs replacement of the "&" separators by "&amp;" *in addition to that*, not instead. Delete the function html_primtquery(), it was completely wrong. You can see the badness by entering "mandoc &sec=2" into the query input box before this patch and click "Submit". You come to the right page at first (...man.cgi?query=mandoc+%26sec%3D2&apropos=0&sec=0&...), but now the link to mandoc(1) is wrong: ...mandoc.1?query=mandoc &amp;sec=2&amp;... Clicking on that, the "&sec=2" disappears from the query input box and suddenly you have the first dropdown set to "2 - System Calls". Oops.
* Sort the URI keys for .Xr links in the same order used by the search form,schwarze2014-07-251-8/+13
| | | | | and leave out the manpath when it is the default. For building the HTML formatter options, do not use a static buffer.
* oops, we must not try to validate a manpath we don't have;schwarze2014-07-251-2/+3
| | | | fixing an oversight introduced in rev. 1.17
* We cannot easily control the order of the QUERY_STRING keys generatedschwarze2014-07-251-17/+19
| | | | | | | | | | | | by the search form, it's just the order of the fields in the form. Actually, that's not too bad; the generated URI resembles the generating form. To minimize confusion for people looking at URIs, give the keys in the same order when generating URIs for search listings and search redirections, the latter being used instead of search listings that would have only one single entry. Also, if the manpath is the default, remove it form the generated URIs.
* In generated .Xr links, avoid double encoding of ampersandsschwarze2014-07-251-2/+3
| | | | and avoid empty arch= keys.
* Even though this is not XHTML yet, remove some gratuitious violationsschwarze2014-07-251-12/+12
| | | | of XHTML syntax. Also add some cosmetic newlines to the HTML code.
* The names of all other struct query memebers match the correspondingschwarze2014-07-251-13/+17
| | | | | | QUERY_STRING keys, so rename "expr" to "query". Also add some missing function prototypes. No functional change.
* clean up pg_show() to not modify a string returned from getenv(3)schwarze2014-07-251-15/+20
|
* Rewrite http_parse() completely:schwarze2014-07-251-48/+103
| | | | | | | | | 1. Make sure the last occurrence of each key is used, even if it is empty, in which case it resets the value to the default. 2. When there is an HTTP encoding error, skip the affected key-value pair only, but not all subsequent key-value pairs. 3. Do not modify a string returned from getenv(3). 4. Do not assume the NULL pointer is all null bits.
* Sort result pages first by section number, then by name.schwarze2014-07-241-12/+1
| | | | | | | | By moving the sort from cgi.c to mansearch.c, we get two advantages: Easier access to the data needed for sorting, in particular the section number, and the apropos(1) command line utility profits as well. Feature requested by deraadt@.
* Provide a dropdown entry "All Architectures" and make it the default.schwarze2014-07-241-2/+26
| | | | | | | Still, amd64 remains the default in the following sense: If a man(1) mode search returns more than one page of the same name, prefer amd64 over other architectures for immediate display. ok deraadt@ daniel@
* Security fix to prevent XSS attacks:schwarze2014-07-221-2/+42
| | | | | | | | Restrict the character set of strings passed into html_alloc(), in particular architecture names that come from the QUERY_STRING, but also SCRIPT_NAME and manpath.conf content for additional safety, and bail out safely on violations. Issue reported by Sebastien Marie <semarie-openbsd at latrappe dot fr>.
* fix a minibug reported by kristaps@:schwarze2014-07-211-6/+10
| | | | preserve manpath and arch in .Xr links
* Kristaps points out that the current HTTP/1.1 draft standard (RFCschwarze2014-07-211-3/+3
| | | | | | | | | | | | | | | | | | 2616) requires the Location: response-header field to be an absolute URI (14.30), and only the most recent proposed standard (RFC 7231), which is barely a month old, allows a relative Location: (7.1.2). While most modern browsers appear to support relative Location: headers, some may not, and it's maybe a bit early to rely on relative Location: headers. I'm not going back to the HTTP_HOST or SERVER_NAME CGI variables, though. While some CGI programs certainly require those, in which case both the CGI programmer and the web server admin have to be very careful to keep the system secure and reliable, man.cgi(8) does not really need them. We always know at compile time which domain we are running for, and for man.cgi(8), security and reliability are definitely much more important than flexibility. So make HTTP_HOST a compile-time definition for now.
* Security fix:schwarze2014-07-191-5/+34
| | | | | | | | | | | Validate the manpath up front and report a Bad Request if it is not listed in manpath.conf, such that clients can't probe which directories exist on the server. In case of configuration errors, consistently report Internal Server Error without disclosing any further information. Partially based on a patch from Sebastien Marie <semarie-openbsd at latrappe dot fr>, but avoiding a couple of issues with that patch and approaching the issue in a somewhat more rigorous way.
* Security fix:schwarze2014-07-191-2/+29
| | | | | | | | | | | | Validate the name of the file to show before opening it. Only allow relative filenames starting with "man" or "cat" and containing neither "/.." nor "../". While here, correct the condition discarding an initial "./". Vulnerability found by Sebastien Marie <semarie-openbsd at latrappe dot fr>. Many thanks for sending a patch; however, i did not use it but made the checks even stricter.
* Do not use the HTTP_HOST CGI variable,schwarze2014-07-181-7/+3
| | | | | | | | just make the HTTP redirect Location: relative. Less user input is good, it reduces the attack surface. Besides, this removes one global variable and 4 lines of code. Patch from Sebastien Marie <semarie-openbsd at latrappe dot fr>.
* When the MAN_DIR/manpath.conf configuration file does not exist or is empty,schwarze2014-07-181-3/+13
| | | | | | | | | log the problem, hand the pg_error_internal() error page to the client, and exit(3) in a controlled way instead of stumbling on and segfaulting later. Patch from Sebastien Marie <semarie-openbsd at latrappe dot fr>, messages tweaked by me.
* Compatibility hack for the old "manpath=OpenBSD<blank>" query parameter format;schwarze2014-07-131-5/+16
| | | | | unfortunate, more than 400 links needing this are scattered all around the www.openbsd.org website, and CVSweb needs this as well.
* Make the calltree a bit easier to understand by giving theschwarze2014-07-131-23/+22
| | | | | | functions that call resp_begin_html() names starting with "pg_" and those called after resp_begin_html() names with "resp_". No functional change, purely renaming functions.
* make source vs. formatted guessing a bit more robustschwarze2014-07-131-1/+3
|
* By popular demand, bring man.cgi default mode closer to what man(1) does:schwarze2014-07-131-21/+47
| | | | | | Even when there are multiple pages with the same name in different sections, show one of them, using the same priorities as in the default man.conf(5) file.
* Install the manuals of the web interface below the same directoryschwarze2014-07-131-5/+5
| | | | | | | | as manpath.conf, such that we do not need to mix our own documentation into the documentation we are serving, which may not even be possible if the latter is updated automatically. Based on an idea by beck@.
* Polish the search form using feedback from beck@ and others,schwarze2014-07-121-28/+97
| | | | in particular introduce a section dropdown and an architecture dropdown.
* No need for run-time configuration, add minimal compile-timeschwarze2014-07-121-18/+8
| | | | | configuration facilities, just two paths and two HTML strings. Show the title on all pages, not just the index page.
* Simplify: Delete 74 lines of code including one enum type, oneschwarze2014-07-121-99/+26
| | | | | | global lookup table, two functions, two function arguments, one struct member, one local variable, and the "search/" and "show/" part of the URIs, all without losing functionality.
* Start fixing issues that beck@ helped find:schwarze2014-07-121-38/+35
| | | | | | | | | | | | Distinguish between man(1) and apropos(1) mode by adding back the classical QUERY_STRING variable "apropos=". Change the default back to "apropos=0". Control it by adding a HTML <SELECT> element for it. Rename the "expr=" QUERY_STRING variable back to its classical name "query=", i don't see how the new name is better than the classical one. While here, drop the concept of a "legacy mode". Simply continue to support the features, and use what we consider best.
* fix the two links on the start pageschwarze2014-07-121-8/+9
|
* make http decode linear time. also remove a redundant null check.tedu2014-07-111-7/+9
| | | | ok schwarze
* http headers must end lines with CRLF. ok schwarzetedu2014-07-111-9/+10
|
* Bring in man.cgi(8) to maintain it in our tree together with mandoc.schwarze2014-07-111-0/+954
It will not be enabled in the build nor installed by default. A comment in the Makefile lists the three simple steps needed to build, install, and run it on the two machines worldwide that are going to run it. deraadt@ agrees with having the code in the tree.
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.