From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] http_response: drop bodies for non-compliant responses
Date: Wed, 27 Jul 2016 00:00:02 +0000 [thread overview]
Message-ID: <20160727000002.26438-1-e@80x24.org> (raw)
Rack::Lint-compliant applications wouldn't have this problem;
but apparently public-facing Rack servers (webrick/puma/thin)
all implement this; so there is precedence for implementing
this in yahns itself.
---
lib/yahns/http_client.rb | 9 ++++++---
lib/yahns/http_response.rb | 12 +++++-------
test/test_response.rb | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index 1cdaa0f..873dd73 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -189,9 +189,11 @@ def r100_done
mkinput_preread # keep looping (@state == :body)
true
else # :lazy, false
- status, headers, body = k.app.call(env = @hs.env)
+ env = @hs.env
+ hdr_only = env['REQUEST_METHOD'] == 'HEAD'.freeze
+ status, headers, body = k.app.call(env)
return :ignore if app_hijacked?(env, body)
- http_response_write(status, headers, body)
+ http_response_write(status, headers, body, hdr_only)
end
end
@@ -220,6 +222,7 @@ def app_call(input)
env['SERVER_PORT'] = '443'.freeze
end
+ hdr_only = env['REQUEST_METHOD'] == 'HEAD'.freeze
# run the rack app
status, headers, body = k.app.call(env)
return :ignore if app_hijacked?(env, body)
@@ -229,7 +232,7 @@ def app_call(input)
end
# this returns :wait_readable, :wait_writable, :ignore, or nil:
- http_response_write(status, headers, body)
+ http_response_write(status, headers, body, hdr_only)
end
# called automatically by kgio_write
diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index d957df6..88ff9f9 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -9,7 +9,7 @@
# You use it by simply doing:
#
# status, headers, body = rack_app.call(env)
-# http_response_write(status, headers, body)
+# http_response_write(status, headers, body, env['REQUEST_METHOD']=='HEAD')
#
# Most header correctness (including Content-Length and Content-Type)
# is the job of Rack, with the exception of the "Date" header.
@@ -118,13 +118,9 @@ def kv_str(buf, key, value)
end
end
- def have_more?(value)
- value.to_i > 0 && @hs.env['REQUEST_METHOD'] != 'HEAD'.freeze
- end
-
# writes the rack_response to socket as an HTTP response
# returns :wait_readable, :wait_writable, :forget, or nil
- def http_response_write(status, headers, body)
+ def http_response_write(status, headers, body, hdr_only)
offset = 0
count = hijack = nil
k = self.class
@@ -133,6 +129,7 @@ def http_response_write(status, headers, body)
if @hs.headers?
code = status.to_i
+ hdr_only ||= Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(code)
msg = Rack::Utils::HTTP_STATUS_CODES[code]
buf = "#{response_start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
"Date: #{httpdate}\r\n".dup
@@ -150,7 +147,7 @@ def http_response_write(status, headers, body)
# allow Rack apps to tell us they want to drop the client
alive = false if value =~ /\bclose\b/i
when %r{\AContent-Length\z}i
- flags |= MSG_MORE if have_more?(value)
+ flags |= MSG_MORE if value.to_i > 0 && !hdr_only
kv_str(buf, key, value)
when "rack.hijack"
hijack = value
@@ -181,6 +178,7 @@ def http_response_write(status, headers, body)
end
return response_hijacked(hijack) if hijack
+ return http_response_done(alive) if hdr_only
if body.respond_to?(:to_path)
@state = body = Yahns::StreamFile.new(body, alive, offset, count)
diff --git a/test/test_response.rb b/test/test_response.rb
index a71fd65..34a4c90 100644
--- a/test/test_response.rb
+++ b/test/test_response.rb
@@ -9,6 +9,48 @@ class TestResponse < Testcase
alias setup server_helper_setup
alias teardown server_helper_teardown
+ def test_auto_head
+ err = @err
+ cfg = Yahns::Config.new
+ host, port = @srv.addr[3], @srv.addr[1]
+ str = "HELLO WORLD\n"
+ cfg.instance_eval do
+ GTL.synchronize do
+ app = Rack::Builder.new do
+ use Rack::ContentLength
+ use Rack::ContentType, "text/plain"
+ run(lambda do |env|
+ case env['PATH_INFO']
+ when '/'; return [ 200, {}, [ str ] ]
+ when '/304'; return [ 304, {}, [ str ] ]
+ else
+ abort 'unsupported'
+ end
+ end)
+ end
+ app(:rack, app) { listen "#{host}:#{port}" }
+ end
+ logger(Logger.new(err.path))
+ end
+ pid = mkserver(cfg)
+ s = TCPSocket.new(host, port)
+ s.write("HEAD / HTTP/1.0\r\n\r\n")
+ assert s.wait(30), "IO wait failed"
+ buf = s.read
+ assert_match %r{\r\n\r\n\z}, buf
+ s.close
+
+ s = TCPSocket.new(host, port)
+ s.write("GET /304 HTTP/1.0\r\n\r\n")
+ assert s.wait(30), "IO wait failed"
+ buf = s.read
+ assert_match %r{\r\n\r\n\z}, buf
+ assert_match %r{\b304\b}, buf
+ s.close
+ ensure
+ quit_wait(pid)
+ end
+
def test_response_time_empty_body
err = @err
cfg = Yahns::Config.new
--
EW
reply other threads:[~2016-07-27 0:00 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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=20160727000002.26438-1-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
https://yhbt.net/yahns.git/
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).