aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/path_set.rb
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-04-01 16:35:07 -0700
committerJohn Hawthorn <john@hawthorn.email>2019-04-03 09:02:28 -0700
commiteb52904eb5c19ab4e8ff7a7d4f501fe5e1142ad0 (patch)
tree69e7486d27a6c0555473cea655cc4ab36c9f6c1a /actionview/lib/action_view/path_set.rb
parentbeb0bc9907a31d0cbd2ca68c79c57a9e375761e8 (diff)
downloadrails-eb52904eb5c19ab4e8ff7a7d4f501fe5e1142ad0.tar.gz
rails-eb52904eb5c19ab4e8ff7a7d4f501fe5e1142ad0.tar.bz2
rails-eb52904eb5c19ab4e8ff7a7d4f501fe5e1142ad0.zip
Always reject files external to app
Previously, when using `render file:`, it was possible to render files not only at an absolute path or relative to the current directory, but relative to ANY view paths. This was probably done for absolutely maximum compatibility when addressing CVE-2016-0752, but I think is unlikely to be used in practice. Tihs commit removes the ability to `render file:` with a path relative to a non-fallback view path. Make FallbackResolver.new private To ensure nobody is making FallbackResolvers other than "/" and "". Make reject_files_external_... no-op for fallbacks Because there are only two values used for path: "" and "/", and File.join("", "") == File.join("/", "") == "/", this method was only testing that the absolute paths started at "/" (which of course all do). This commit doesn't change any behaviour, but it makes it explicit that the FallbackFileSystemResolver works this way. Remove outside_app_allowed argument Deprecate find_all_anywhere This is now equivalent to find_all Remove outside_app argument Deprecate find_file for find Both LookupContext#find_file and PathSet#find_file are now equivalent to their respective #find methods.
Diffstat (limited to 'actionview/lib/action_view/path_set.rb')
-rw-r--r--actionview/lib/action_view/path_set.rb15
1 files changed, 5 insertions, 10 deletions
diff --git a/actionview/lib/action_view/path_set.rb b/actionview/lib/action_view/path_set.rb
index 691b53e2da..d54749d8e3 100644
--- a/actionview/lib/action_view/path_set.rb
+++ b/actionview/lib/action_view/path_set.rb
@@ -48,12 +48,11 @@ module ActionView #:nodoc:
find_all(*args).first || raise(MissingTemplate.new(self, *args))
end
- def find_file(path, prefixes = [], *args)
- _find_all(path, prefixes, args, true).first || raise(MissingTemplate.new(self, path, prefixes, *args))
- end
+ alias :find_file :find
+ deprecate :find_file
def find_all(path, prefixes = [], *args)
- _find_all path, prefixes, args, false
+ _find_all path, prefixes, args
end
def exists?(path, prefixes, *args)
@@ -71,15 +70,11 @@ module ActionView #:nodoc:
private
- def _find_all(path, prefixes, args, outside_app)
+ def _find_all(path, prefixes, args)
prefixes = [prefixes] if String === prefixes
prefixes.each do |prefix|
paths.each do |resolver|
- if outside_app
- templates = resolver.find_all_anywhere(path, prefix, *args)
- else
- templates = resolver.find_all(path, prefix, *args)
- end
+ templates = resolver.find_all(path, prefix, *args)
return templates unless templates.empty?
end
end