kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #35162 from silppuri/fix-incorrectly-matching-unachored-paths 

Fix incorrectly matching unanchored paths
This commit is contained in:
Aaron Patterson 2019-02-05 17:43:14 -08:00 committed by GitHub
parent 9483cdee0a 1315582b37
commit 3127f5783e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/journey/path/pattern.rb
View File

@ -119,7 +119,7 @@ module ActionDispatch
class UnanchoredRegexp < AnchoredRegexp # :nodoc:
def accept(node)
%r{\A#{visit node}}
%r{\A#{visit node}(?:\b|\Z)}
end
end

6
actionpack/test/dispatch/mount_test.rb
View File

@ -80,6 +80,12 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
assert_equal "/shorthand -- /omg", response.body
end
def test_mounting_does_not_match_similar_paths
get "/shorthandomg"
assert_not_equal "/shorthand -- /omg", response.body
assert_equal " -- /shorthandomg", response.body
end
def test_mounting_works_with_via
get "/getfake"
assert_equal "OK", response.body

22
actionpack/test/journey/path/pattern_test.rb
View File

@ -34,17 +34,17 @@ module ActionDispatch
end
{
"/:controller(/:action)" => %r{\A/(#{x})(?:/([^/.?]+))?},
"/:controller/foo" => %r{\A/(#{x})/foo},
"/:controller/:action" => %r{\A/(#{x})/([^/.?]+)},
"/:controller" => %r{\A/(#{x})},
"/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?},
"/:controller/:action.xml" => %r{\A/(#{x})/([^/.?]+)\.xml},
"/:controller.:format" => %r{\A/(#{x})\.([^/.?]+)},
"/:controller(.:format)" => %r{\A/(#{x})(?:\.([^/.?]+))?},
"/:controller/*foo" => %r{\A/(#{x})/(.+)},
"/:controller/*foo/bar" => %r{\A/(#{x})/(.+)/bar},
"/:foo|*bar" => %r{\A/(?:([^/.?]+)|(.+))},
"/:controller(/:action)" => %r{\A/(#{x})(?:/([^/.?]+))?(?:\b|\Z)},
"/:controller/foo" => %r{\A/(#{x})/foo(?:\b|\Z)},
"/:controller/:action" => %r{\A/(#{x})/([^/.?]+)(?:\b|\Z)},
"/:controller" => %r{\A/(#{x})(?:\b|\Z)},
"/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?(?:\b|\Z)},
"/:controller/:action.xml" => %r{\A/(#{x})/([^/.?]+)\.xml(?:\b|\Z)},
"/:controller.:format" => %r{\A/(#{x})\.([^/.?]+)(?:\b|\Z)},
"/:controller(.:format)" => %r{\A/(#{x})(?:\.([^/.?]+))?(?:\b|\Z)},
"/:controller/*foo" => %r{\A/(#{x})/(.+)(?:\b|\Z)},
"/:controller/*foo/bar" => %r{\A/(#{x})/(.+)/bar(?:\b|\Z)},
"/:foo|*bar" => %r{\A/(?:([^/.?]+)|(.+))(?:\b|\Z)},
}.each do |path, expected|
define_method(:"test_to_non_anchored_regexp_#{Regexp.escape(path)}") do
path = Pattern.build(