From 24daa5813f277023f7b8453338870369bf00a3ca Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 4 Jul 2026 04:03:12 +0000 Subject: Implement FastCGI, initial version --- src/tipideed/cgi.c | 107 +------------ src/tipideed/deps-exe/tipideed | 1 + src/tipideed/fastcgi.c | 314 ++++++++++++++++++++++++++++++++++--- src/tipideed/process_cgi_headers.c | 115 ++++++++++++++ src/tipideed/tipideed-internal.h | 9 +- src/tipideed/tipideed.c | 2 +- 6 files changed, 424 insertions(+), 124 deletions(-) create mode 100644 src/tipideed/process_cgi_headers.c (limited to 'src/tipideed') diff --git a/src/tipideed/cgi.c b/src/tipideed/cgi.c index ca66ec5..83f349d 100644 --- a/src/tipideed/cgi.c +++ b/src/tipideed/cgi.c @@ -151,33 +151,9 @@ static inline int do_nph (tipidee_rql const *rql, char const *docroot, char cons die500sys(rql, errno == ENOENT ? 127 : 126, docroot, "exec nph ", argv[0]) ; } -static inline int local_redirect (tipidee_rql *rql, char const *docroot, char const *loc, char *uribuf, char const *cginame) -{ - size_t n ; - size_t hostlen = strlen(rql->uri.host) ; - uint16_t port = rql->uri.port ; - uint8_t ishttps = rql->uri.https ; - char hosttmp[hostlen + 1] ; - memcpy(hosttmp, rql->uri.host, hostlen + 1) ; - n = tipidee_uri_parse(uribuf, URI_BUFSIZE, loc, &rql->uri) ; - if (!n || n + hostlen + 1 > URI_BUFSIZE) - die502x(rql, 2, docroot, "cgi ", cginame, " returned an invalid ", "Location", " value", " for local redirection") ; - memcpy(uribuf + n, hosttmp, hostlen + 1) ; - rql->uri.host = uribuf + n ; - rql->uri.port = port ; - rql->uri.https = ishttps ; - tipidee_log_debug(g.logv, "cgi ", cginame, ": local redirect to ", rql->uri.path) ; - return 1 ; -} - static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *const *argv, char const *const *envp, char const *body, size_t bodylen, char *uribuf, int autochunk, uint32_t raflags) { - char const *reason = "OK" ; - char const *location ; - char const *contentlength ; - char const *statusfield ; uint64_t rbodylen = 0 ; - unsigned int status = 0 ; int r ; tipidee_headers hdr ; char hdrbuf[4096] ; @@ -249,7 +225,6 @@ static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *con return 0 ; normalcase: - if (x[1].fd >= 0) { if (timed_write_g(x[1].fd, body + bodyw, bodylen - bodyw, &deadline) < bodylen - bodyw) @@ -262,91 +237,19 @@ static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *con } tain_add_g(&deadline, &g.writetto) ; - statusfield = tipidee_headers_search(&hdr, "Status") ; - location = tipidee_headers_search(&hdr, "Location") ; - contentlength = tipidee_headers_search(&hdr, "Content-Length") ; - if (contentlength) - { - if (!uint640_scan(contentlength, &rbodylen)) - die502x(rql, 2, docroot, "cgi ", argv[0], " returned an invalid ", "Content-Length", " header") ; - } - if (statusfield) - { - size_t m = uint_scan(statusfield, &status) ; - if (!m || (statusfield[m] && statusfield[m] != ' ')) - die502x(rql, 2, docroot, "cgi ", argv[0], " returned an invalid ", "Status", " header") ; - if (statusfield[m]) reason = statusfield + m + 1 ; - else - { - tipidee_defaulttext dt ; - reason = tipidee_util_defaulttext(status, &dt) ? dt.reason : "" ; - } - if (!location && (status == 301 || status == 302 || status == 307 || status == 308)) - die502x(rql, 2, docroot, "cgi ", argv[0], " returned a redirection status code without a ", "Location", " header") ; - if (status < 100 || status > 999) - die502x(rql, 2, docroot, "cgi ", argv[0], " returned an invalid ", "Status", " value") ; - } - if (location) - { - if (!location[0]) die502x(rql, 2, docroot, "cgi ", argv[0], " returned an invalid ", "Location", " header") ; - if (location[0] == '/' && location[1] != '/') - { - close(x[0].fd) ; - return local_redirect(rql, docroot, location, uribuf, argv[0]) ; - } - if (rbodylen) - { - if (!status) - die502x(rql, 2, docroot, "cgi ", argv[0], " didn't output a ", "Status", " header", " for a client redirect response with document") ; - if (status < 300 || status > 399) - die502x(rql, 2, docroot, "cgi ", argv[0], " returned an invalid ", "Status", " value", " for a client redirect response with document") ; - } - else - { - for (size_t i = 0 ; i < hdr.n ; i++) - { - char const *key = hdr.buf + hdr.list[i].left ; - if (!strcasecmp(key, "Location") || !strcasecmp(key, "Status")) continue ; - if (str_start(key, "X-CGI-")) continue ; - die502x(rql, 2, docroot, "cgi ", argv[0], " returned extra headers", " for a client redirect response without document") ; - } - if (!status) - { - status = 302 ; - reason = "Found" ; - } - } - } - else - { - if (!status) status = 200 ; - if (status != 304 && (status < 400 || status > 599) && !tipidee_headers_search(&hdr, "Content-Type")) - die502x(rql, 2, docroot, "cgi ", argv[0], " didn't output a ", "Content-Type", " header") ; - } - - tipidee_response_status(buffer_1, rql, status, reason) ; - tipidee_response_header_writemerge_G(buffer_1, g.rhdr, g.rhdrn, &hdr, !g.cont) ; - - if (contentlength) + r = process_cgi_headers(rql, &hdr, docroot, "cgi", argv[0], autochunk, &rbodylen) ; + if (r == 2) { - char fmt[UINT64_FMT] ; - fmt[uint64_fmt(fmt, rbodylen)] = 0 ; - buffer_putsnoflush(buffer_1, "Content-Length: ") ; - buffer_putsnoflush(buffer_1, fmt) ; - buffer_putnoflush(buffer_1, "\r\n", 2) ; + close(x[0].fd) ; + return local_redirect(rql, docroot, tipidee_headers_search(&hdr, "Location"), uribuf, "cgi", argv[0]) ; } - else if (autochunk) - buffer_putsnoflush(buffer_1, "Transfer-Encoding: chunked\r\n") ; - - buffer_putnoflush(buffer_1, "\r\n", 2) ; - tipidee_log_answer(g.logv, rql, status, rbodylen) ; if (rql->m == TIPIDEE_METHOD_HEAD) { if (!buffer_timed_flush_g(buffer_1, &deadline)) strerr_diefu1sys(111, "write to stdout") ; } - else if (contentlength) + else if (r) { size_t len ; struct iovec v[2] ; diff --git a/src/tipideed/deps-exe/tipideed b/src/tipideed/deps-exe/tipideed index bc32b06..1527240 100644 --- a/src/tipideed/deps-exe/tipideed +++ b/src/tipideed/deps-exe/tipideed @@ -3,6 +3,7 @@ errors.o harden.o fastcgi.o options.o +process_cgi_headers.o regular.o redirection.o rproxy.o diff --git a/src/tipideed/fastcgi.c b/src/tipideed/fastcgi.c index 5d5debf..ffd2c84 100644 --- a/src/tipideed/fastcgi.c +++ b/src/tipideed/fastcgi.c @@ -1,10 +1,15 @@ /* ISC license. */ +#include #include #include +#include #include +#include #include +#include +#include #include #include #include @@ -16,51 +21,320 @@ #include #include "tipideed-internal.h" -#define putit(b, s, deadline) if (buffer_timed_puts_g(b, s, deadline) == -1) die500sys(rql, 111, docroot, "write to ", fn) +typedef struct fctx_s fctx, *fctx_ref ; +struct fctx_s +{ + tipidee_fcgi fc ; + tipidee_rql *rql ; + char const *sub ; + char const *docroot ; + char const *fn ; +} ; + + +/* + Scan g.sa for environment variables + + +st\ev \0 = other + 0 1 2 + +0 m +KSTART X X KEY + +1 k +KEY KSTART VSTART KEY + +2 mv m m +VSTART KSTART VALUE VALUE + +3 v +VALUE KSTART VALUE VALUE + +4 +X + +0x10 k store key start and length +0x20 m mark +0x40 v store value start and length + +*/ + +static uint8_t cclass (char c) gccattr_pure ; +static uint8_t cclass (char c) +{ + switch (c) + { + case 0 : return 0 ; + case '=' : return 1 ; + default : return 2 ; + } +} + +static int parse_vars (stralloc *sa, char const *s, size_t len) +{ + static uint8_t table[4][3] = + { + { 0x04, 0x04, 0x21 }, + { 0x00, 0x12, 0x01 }, + { 0x60, 0x23, 0x23 }, + { 0x40, 0x03, 0x03 } + } ; + size_t keystart = 0, keylen = 0, mark = 0 ; + uint8_t state = 0 ; + for (size_t i = 0 ; i < len ; i++) + { + uint8_t c = table[state][cclass(s[i])] ; + state = c & 0x07 ; + if (state >= 4) return (errno = EDOM, 0) ; + if (c & 0x10) { keystart = mark ; keylen = i - mark ; } + if (c & 0x20) mark = i ; + if (c & 0x40) + { + if (!tipidee_fcgi_addenvb(sa, s + keystart, keylen, s + mark, i - mark)) return 0 ; + } + } + return 1 ; +} -static void do_fastcgi (tipidee_rql const *rql, int fd, char const *sub, char const *docroot, tipidee_headers const *hdr, char const *body, size_t bodylen, tain const *deadline, char const *fn) +static void addenv (fctx *c, stralloc *sa, char const *key, char const *val) { - char buf[4096] ; - buffer b = BUFFER_INIT(&buffer_write, fd, buf, 4096) ; - _exit(0) ; + if (!tipidee_fcgi_addenv(sa, key, val)) + { + if (errno != E2BIG) die500sys(c->rql, 111, c->docroot, "prepare environment for ", "fastcgi", " ", c->fn) ; + if (!tipidee_fcgi_params_g(&c->fc, sa->s, sa->len)) die500sys(c->rql, 111, c->docroot, "send environment to ", "fastcgi", " ", c->fn) ; + sa->len = 0 ; + if (!tipidee_fcgi_addenv(sa, key, val)) die500sys(c->rql, 111, c->docroot, "prepare environment for ", "fastcgi", " ", c->fn) ; + } } -static void fastcgi_unix (tipidee_rql const *rql, char const *socketpath, char const *sub, char const *docroot, tipidee_headers const *hdr, char const *body, size_t bodylen) +static void prepare_env (fctx *c, tipidee_headers const *hdr, size_t bodylen, stralloc *sa) +{ + size_t docrootlen = strlen(c->docroot) ; + sa->len = 0 ; + if (!parse_vars(sa, g.sa.s + g.cwdlen + 1, g.sa.len - (g.cwdlen + 1))) + { + if (errno == EDOM) die500sys(c->rql, 102, c->docroot, "can't happen: invalid environment string") ; + else die500sys(c->rql, 111, c->docroot, "encode ", "environment string for ", "fastcgi", " ", c->fn) ; + } + if (bodylen) + { + char fmt[SIZE_FMT] ; + fmt[size_fmt(fmt, bodylen)] = 0 ; + addenv(c, sa, "CONTENT_LENGTH", fmt) ; + } + if (c->rql->uri.query) + { + size_t pathlen = strlen(c->rql->uri.path) ; + size_t querylen = strlen(c->rql->uri.query) ; + char val[pathlen + querylen + 2] ; + memcpy(val, c->rql->uri.path, pathlen) ; + val[pathlen] = '?' ; + memcpy(val + pathlen + 1, c->rql->uri.query, querylen + 1) ; + addenv(c, sa, "REQUEST_URI", val) ; + } + else addenv(c, sa, "REQUEST_URI", c->rql->uri.path) ; + addenv(c, sa, "REQUEST_METHOD", tipidee_method_tostr(c->rql->m)) ; + addenv(c, sa, "QUERY_STRING", c->rql->uri.query ? c->rql->uri.query : "") ; + if (c->sub) + { + size_t sublen = strlen(c->sub) ; + size_t pathlen = strlen(c->rql->uri.path) ; + char val[pathlen - sublen - docrootlen + 1] ; + memcpy(val, c->rql->uri.path + docrootlen, pathlen - sublen - docrootlen) ; + val[pathlen - sublen - docrootlen] = 0 ; + addenv(c, sa, "PATH_INFO", c->sub) ; + addenv(c, sa, "SCRIPT_NAME", val) ; + } + else addenv(c, sa, "SCRIPT_NAME", c->rql->uri.path + docrootlen) ; + addenv(c, sa, "SERVER_NAME", c->rql->uri.host) ; + addenv(c, sa, "SERVER_PROTOCOL", c->rql->http_minor ? "HTTP/1.1" : "HTTP/1.0") ; + + for (size_t i = 0 ; i < hdr->n ; i++) + { + char const *key = hdr->buf + hdr->list[i].left ; + char const *val = hdr->buf + hdr->list[i].right ; + if (!strcasecmp(key, "Authorization")) + { + size_t len = strlen(val) ; + size_t n = byte_chr(val, len, ' ') ; + if (n < len) + { + char tmp[n+1] ; + memcpy(tmp, val, n) ; + tmp[n] = 0 ; + addenv(c, sa, "AUTH_TYPE", tmp) ; + } + if (g.flagcgipassauth) addenv(c, sa, "HTTP_AUTHORIZATION", val) ; + } + else if (!strcasecmp(key, "Content-Type")) addenv(c, sa, "CONTENT_TYPE", val) ; + else if (!strcasecmp(key, "Content-Length") || !strcasecmp(key, "Connection")) ; + else + { + size_t keylen = strlen(key) ; + char tmp[keylen + 6] ; + memcpy(tmp, "HTTP_", 5) ; + for (size_t i = 0 ; i < keylen ; i++) + tmp[5 + i] = key[i] == '-' ? '_' : key[i] >= 'a' && key[i] <= 'z' ? key[i] - 32 : key[i] ; + tmp[5 + keylen] = 0 ; + addenv(c, sa, tmp, val) ; + } + } + if (sa->len && !tipidee_fcgi_params_g(&c->fc, sa->s, sa->len)) + die500sys(c->rql, 111, c->docroot, "send", " environment to ", "fastcgi", " ", c->fn) ; + sa->len = 0 ; + if (!tipidee_fcgi_params_g(&c->fc, 0, 0)) + die500sys(c->rql, 111, c->docroot, "finish sending", " environment to ", "fastcgi", " ", c->fn) ; +} + +static void do_write (fctx *c, char const *s, size_t len, uint64_t cl, uint64_t *w) +{ + tain wdeadline ; + tain_add_g(&wdeadline, &g.writetto) ; + if (cl + len > *w) + die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " sent more data than advertised") ; + if (!cl) + { + char fmt[SIZE_XFMT] ; + size_t w = size_xfmt(fmt, len) ; + if (buffer_timed_put_g(buffer_1, fmt, w, &wdeadline) < w + || buffer_timed_put_g(buffer_1, "\r\n", 2, &wdeadline) < 2) + strerr_diefusys(111, "write to stdout") ; + } + if (buffer_timed_put_g(buffer_1, s, len, &wdeadline) < len) + strerr_diefusys(111, "write to stdout") ; + if (!cl && buffer_timed_put_g(buffer_1, "\r\n", 2, &wdeadline) < 2) + strerr_diefusys(111, "write to stdout") ; + if (!buffer_timed_flush_g(buffer_1, &wdeadline)) + strerr_diefusys(111, "write to stdout") ; + *w += len ; +} + +static int do_fastcgi (fctx *c, int fd, tipidee_headers const *hdr, char const *body, size_t bodylen, tain const *deadline, char *uribuf) +{ + static stralloc sa = STRALLOC_ZERO ; + tipidee_headers rhdr ; + char rhdrbuf[4096] ; + uint64_t cl = 0 ; + uint64_t w = 0 ; + uint32_t status = 0 ; + disize curheader = DISIZE_ZERO ; + uint32_t parserstate = 0 ; + int stream = 1 ; + int state = 0 ; + + tipidee_headers_init(&rhdr, rhdrbuf, 4096) ; + tipidee_fcgi_startwrite(&c->fc, fd, getpid(), deadline) ; + if (!tipidee_fcgi_beginrequest_g(&c->fc)) die500sys(c->rql, 111, c->docroot, "send request to ", "fastcgi", " ", c->fn) ; + prepare_env(c, hdr, bodylen, &sa) ; + if (bodylen && !tipidee_fcgi_stdin_g(&c->fc, body, bodylen)) die500sys(c->rql, 111, c->docroot, "send", " request body to ", "fastcgi", " ", c->fn) ; + if (!tipidee_fcgi_stdin_g(&c->fc, 0, 0)) die500sys(c->rql, 111, c->docroot, "finish sending", " request body to ", "fastcgi", " ", c->fn) ; + + tipidee_fcgi_startread(&c->fc, fd, c->fc.id, deadline) ; + while (stream) + { + stream = tipidee_fcgi_read_g(&c->fc, &status, &sa) ; + if (stream == -1) + { + switch (errno) + { + case ECONNREFUSED: die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " said it can only process one connection") ; + case ENFILE: die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " is overloaded") ; + case EAFNOSUPPORT: die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " does not support the Responder role") ; + case EPROTO : die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " spoke a weird dialect") ; + default : die502sys(c->rql, 111, c->docroot, "unable to ", "read", " from ", "fastcgi", " ", c->fn) ; + } + } + else if (stream == 1) + { + if (!state) + { + size_t i = 0 ; + int r ; + switch (tipidee_headers_parse_fromstring_nb(sa.s, sa.len, &i, &rhdr, &curheader, &parserstate)) + { + case -2 : goto cont ; + case -1 : die500sys(c->rql, 111, c->docroot, "read", " from ", "fastcgi", " ", c->fn) ; + case 0 : break ; + case 400 : die502x(c->rql, 2, c->docroot, "invalid output", " from ", "fastcgi", " ", c->fn) ; + case 413 : die502x(c->rql, 2, c->docroot, rhdr.n >= TIPIDEE_HEADERS_MAX ? "Too many headers" : "Too much header data", " from ", "fastcgi", " ", c->fn) ; + case 500 : die500x(c->rql, 101, c->docroot, "can't happen: ", "avltreen_insert failed", " in do_fastcgi") ; + default : die500x(c->rql, 101, c->docroot, "can't happen: ", "unknown tipidee_headers_parse return code", " in do_fastcgi") ; + } + + r = process_cgi_headers(c->rql, &rhdr, c->docroot, "fastcgi", c->fn, 1, &cl) ; + if (r == 2) + { + fd_close(fd) ; + return local_redirect(c->rql, c->docroot, tipidee_headers_search(&rhdr, "Location"), uribuf, "fastcgi", c->fn) ; + } + if (c->rql->m == TIPIDEE_METHOD_HEAD) + { + tain wdeadline ; + tain_add_g(&wdeadline, &g.writetto) ; + if (!buffer_timed_flush_g(buffer_1, &wdeadline)) + strerr_diefu1sys(111, "write to stdout") ; + return 0 ; + } + state = 1 ; + if (i < sa.len) do_write(c, sa.s + i, sa.len - i, cl, &w) ; + } + else if (state == 1) do_write(c, sa.s, sa.len, cl, &w) ; + else die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " kept sending FCGI_STDOUT data after EOF marker") ; + cont: + if (!sa.len) state = 2 ; + sa.len = 0 ; + } + else if (stream == 2) + { + buffer_putflush(buffer_2, sa.s, sa.len) ; + tain_now_g() ; + sa.len = 0 ; + } + else die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " sent data on an unsupported stream") ; + } + fd_close(fd) ; + if (cl && w < cl) + die502x(c->rql, 111, c->docroot, "fastcgi", " ", c->fn, " sent less data than advertised") ; + return 0 ; +} + +static int fastcgi_unix (fctx *c, char const *socketpath, tipidee_headers const *hdr, char const *body, size_t bodylen, char *uribuf) { tain deadline ; int fd = ipc_stream_nbcoe() ; - if (fd == -1) die500sys(rql, 111, docroot, "create socket") ; + if (fd == -1) die500sys(c->rql, 111, c->docroot, "create socket") ; tain_add_g(&deadline, &g.readtto) ; - if (!ipc_timed_connect_g(fd, socketpath, &deadline)) die500sys(rql, 111, docroot, "connect to ", socketpath) ; - do_fastcgi(rql, fd, sub, docroot, hdr, body, bodylen, &deadline, socketpath) ; - fd_close(fd) ; + if (!ipc_timed_connect_g(fd, socketpath, &deadline)) die500sys(c->rql, 111, c->docroot, "connect to ", socketpath) ; + c->fn = socketpath ; + return do_fastcgi(c, fd, hdr, body, bodylen, &deadline, uribuf) ; } -static inline void fastcgi_tcp (tipidee_rql const *rql, char const *ip, uint16_t port, int is6, char const *sub, char const *docroot, tipidee_headers const *hdr, char const *body, size_t bodylen) +static inline int fastcgi_tcp (fctx *c, char const *ip, uint16_t port, int is6, tipidee_headers const *hdr, char const *body, size_t bodylen, char *uribuf) { tain deadline ; size_t m = 0 ; int fd = socket_tcp46_nbcoe(is6) ; char fmt[IP6_FMT + UINT16_FMT + 2] ; - if (fd == -1) die500sys(rql, 111, docroot, "create socket") ; - tain_add_g(&deadline, &g.readtto) ; + if (fd == -1) die500sys(c->rql, 111, c->docroot, "create socket") ; + tain_add_g(&deadline, &g.cgitto) ; if (is6) fmt[m++] = '[' ; m += is6 ? ip6_fmt(fmt + m, ip) : ip4_fmt(fmt + m, ip) ; if (is6) fmt[m++] = ']' ; fmt[m++] = ':' ; m += uint16_fmt(fmt + m, port) ; fmt[m++] = 0 ; - if (!(is6 ? socket_deadlineconnstamp6_g(fd, ip, port, &deadline) : socket_deadlineconnstamp4_g(fd, ip, port, &deadline))) - die500sys(rql, 111, docroot, "connect to ", fmt) ; - do_fastcgi(rql, fd, sub, docroot, hdr, body, bodylen, &deadline, fmt) ; - fd_close(fd) ; + die500sys(c->rql, 111, c->docroot, "connect to ", fmt) ; + c->fn = fmt ; + return do_fastcgi(c, fd, hdr, body, bodylen, &deadline, uribuf) ; } -void fastcgi (tipidee_rql const *rql, tipidee_redirection const *rd, char const *docroot, tipidee_headers const *hdr, char const *body, size_t bodylen) +int fastcgi (tipidee_rql *rql, tipidee_redirection const *rd, char const *docroot, tipidee_headers const *hdr, char const *body, size_t bodylen, char *uribuf) { + fctx c = { .fc = TIPIDEE_FCGI_ZERO, .rql = rql, .sub = rd->sub, .docroot = docroot, .fn = 0 } ; if (rd->flags & TIPIDEE_REDIR_ISINET) - fastcgi_tcp(rql, rd->addr, rd->port, !!(rd->flags & TIPIDEE_REDIR_ISV6), rd->sub, docroot, hdr, body, bodylen) ; + return fastcgi_tcp(&c, rd->addr, rd->port, !!(rd->flags & TIPIDEE_REDIR_ISV6), hdr, body, bodylen, uribuf) ; else - fastcgi_unix(rql, rd->addr, rd->sub, docroot, hdr, body, bodylen) ; + return fastcgi_unix(&c, rd->addr, hdr, body, bodylen, uribuf) ; } diff --git a/src/tipideed/process_cgi_headers.c b/src/tipideed/process_cgi_headers.c new file mode 100644 index 0000000..a02dde7 --- /dev/null +++ b/src/tipideed/process_cgi_headers.c @@ -0,0 +1,115 @@ +/* ISC license. */ + +#include + +#include +#include +#include +#include + +#include +#include "tipideed-internal.h" + +int local_redirect (tipidee_rql *rql, char const *docroot, char const *loc, char *uribuf, char const *what, char const *cginame) +{ + size_t n ; + size_t hostlen = strlen(rql->uri.host) ; + uint16_t port = rql->uri.port ; + uint8_t ishttps = rql->uri.https ; + char hosttmp[hostlen + 1] ; + memcpy(hosttmp, rql->uri.host, hostlen + 1) ; + n = tipidee_uri_parse(uribuf, URI_BUFSIZE, loc, &rql->uri) ; + if (!n || n + hostlen + 1 > URI_BUFSIZE) + die502x(rql, 2, docroot, what, " ", cginame, " returned an invalid ", "Location", " value", " for local redirection") ; + memcpy(uribuf + n, hosttmp, hostlen + 1) ; + rql->uri.host = uribuf + n ; + rql->uri.port = port ; + rql->uri.https = ishttps ; + tipidee_log_debug(g.logv, what, " ", cginame, ": local redirect to ", rql->uri.path) ; + return 1 ; +} + +int process_cgi_headers (tipidee_rql const *rql, tipidee_headers *hdr, char const *docroot, char const *what, char const *app, int autochunk, uint64_t *cl) +{ + char const *reason = "OK" ; + char const *location ; + char const *contentlength ; + char const *statusfield ; + unsigned int status = 0 ; + + statusfield = tipidee_headers_search(hdr, "Status") ; + location = tipidee_headers_search(hdr, "Location") ; + contentlength = tipidee_headers_search(hdr, "Content-Length") ; + if (contentlength) + { + if (!uint640_scan(contentlength, cl)) + die502x(rql, 2, docroot, what, " ", app, " returned an invalid ", "Content-Length", " header") ; + } + if (statusfield) + { + size_t m = uint_scan(statusfield, &status) ; + if (!m || (statusfield[m] && statusfield[m] != ' ')) + die502x(rql, 2, docroot, what, " ", app, " returned an invalid ", "Status", " header") ; + if (statusfield[m]) reason = statusfield + m + 1 ; + else + { + tipidee_defaulttext dt ; + reason = tipidee_util_defaulttext(status, &dt) ? dt.reason : "" ; + } + if (!location && (status == 301 || status == 302 || status == 307 || status == 308)) + die502x(rql, 2, docroot, what, " ", app, " returned a redirection status code without a ", "Location", " header") ; + if (status < 100 || status > 999) + die502x(rql, 2, docroot, what, " ", app, " returned an invalid ", "Status", " value") ; + } + if (location) + { + if (!location[0]) die502x(rql, 2, docroot, what, " ", app, " returned an invalid ", "Location", " header") ; + if (location[0] == '/' && location[1] != '/') return 2 ; + if (*cl) + { + if (!status) + die502x(rql, 2, docroot, what, " ", app, " didn't output a ", "Status", " header", " for a client redirect response with document") ; + if (status < 300 || status > 399) + die502x(rql, 2, docroot, what, " ", app, " returned an invalid ", "Status", " value", " for a client redirect response with document") ; + } + else + { + for (uint32_t i = 0 ; i < hdr->n ; i++) + { + char const *key = hdr->buf + hdr->list[i].left ; + if (!strcasecmp(key, "Location") || !strcasecmp(key, "Status")) continue ; + if (str_start(key, "X-CGI-")) continue ; + die502x(rql, 2, docroot, what, " ", app, " returned extra headers", " for a client redirect response without document") ; + } + if (!status) + { + status = 302 ; + reason = "Found" ; + } + } + } + else + { + if (!status) status = 200 ; + if (status != 304 && (status < 400 || status > 599) && !tipidee_headers_search(hdr, "Content-Type")) + die502x(rql, 2, docroot, what, " ", app, " didn't output a ", "Content-Type", " header") ; + } + + tipidee_response_status(buffer_1, rql, status, reason) ; + tipidee_response_header_writemerge_G(buffer_1, g.rhdr, g.rhdrn, hdr, !g.cont) ; + + if (contentlength) + { + char fmt[UINT64_FMT] ; + fmt[uint64_fmt(fmt, *cl)] = 0 ; + buffer_putsnoflush(buffer_1, "Content-Length: ") ; + buffer_putsnoflush(buffer_1, fmt) ; + buffer_putnoflush(buffer_1, "\r\n", 2) ; + } + else if (autochunk) + buffer_putsnoflush(buffer_1, "Transfer-Encoding: chunked\r\n") ; + + buffer_putnoflush(buffer_1, "\r\n", 2) ; + tipidee_log_answer(g.logv, rql, status, *cl) ; + return !!contentlength ; +} diff --git a/src/tipideed/tipideed-internal.h b/src/tipideed/tipideed-internal.h index 5d72cd6..9b076cd 100644 --- a/src/tipideed/tipideed-internal.h +++ b/src/tipideed/tipideed-internal.h @@ -119,6 +119,7 @@ extern void respond_416 (tipidee_rql const *, char const *, uint64_t) ; #define die500x(r, e, d, ...) diefx(r, e, d, 500, __VA_ARGS__) #define die500sys(r, e, d, ...) diefusys(r, e, d, 500, __VA_ARGS__) #define die502x(r, e, d, ...) diefx(r, e, d, 502, __VA_ARGS__) +#define die502sys(r, e, d, ...) diefusys(r, e, d, 502, __VA_ARGS__) /* redirection */ @@ -133,7 +134,7 @@ extern void rproxy (tipidee_rql const *, tipidee_redirection const *, char const /* fastcgi */ -extern void fastcgi (tipidee_rql const *, tipidee_redirection const *, char const *, tipidee_headers const *, char const *, size_t) ; +extern int fastcgi (tipidee_rql *, tipidee_redirection const *, char const *, tipidee_headers const *, char const *, size_t, char *) ; /* trace */ @@ -174,6 +175,12 @@ extern int respond_304 (tipidee_rql const *, char const *, struct stat const *) extern int respond_cgi (tipidee_rql *, char const *, char const *, size_t, char const *, char *, tipidee_headers const *, tipidee_resattr const *, char const *, size_t) ; + /* process_cgi_headers */ + +extern int process_cgi_headers (tipidee_rql const *, tipidee_headers *, char const *, char const *, char const *, int, uint64_t *) ; +extern int local_redirect (tipidee_rql *, char const *, char const *, char *, char const *, char const *) ; + + /* util */ extern size_t translate_path (char const *) ; diff --git a/src/tipideed/tipideed.c b/src/tipideed/tipideed.c index 4bd3242..858f078 100644 --- a/src/tipideed/tipideed.c +++ b/src/tipideed/tipideed.c @@ -246,7 +246,7 @@ static inline int serve (tipidee_rql *rql, char const *docroot, char *uribuf, ti case TIPIDEE_REDIR_NONE : break ; case TIPIDEE_REDIR_REDIRECT : respond_30x(rql, &rd) ; return 0 ; case TIPIDEE_REDIR_RPROXY : rproxy(rql, &rd, docroot, hdr, body, bodylen) ; return 0 ; - case TIPIDEE_REDIR_FASTCGI : fastcgi(rql, &rd, docroot, hdr, body, bodylen) ; return 0 ; + case TIPIDEE_REDIR_FASTCGI : fastcgi(rql, &rd, docroot, hdr, body, bodylen, uribuf) ; return 0 ; default : strerr_dief(101, "can't happen: ", "unknown redirection type") ; } } -- cgit v1.3.1