Permalink
Browse files

Merge pull request #5456 from brianmario/redirect-sanitization

Strip null bytes from Location header
Conflicts:

	actionpack/test/controller/redirect_test.rb
  • Loading branch information...
1 parent 61335d6 commit d14319cb2eb054bede851dc4ec728e4128feada7 @tenderlove tenderlove committed Mar 15, 2012
@@ -87,7 +87,7 @@ def _compute_redirect_to_location(options)
refer
else
url_for(options)
- end.gsub(/[\r\n]/, '')
+ end.gsub(/[\0\r\n]/, '')
end
end
end
@@ -94,7 +94,7 @@ def normalize_argument_to_redirection(fragment)
refer
else
@controller.url_for(fragment)
- end.gsub(/[\r\n]/, '')
+ end.gsub(/[\0\r\n]/, '')
end
def validate_request!
@@ -99,6 +99,14 @@ def redirect_to_nil
redirect_to nil
end
+ def redirect_with_header_break
+ redirect_to "/lol\r\nwat"
+ end
+
+ def redirect_with_null_bytes
+ redirect_to "\000/lol\r\nwat"
+ end
+
def rescue_errors(e) raise e end
def rescue_action(e) raise end
@@ -118,6 +126,18 @@ def test_simple_redirect
assert_equal "http://test.host/redirect/hello_world", redirect_to_url
end
+ def test_redirect_with_header_break
+ get :redirect_with_header_break
+ assert_response :redirect
+ assert_equal "http://test.host/lolwat", redirect_to_url
+ end
+
+ def test_redirect_with_null_bytes
+ get :redirect_with_header_break
+ assert_response :redirect
+ assert_equal "http://test.host/lolwat", redirect_to_url
+ end
+
def test_redirect_with_no_status
get :simple_redirect
assert_response 302

0 comments on commit d14319c

Please sign in to comment.