Skip to content

Commit 1c207df

Browse files
committed
Merge [9069] from trunk: Fix an edge case with extra periods in Routing.normalize_paths. References rails#11337.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/2-0-stable@9070 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1 parent 5a5b0b8 commit 1c207df

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

actionpack/lib/action_controller/routing.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ def normalize_paths(paths)
306306
gsub(%r{(.)[\\/]$}, '\1') # drop final / or \ if path ends with it
307307

308308
# eliminate .. paths where possible
309-
re = %r{\w+[/\\]\.\.[/\\]}
310-
path.gsub!(%r{\w+[/\\]\.\.[/\\]}, "") while path.match(re)
309+
re = %r{[^/\\]+[/\\]\.\.[/\\]}
310+
path.gsub!(re, "") while path.match(re)
311311
path
312312
end
313313

actionpack/test/controller/routing_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,15 +2119,15 @@ def test_with_controllers
21192119
end
21202120

21212121
def test_normalize_unix_paths
2122-
load_paths = %w(. config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models)
2122+
load_paths = %w(. config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models .foo/../.bar foo.bar/../config)
21232123
paths = ActionController::Routing.normalize_paths(load_paths)
2124-
assert_equal %w(vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models lib .), paths
2124+
assert_equal %w(vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models config .bar lib .), paths
21252125
end
21262126

21272127
def test_normalize_windows_paths
2128-
load_paths = %w(. config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models)
2128+
load_paths = %w(. config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models .foo\\..\\.bar foo.bar\\..\\config)
21292129
paths = ActionController::Routing.normalize_paths(load_paths)
2130-
assert_equal %w(vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models lib .), paths
2130+
assert_equal %w(vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models config .bar lib .), paths
21312131
end
21322132

21332133
def test_routing_helper_module

0 commit comments

Comments
 (0)