Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Handle more cases where HTTP status is not correct 

HTTP status was not correct with send_file which uses streaming
This commit is contained in:
Sam 2017-11-28 10:59:53 +11:00
parent 87c83f102d
commit 0caa335ef0
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hijack.rb
View File

@ -39,6 +39,7 @@ module Hijack
instance = controller_class.new instance = controller_class.new
response = ActionDispatch::Response.new response = ActionDispatch::Response.new
instance.response = response instance.response = response
instance.request = request_copy instance.request = request_copy
instance.params = params_copy instance.params = params_copy
@ -48,7 +49,7 @@ module Hijack
Rails.logger.warn("Failed to process hijacked response correctly #{e}") Rails.logger.warn("Failed to process hijacked response correctly #{e}")
end end
unless instance.response_body unless instance.response_body || response.committed?
instance.status = 500 instance.status = 500
end end

26
spec/components/hijack_spec.rb
View File

@ -59,6 +59,32 @@ describe Hijack do
expect(tester.io.string).to include("world") expect(tester.io.string).to include("world")
end end
it "handles send_file correctly" do
tester.hijack_test do
send_file __FILE__, disposition: nil
end
expect(tester.io.string).to start_with("HTTP/1.1 200")
end
it "renders a redirect correctly" do
tester.hijack_test do
redirect_to 'http://awesome.com'
end
result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html\r\nContent-Length: 84\r\nConnection: close\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
expect(tester.io.string).to eq(result)
end
it "renders stuff correctly if is empty" do
tester.hijack_test do
render body: nil
end
result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
expect(tester.io.string).to eq(result)
end
it "renders stuff correctly if it works" do it "renders stuff correctly if it works" do
tester.hijack_test do tester.hijack_test do
render plain: "hello world" render plain: "hello world"