aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
Commit message (Collapse)AuthorAgeFilesLines
* Always reject files external to appJohn Hawthorn2019-04-032-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* url -> URL where apt inside actionpack/Sharang Dashputre2019-04-014-7/+7
|
* Merge pull request #35688 from jhawthorn/render_file_rfcAaron Patterson2019-03-303-9/+21
|\ | | | | RFC: Introduce Template::File
| * Introduce Template::File as new render file:John Hawthorn2019-03-273-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behaviour of render file: was essentially the same as render template:, except that templates can be specified as an absolute path on the filesystem. This makes sense for historic reasons, but now render file: is almost exclusively used to render raw files (not .erb) like public/404.html. In addition to complicating the code in template/resolver.rb, I think the current behaviour is surprising to developers. This commit deprecates the existing "lookup a template from anywhere" behaviour and replaces it with "render this file exactly as it is on disk". Handlers will no longer be used (it will render the same as if the :raw handler was used), but formats (.html, .xml, etc) will still be detected (and will default to :plain). The existing render file: behaviour was the path through which Rails apps were vulnerable in the recent CVE-2019-5418. Although the vulnerability has been patched in a fully backwards-compatible way, I think it's a strong hint that we should drop the existing previously-vulnerable behaviour if it isn't a benefit to developers.
* | Remove :all symbol from Mime::ALLJohn Hawthorn2019-03-271-0/+13
|/ | | | | | .all isn't a valid file extension, so it shouldn't used as a symbol. This also makes Mime::ALL better match how */* is parsed from an Accept header.
* Address rubocop offencesRyuta Kamizono2019-03-211-1/+1
|
* Fix test broken by 04ae0b0b5e594e0bb99c5cd608921745977bcdcdRafael Mendonça França2019-03-191-3/+4
| | | | | This test was trying to set the exception_app in the wrapper proxy instead in the middleware itself.
* Fix a ContentNegotiation test descriptionSharang Dashputre2019-03-191-1/+1
|
* Only accept formats from registered mime typesJohn Hawthorn2019-03-102-6/+18
| | | | | [CVE-2019-5418] [CVE-2019-5419]
* Pass the template format to the digestorAaron Patterson2019-02-151-11/+14
| | | | | | | | | | | | | | | This commit passes the template format to the digestor in order to come up with a key. Before this commit, the digestor would depend on the side effect of the template renderer setting the rendered_format on the lookup context. I would like to remove that mutation, so I've changed this to pass the template format in to the digestor. I've introduced a new instance variable that will be alive during a template render. When the template is being rendered, it pushes the current template on to a stack, setting `@current_template` to the template currently being rendered. When the cache helper asks the digestor for a key, it uses the format of the template currently on the stack.
* Ensure that `redirect_back` with `fallback_location` to another host is allowedbogdanvlviv2019-01-251-0/+29
| | | | I would like to add those tests to prevent regression.
* Merge pull request #35018 from gmcgibbon/revert_redirect_to_allow_other_hostRafael França2019-01-223-42/+12
|\ | | | | Revert ensure external redirects are explicitly allowed
| * Revert ensure external redirects are explicitly allowedGannon McGibbon2019-01-223-42/+12
| |
* | Merge pull request #34952 from rails/template-stuffAaron Patterson2019-01-221-55/+0
|\ \ | |/ |/| Template Handler Refactoring
| * Templates should be eval'd in the context of an AV::Base objectAaron Patterson2019-01-171-55/+0
| |
* | Remove secret_token rack env and cookie upgrade codeRafael Mendonça França2019-01-172-3/+10
| | | | | | | | Now that secret_token was removed all this code is now dead.
* | Remove deprecated `fragment_cache_key` helper in favor of ↵Rafael Mendonça França2019-01-171-8/+0
| | | | | | | | `combined_fragment_cache_key`
* | Ensure external redirects are explicitly allowedGannon McGibbon2019-01-173-12/+42
| | | | | | | | Add `fallback_location` and `allow_other_host` options to `redirect_to`.
* | Revert "Don't handle params option in a special way in url_for helper"Rafael Mendonça França2019-01-162-1/+9
|/ | | | | | | | | | | This reverts commit e385e4678fc64be6e176c3bdac6641db9fe48d85. While this option was undocumented it exists to make possible to pass parameters to the route helpers that are reserved like `:domain`. While `url_for(domain: 'foo.com')` would generate a URL in the `foo.com` domain `url_for(params: { domain: 'foo.com' })` would generate a URL with `?domain=foo.com`.
* Enable `Lint/UselessAssignment` cop to avoid unused variable warnings (#34904)Ryuta Kamizono2019-01-092-4/+4
| | | | | | | | | | | | | | * Enable `Lint/UselessAssignment` cop to avoid unused variable warnings Since we've addressed the warning "assigned but unused variable" frequently. 370537de05092aeea552146b42042833212a1acc 3040446cece8e7a6d9e29219e636e13f180a1e03 5ed618e192e9788094bd92c51255dda1c4fd0eae 76ebafe594fc23abc3764acc7a3758ca473799e5 And also, I've found the unused args in c1b14ad which raises no warnings by the cop, it shows the value of the cop.
* Allow using combine the Cache-Control `public` and `no-cache` headersyuuji.yaginuma2019-01-071-0/+10
| | | | | | | | | | | | | | | | | Since #30367, if `no-cache` includes Cache-Control headers, special keys like `public`, `must-revalidate` are ignored. But in my understanding, `public` still need in case of want to cache authenticated pages. The authenticated pages to be cacheable, but still authenticated for every user, need to specify the `Cache-Control: public, no-cache`. For keys other than `public`, I did not know the case where it was necessary to use it in combination with `no-cache`, so I fixed that can be used only for `public`. Ref: https://www.mnot.net/cache_docs/#CACHE-CONTROL Fixes #34780.
* Make Rails Facebook-freeSasha Koss2018-12-241-2/+2
| | | If Basecamp is a Facebook-free business, then Rails should be Facebook-free framework.
* Remove unused methodsyuuji.yaginuma2018-12-231-26/+0
| | | | These were unused since 11af089cee0a0e744e267d32becfe2c66a586d31 and e35b98e6f5c54330245645f2ed40d56c74538902.
* Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin blockRyuta Kamizono2018-12-213-50/+38
| | | | | | | | | | Currently we sometimes find a redundant begin block in code review (e.g. https://github.com/rails/rails/pull/33604#discussion_r209784205). I'd like to enable `Style/RedundantBegin` cop to avoid that, since rescue/else/ensure are allowed inside do/end blocks in Ruby 2.5 (https://bugs.ruby-lang.org/issues/12906), so we'd probably meets with that situation than before.
* Module#{define_method,alias_method,undef_method,remove_method} become public ↵Ryuta Kamizono2018-12-211-1/+1
| | | | | | since Ruby 2.5 https://bugs.ruby-lang.org/issues/14133
* Pass the correct value as JSONyuuji.yaginuma2018-12-191-1/+1
| | | | | | | | | | | | This takes away the following log. ``` Error occurred while parsing request parameters. Contents: {:foo=>"heyo"} ``` Pass the correct value as JSON
* Merge pull request #34737 from r7kamura/feature/test-case-params-nilKasper Timm Hansen2018-12-181-0/+12
|\ | | | | Allow nil params on controller HTTP test methods
| * Allow nil params on controller HTTP test methodsr7kamura2018-12-181-0/+12
| |
* | More exercise `test_running_prepended_before_and_after_action`Ryuta Kamizono2018-12-191-1/+3
|/ | | | | Just testing that `after_action` is invoked before `prepend_after_action`.
* Allow using parsed_body in ActionController::TestCaseTobias Bühlmann2018-12-161-0/+14
| | | | | | | | | | | | … by switching the initialzation of an appropriate response parser in `ActionDispatch::TestResponse` from eagerly to lazily. By doing so, the response parser can be correctly set for `ActionController::TestCase`, which doesn't include the content type header in the constructor but only sets it at a later time. Fixes #34676.
* Merge pull request #20865 from colavitam/only-except-behaviorRafael Mendonça França2018-11-191-0/+22
|\ | | | | | | :only and :except are now chained for routing resource(s)
| * :only and :except are now chained for routing resource(s)Michael Colavita2015-07-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | Allow chaining the :only and :except options for routing resource(s). Previously, the following yielded routes for both show and destroy: resource :account, :only => [:show, :destroy], :except => :destroy This now yields only the show action. This chaining can be useful for passing optional :except options to code that makes use of the :only option (e.g. for a gem with its own routing methods).
* | Allow rescue from parameter parse errorsGannon McGibbon2018-11-132-0/+60
| | | | | | | | [Gannon McGibbon + Josh Cheek]
* | Fix `ActionController::Parameters#each_value` and add changelog entry to ↵Bogdan2018-10-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | this method (#34210) * Fix `ActionController::Parameters#each_value` `each_value` should yield with "value" of the params instead of "value" as an array. Related to #33979 * Add changelog entry about `ActionController::Parameters#each_value`. Follow up #33979
* | Revert "Merge pull request #33970 from rails/eager-url-helpers"schneems2018-10-031-4/+3
| | | | | | | | | | | | | | Until #34050 can be resolved This reverts commit 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49, reversing changes made to 6556898884d636c59baae008e42783b8d3e16440.
* | Merge pull request #33256 from ilkkao/ilkkao/remove-unused-params-optionRyuta Kamizono2018-10-011-1/+1
|\ \ | | | | | | | | | Don't handle params option in a special way in url_for helper
| * | Don't handle params option in a special way in url_for helperIlkka Oksanen2018-08-201-1/+1
| | |
* | | Add `Style/RedundantFreeze` to remove redudant `.freeze`Yasuo Honda2018-09-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 6.0 will support Ruby 2.4.1 or higher `# frozen_string_literal: true` magic comment is enough to make string object frozen. This magic comment is enabled by `Style/FrozenStringLiteralComment` cop. * Exclude these files not to auto correct false positive `Regexp#freeze` - 'actionpack/lib/action_dispatch/journey/router/utils.rb' - 'activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb' It has been fixed by https://github.com/rubocop-hq/rubocop/pull/6333 Once the newer version of RuboCop released and available at Code Climate these exclude entries should be removed. * Replace `String#freeze` with `String#-@` manually if explicit frozen string objects are required - 'actionpack/test/controller/test_case_test.rb' - 'activemodel/test/cases/type/string_test.rb' - 'activesupport/lib/active_support/core_ext/string/strip.rb' - 'activesupport/test/core_ext/string_ext_test.rb' - 'railties/test/generators/actions_test.rb'
* | | Merge pull request #33979 from lzap/masterRafael França2018-09-271-0/+18
|\ \ \ | | | | | | | | Added ActionController::Parameters.each_value methods
| * | | Added ActionController::Parameters.each_value methodLukas Zapletal2018-09-271-0/+18
| | | |
* | | | Merge branch 'master' into eager-url-helpersAaron Patterson2018-09-265-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove force parent loading when counter cache child is created/destroyed Raise an error when loading all fixtures from nil fixture_path Revert "Remove `counter_cache_target` which is no longer called" Update counter cache in memory if parent target is existed If association is a hash-like object preloading fails Use the same option for create database statements between Raketask and travis.rb Fix "warning: shadowing outer local variable - config" Remove `counter_cache_target` which is no longer called Fix more offences Change the empty block style to have space inside of the block Fix a content_for test description Stringify database configurations Improve error message when assign wrong attributes to model
| * | | | Change the empty block style to have space inside of the blockRafael Mendonça França2018-09-255-5/+5
| |/ / /
* / / / Eagerly build the routing helper module after routes are committedAaron Patterson2018-09-251-3/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit eagerly builds the route helper module after the routes have been drawn and finalized. This allows us to cache the helper module but not have to worry about people accessing the module while route definition is "in-flight", and automatically deals with cache invalidation as the module is regenerated anytime someone redraws the routes. The restriction this commit introduces is that the url helper module can only be accessed *after* the routes are done being drawn. Refs #24554 and #32892
* | | Merge pull request #33829 from mtsmfm/encode-filenameKasper Timm Hansen2018-09-231-2/+2
|\ \ \ | | | | | | | | Encode Content-Disposition filenames on send_data and send_file
| * | | Encode Content-Disposition filenames on send_data and send_fileFumiaki MATSUSHIMA2018-09-131-2/+2
| | | |
* | | | Merge pull request #33949 from sjain1107/no-private-defKasper Timm Hansen2018-09-231-4/+5
|\ \ \ \ | | | | | | | | | | Remove private def
| * | | | Remove private defSakshi Jain2018-09-231-4/+5
| | | | |
* | | | | Enable `Performance/UnfreezeString` copyuuji.yaginuma2018-09-233-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.3 or later, `String#+@` is available and `+@` is faster than `dup`. ```ruby # frozen_string_literal: true require "bundler/inline" gemfile(true) do source "https://rubygems.org" gem "benchmark-ips" end Benchmark.ips do |x| x.report('+@') { +"" } x.report('dup') { "".dup } x.compare! end ``` ``` $ ruby -v benchmark.rb ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux] Warming up -------------------------------------- +@ 282.289k i/100ms dup 187.638k i/100ms Calculating ------------------------------------- +@ 6.775M (± 3.6%) i/s - 33.875M in 5.006253s dup 3.320M (± 2.2%) i/s - 16.700M in 5.032125s Comparison: +@: 6775299.3 i/s dup: 3320400.7 i/s - 2.04x slower ```
* | | | Add missing test case for `redirect_to` when request includes a port.Guo Xiang Tan2018-09-211-0/+7
| | | |
* | | | Make sure the flash method is defined even if helpers are not presentRafael Mendonça França2018-09-131-1/+8
| | | |