* [PATCH 2/1] ignore normal Rack response at request-time hijack
@ 2013-01-22 23:57 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2013-01-22 23:57 UTC (permalink / raw)
To: mongrel-unicorn
Once a connection is hijacked, we ignore it completely and leave
the connection at the mercy of the application.
---
Pushed to "hijack" of git://bogomips.org/unicorn
lib/unicorn/http_request.rb | 8 ++++++++
lib/unicorn/http_server.rb | 2 ++
t/hijack.ru | 7 ++++++-
t/t0200-rack-hijack.sh | 2 +-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 3bc64ed..3795b3b 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -106,6 +106,10 @@ class Unicorn::HttpParser
RACK_HIJACK = "rack.hijack".freeze
RACK_HIJACK_IO = "rack.hijack_io".freeze
+ def hijacked?
+ env.include?(RACK_HIJACK_IO)
+ end
+
def hijack_setup(e, socket)
e[RACK_HIJACK] = proc { e[RACK_HIJACK_IO] ||= socket }
end
@@ -113,5 +117,9 @@ class Unicorn::HttpParser
# old Rack, do nothing.
def hijack_setup(e, _)
end
+
+ def hijacked?
+ false
+ end
end
end
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 2d8e4e1..cc0a705 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -550,11 +550,13 @@ class Unicorn::HttpServer
# in 3 easy steps: read request, call app, write app response
def process_client(client)
status, headers, body = @app.call(env = @request.read(client))
+ return if @request.hijacked?
if 100 == status.to_i
client.write(expect_100_response)
env.delete(Unicorn::Const::HTTP_EXPECT)
status, headers, body = @app.call(env)
+ return if @request.hijacked?
end
@request.headers? or headers = nil
http_response_write(client, status, headers, body,
diff --git a/t/hijack.ru b/t/hijack.ru
index 105e0d7..fcb0b6d 100644
--- a/t/hijack.ru
+++ b/t/hijack.ru
@@ -17,7 +17,12 @@ run lambda { |env|
io = env["rack.hijack"].call
if io.respond_to?(:read_nonblock) &&
env["rack.hijack_io"].respond_to?(:read_nonblock)
- return [ 200, {}, [ "hijack.OK\n" ] ]
+
+ # exercise both, since we Rack::Lint may use different objects
+ env["rack.hijack_io"].write("HTTP/1.0 200 OK\r\n\r\n")
+ io.write("request.hijacked")
+ io.close
+ return [ 500, {}, DieIfUsed.new ]
end
end
[ 500, {}, [ "hijack BAD\n" ] ]
diff --git a/t/t0200-rack-hijack.sh b/t/t0200-rack-hijack.sh
index 23a9ee4..f772071 100755
--- a/t/t0200-rack-hijack.sh
+++ b/t/t0200-rack-hijack.sh
@@ -9,7 +9,7 @@ t_begin "setup and start" && {
}
t_begin "check request hijack" && {
- test "xhijack.OK" = x"$(curl -sSfv http://$listen/hijack_req)"
+ test "xrequest.hijacked" = x"$(curl -sSfv http://$listen/hijack_req)"
}
t_begin "check response hijack" && {
--
Eric Wong
_______________________________________________
Unicorn mailing list - mongrel-unicorn@rubyforge.org
http://rubyforge.org/mailman/listinfo/mongrel-unicorn
Do not quote signatures (like this one) or top post when replying
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2013-01-22 11:49 [PATCH] support for Rack hijack in request and response Eric Wong
2013-01-22 23:57 7% ` [PATCH 2/1] ignore normal Rack response at request-time hijack Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/unicorn.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).