yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] proxy_pass: keep trailer buffer on blocked client writes
Date: Mon, 4 Jul 2016 11:15:12 +0000	[thread overview]
Message-ID: <20160704111512.GA7000@dcvr.yhbt.net> (raw)

When breaking early out of the upstream response body loop, we
must ensure we know we've hit the parser body EOF and preserve
the buffer for trailer parsing.  Otherwise, reentering
proxy_read_body will put us in a bad state and corrupt

This is a critical bugfix which only affects users of
the soon-to-be-released "proxy_buffering: false" feature
of proxy_pass.
  Fwiw, I discovered this using dumb git HTTP clones in a dumb

	yahns (proxy_pass) -> varnish -> dumb HTTP server

  GIT_SMART_HTTP=0 git -c http.maxRequests=100 clone $URL_OF_YAHNS

  But it's a decent HTTP server test for finding bugs like these
  since git checksums object responses to detect corruption.

  And damn, dumb HTTP in git is really slow at cloning a 750M
  repo (I guess one problem is the tree layout is really bad
  for this...) :<

 lib/yahns/proxy_http_response.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index 316c310..0ca2c34 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -167,7 +167,10 @@ def proxy_read_body(tip, kcar, req_res)
       wbuf = proxy_write(wbuf, tmp, req_res)
       chunk.clear if chunk
-      return proxy_unbuffer(wbuf) if Yahns::WbufLite === wbuf
+      if Yahns::WbufLite === wbuf
+        req_res.proxy_trailers = [ rbuf.dup, tip ] if chunk && kcar.body_eof?
+        return proxy_unbuffer(wbuf)
+      end
     when nil # EOF
       # HTTP/1.1 upstream, unexpected premature EOF:
       msg = "upstream EOF (#{len} bytes left)" if len

                 reply	other threads:[~2016-07-04 11:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://yhbt.net/yahns/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160704111512.GA7000@dcvr.yhbt.net \
    --to=e@80x24.org \
    --cc=yahns-public@yhbt.net \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).