Skip to content

Fix empty SCRIPT_NAME with partial match route bug #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Fix empty SCRIPT_NAME with partial match route bug #43

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59a8ca9
Fix empty SCRIPT_NAME with partial match route bug
drewdeponte Jan 24, 2016
7f7f7ff
Merge pull request #1 from Acornsgrow/fix_rewrite_partial_path_info
drewdeponte Jan 24, 2016
14043cf
Upgrade rake development dependency
drewdeponte Jan 29, 2016
afb82c8
Add basic .travis.yml
drewdeponte Jan 30, 2016
4d14d30
Have travis install latest bundler
drewdeponte Jan 31, 2016
95f5fb3
Make first travis version the 1.9.3-p551
drewdeponte Jan 31, 2016
5170ae7
Revert "Upgrade rake development dependency"
drewdeponte Jan 31, 2016
1706d40
Revert "Revert "Upgrade rake development dependency""
drewdeponte Jan 31, 2016
1f96735
Add URI encoding for path info
RyanHedges Feb 9, 2016
a92f89d
Merge pull request #2 from Acornsgrow/handle_escaping_of_path
RyanHedges Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/http_router.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def rewrite_partial_path_info(env, request)
env['PATH_INFO'] = "/"
env['SCRIPT_NAME'] += path_info_before
else
env['PATH_INFO'] = "/#{request.path.join('/')}"
env['PATH_INFO'] = "/#{URI.encode(request.path.join('/'))}"
env['SCRIPT_NAME'] += path_info_before[0, path_info_before.size - env['PATH_INFO'].size]
end
end
Expand Down
18 changes: 18 additions & 0 deletions test/rack/test_route.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,22 @@ def test_script_name_from_partial_match_of_single
router.call(Rack::MockRequest.env_for("/sidekiq"))
assert_equal('/sidekiq', request_env['SCRIPT_NAME'])
end

def test_path_info_with_encoded_request_path
request_env = nil
router do
add("/sidekiq*").to { |env| request_env = env; [200, {}, []] }
end
router.call(Rack::MockRequest.env_for("/sidekiq/queues/some%20path"))
assert_equal('/queues/some%20path', request_env['PATH_INFO'])
end

def test_script_name_with_encoded_request_path
request_env = nil
router do
add("/sidekiq*").to { |env| request_env = env; [200, {}, []] }
end
router.call(Rack::MockRequest.env_for("/sidekiq/queues/some%20path"))
assert_equal('/sidekiq', request_env['SCRIPT_NAME'])
end
end