Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Sync the severity of the syslog_* functions shared between identd, slowcgi, ↵ | florian | 2020-05-24 | -5/+5 |
| | | | | | | tftp-proxy and tftpd to the severity used in log.c style loggers. This also fixes an issue where syslog_err and syslog_errx logged with different severities. Sure deraadt@ | |||
* | Add format attribute to logger functions. Fix format string while here. ↵ | florian | 2020-05-24 | -15/+28 |
| | | | | Input & OK benno@ | |||
* | As suggested by the FastCGI spec, zero-pad the response buffers to be ↵ | reyk | 2020-05-24 | -3/+22 |
| | | | | | | aligned to 8 bytes. This matches what most other implementations are doing. While here, make sure that the allocated response buffers are zero'ed out. OK florian@ | |||
* | typo in error message: to -> too | tb@openbsd.org | 2020-05-24 | -2/+2 |
| | | | | ok florian@ | |||
* | pledge(2) for slowcgi. After initialization slowcgi accepts from a AF_UNIX ↵ | florian | 2020-05-24 | -1/+6 |
| | | | | socket, forks and execs. After fork we only need to close(2), chdir(2) and exec. OK benno@ | |||
* | re-shuffle slowcgi_listen to run less code as root. OK benno@ | florian | 2020-05-24 | -15/+16 |
| | ||||
* | Output the contents of the environment in debug mode which is most helpful ↵ | millert | 2020-05-24 | -1/+2 |
| | | | | in debugging interactions between httpd and slowcgi. OK florian@ | |||
* | Clean up includes, while here fix a white space which lead to a false ↵ | florian | 2020-05-24 | -5/+5 |
| | | | | positive during grep'ing. OK reyk | |||
* | The kernel doesn't actually care what a sockaddr's sa_len is on input, so ↵ | guenther | 2020-05-24 | -5/+3 |
| | | | | | | don't waste code setting it improvment and ok florian@ | |||
* | Replace <sys/param.h> with <limits.h> and other less dirty headers where ↵ | deraadt | 2020-05-24 | -4/+5 |
| | | | | possible. Annotate <sys/param.h> lines with their current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution. These are the files confirmed through binary verification. ok guenther, millert, doug (helped with the verification protocol) | |||
* | read(2) returns ssize_t, not size_t | blambert | 2020-05-24 | -2/+3 |
| | | | | ok florian@ | |||
* | enable warnings | florian | 2020-05-24 | -1/+6 |
| | ||||
* | Bail out if the buffer is too small to contain the length of a parameter ↵ | florian | 2020-05-24 | -4/+4 |
| | | | | value. Found while investigating a dead store pointed out by llvm scan-build. | |||
* | dead stores; pointed out by llvm scan-build; no binary change | florian | 2020-05-24 | -5/+1 |
| | ||||
* | pause shadows global; pointed out by gcc; no binary change | florian | 2020-05-24 | -5/+5 |
| | ||||
* | mode is unused; pointed out by gcc; no binary change | florian | 2020-05-24 | -2/+2 |
| | ||||
* | declare lerr and lerrx __dead; unconfuses llvm scan-build | florian | 2020-05-24 | -12/+12 |
| | ||||
* | Instead of doing the fcntl(2) and ioctl(2) song and dance just tell ↵ | florian | 2020-05-24 | -11/+5 |
| | | | | socket(2) and accept4(2) that we want non-blocking-close-on-exec sockets. OK benno@ | |||
* | fix previous, and add a SEE ALSO section for httpd; | jmc | 2020-05-24 | -5/+5 |
| | ||||
* | remove nginx references | robert | 2020-05-24 | -5/+2 |
| | ||||
* | Use lerrx instead of errx since the logging subsystem is already ↵ | claudio | 2020-05-24 | -3/+3 |
| | | | | initialized. OK florian@ | |||
* | Implement -u (user to drop privs to) and -p flag (path to chroot to). This ↵ | florian | 2020-05-24 | -13/+45 |
| | | | | allows to run slowcgi non-chrooted with -p /, requested by at least ratchov@ and henning@. Input by many, OK ratchov@ on a previous diff, "looks good" millert@, man page bits tweak and OK schwarze@ (all some time ago); OK henning@ | |||
* | Cleanup socket creation. Input ajacoutot some time ago; OK henning@ | florian | 2020-05-24 | -13/+10 |
| | ||||
* | My previous attempt to chdir(2) to the directory containing the cgi script ↵ | florian | 2020-05-24 | -5/+10 |
| | | | | was not quite right. slowcgi would try to chdir("") with a SCRIPT_NAME of /foo.cgi; chdir("/") in that case. I'm not sure how one would configure nginx/slowcgi to get to that point though. OK benno@ | |||
* | Calculate the length of name and value for parameters the right way around ↵ | florian | 2020-05-24 | -6/+6 |
| | | | | for the 4 byte encoding. With this QUERY_STRING can be longer than 127 bytes. Found the hard way while playing with smokeping. OK benno@ | |||
* | httpd(8) did a chdir(2) to the directory containing the cgi script. As there ↵ | florian | 2020-05-24 | -1/+10 |
| | | | | | | might be scripts depending on this do the same in slowcgi(8). pointed out and OK ratchov@ | |||
* | jturner pointed out that if one wants to run cgi scripts outside /cgi-bin ↵ | florian | 2020-05-24 | -2/+6 |
| | | | | SCRIPT_NAME doesn't cut it. The spec says: "The SCRIPT_NAME variable MUST be set to a URL path". Use SCRIPT_FILENAME which can be an absolute filesystem path for these cases and fall back to using SCRIPT_NAME if SCRIPT_FILENAME is not present. Details how to handle this worked out by jturner and sthen. Based on an erlier diff by jturner. Tested by jturner OK jturner, sthen | |||
* | Better explanation what slowcgi(8) is for. Room for improvements pointed out ↵ | florian | 2020-05-24 | -2/+25 |
| | | | | by deraadt@ Tweaks/OK jmc@ OK deraadt@ | |||
* | Wording improvements from Patrik Lundin | deraadt | 2020-05-24 | -4/+4 |
| | ||||
* | fix reaper loop that could run indefinitely | djm | 2020-05-24 | -2/+5 |
| | | | | | | | log execve() failures to syslog (very useful for debugging SCRIPT_NAME problems) ok florian@ | |||
* | Make it clear that slowcgi(8) drops privileges to user www. Pointed out some ↵ | florian | 2020-05-24 | -3/+5 |
| | | | | time ago by blambert. OK jmc, blambert | |||
* | Initialize sun_len, pointed out by deraadt@. While there also check length ↵ | florian | 2020-05-24 | -2/+6 |
| | | | | of socket path, more relevant now since an alternative socket can be specified. OK benno@ | |||
* | Fix a potential file descriptor overlap in exec_cgi() by making sure that ↵ | florian | 2020-05-24 | -2/+26 |
| | | | | file descriptors zero to two are always open when starting slowcgi. pointed out, with and looks good to deraadt@ | |||
* | We need to loop around waitpid to catch all exited children as we are not ↵ | florian | 2020-05-24 | -19/+20 |
| | | | | guaranteed to get one signal per child. pointed out by deraadt OK benno, blambert | |||
* | Do not leak fds in fork(2) error path. pointed out by deraadt@ | florian | 2020-05-24 | -1/+17 |
| | ||||
* | Check for EINTR, too. pointed out by deraadt@ | florian | 2020-05-24 | -3/+3 |
| | ||||
* | No need for volatile here. pointed out by deraadt@ | florian | 2020-05-24 | -2/+2 |
| | ||||
* | spelling, spacing, etc | deraadt | 2020-05-24 | -18/+20 |
| | ||||
* | reserve file descriptors for incoming connections so we will be able to ↵ | benno | 2020-05-24 | -3/+35 |
| | | | | actually run the cgi for them later on. mirrored on relayd. ok florian@ blambert@ | |||
* | Keep track of which fds were closed before and only close those still open. ↵ | florian | 2020-05-24 | -4/+16 |
| | | | | Otherwise if there are parallel requests and the timing is just right we were closing random fds from other connections. OK blambert | |||
* | Do not fiddle with the response queue directly but go through a new ↵ | florian | 2020-05-24 | -9/+12 |
| | | | | slowcgi_add_response() function. This ensures that we always do an event_add. OK blambert | |||
* | Logging to syslog works better with openlog(3). OK blambert | florian | 2020-05-24 | -1/+7 |
| | ||||
* | Use a dedicated socketpair for stdin, makes the code more symetric and gets ↵ | florian | 2020-05-24 | -15/+25 |
| | | | | rid of shutdown(2) which might cause problems. OK blambert | |||
* | Calculate correct pointer for fcgi_{begin,end}_request_body. input / OK blambert | florian | 2020-05-24 | -3/+3 |
| | ||||
* | Calculate correct pointer for end_request; while there initialize reserved ↵ | florian | 2020-05-24 | -3/+6 |
| | | | | to zero. OK blambert | |||
* | set FD_CLOEXEC OK blambert | florian | 2020-05-24 | -1/+8 |
| | ||||
* | adjust the names to more accurately reflect the names of structs and ↵ | blambert | 2020-05-24 | -65/+65 |
| | | | | | | | | functions as they relate to the FastCGI protocol style(9)ize some function declarations while here ok florian@ | |||
* | Sprinkle some comments which clarify the protocol/process flow. | blambert | 2020-05-24 | -1/+18 |
| | | | | ok florian@ | |||
* | When dumping FastCGI protocol headers during debug, dump the "request begin" ↵ | blambert | 2020-05-24 | -8/+43 |
| | | | | | | | | | and "request end" protocol entries in addition While here, make the "FastCGI request body" struct's name more precise (fcgi_end_request -> fcgi_end_request_body). okay florian@ | |||
* | Use the correct buffer size for memory allocation and reads. | blambert | 2020-05-24 | -5/+9 |
| | | | | okay florian@ |