aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Auto-correct `Style/RedundantBegin` offenceRyuta Kamizono2019-05-081-5/+3
| | | | | This offenced code is introduced from forward ported #36196, since looks like 6-0-stable branch isn't checked by CodeClimate.
* Remove forward ported CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-4/+0
|
* Merge pull request #36196 from st0012/fix-29947Eileen M. Uchitelle2019-05-077-4/+37
| | | | | | | Hide malformed parameters from error page Accidentally merged this to 6-0-stable so forward porting it to master here instead.
* Start Rails 6.1 developmentRafael Mendonça França2019-04-242-260/+3
|
* Remove redundant test setups in log_subscriber_testst00122019-04-241-21/+1
| | | | | | | Because controllers' `perform_caching` config is `true` by default, it means we actually enable the caching in all those tests implicitly (and it works). Which also means we can avoid repeatedly declaring that and just specify it once in the setup method (just for declaration).
* Revert "Include Caching module for ActionController::API"Rafael França2019-04-221-1/+0
|
* Merge pull request #36038 from st0012/fix-35602Guillermo Iguaran2019-04-221-0/+1
|\ | | | | Include Caching module for ActionController::API
| * Make sure api controllers can perform caching as wellst00122019-04-191-0/+1
| | | | | | | | | | | | | | | | | | | | Currently ActionController::API doesn't include Caching module, so it can't perform caching. And even if users include it later manually, it won't inherit application's default cache store for action_controllers. So the only way to solve this issue is to include Caching module in ActionController::API, too. This closes #35602
* | Make system tests take failed screenshots in `before_teardown` hookRichard Macklin2019-04-202-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | Previously we were calling the `take_failed_screenshot` method in an `after_teardown` hook. However, this means that other teardown hooks have to be executed before we take the screenshot. Since there can be dynamic updates to the page after the assertion fails and before we take a screenshot, it seems desirable to minimize that gap as much as possible. Taking the screenshot in a `before_teardown` rather than an `after_teardown` helps with that, and has a side benefit of allowing us to remove the nested `ensure` commented on here: https://github.com/rails/rails/pull/34411#discussion_r232819478
* | Change the deprecation message for dynamic routes segment to 6.1Abhay Nikam2019-04-201-2/+2
| |
* | Merge pull request #36000 from JosiMcClellan/fix-screenshot-filenamesEileen M. Uchitelle2019-04-192-1/+10
|\ \ | | | | | | handle long or duplicated screenshot filenames
| * | truncate screenshot filenames to avoid errorJosi McClellan2019-04-182-1/+10
| |/
* | Refactor after the most recent code reviewGenadi Samokovarov2019-04-192-2/+12
| |
* | Dispatch actions only if config.consider_all_requests_local is setGenadi Samokovarov2019-04-192-1/+11
| |
* | Drop the ambiguous `ActiveSupport::ActionableError#===` checkGenadi Samokovarov2019-04-192-13/+42
| |
* | Manage ActionDispatch::ActionableExceptions from the default middleware stackGenadi Samokovarov2019-04-192-1/+2
| |
* | Introduce Actionable ErrorsGenadi Samokovarov2019-04-1910-2/+140
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actionable errors let's you dispatch actions from Rails' error pages. This can help you save time if you have a clear action for the resolution of common development errors. The de-facto example are pending migrations. Every time pending migrations are found, a middleware raises an error. With actionable errors, you can run the migrations right from the error page. Other examples include Rails plugins that need to run a rake task to setup themselves. They can now raise actionable errors to run the setup straight from the error pages. Here is how to define an actionable error: ```ruby class PendingMigrationError < MigrationError #:nodoc: include ActiveSupport::ActionableError action "Run pending migrations" do ActiveRecord::Tasks::DatabaseTasks.migrate end end ``` To make an error actionable, include the `ActiveSupport::ActionableError` module and invoke the `action` class macro to define the action. An action needs a name and a procedure to execute. The name is shown as the name of a button on the error pages. Once clicked, it will invoke the given procedure.
* Merge pull request #35975 from xithan/masterRafael França2019-04-153-12/+22
|\ | | | | mounted routes with non-word characters
| * mounted routes with non-word charactersxithan2019-04-153-12/+22
| |
* | Remove unused modules from StrongParametersPatrik Bóna2019-04-151-4/+0
| | | | | | | | | | | | Unless I'm missing some undocumented use case, these modules aren't needed in `StrongParameters` anymore since 8e221127ab. Also, all actionpack tests are passing without them.
* | Merge pull request #32541 from sergiogomez/remove-lock-from-params-wrapperMatthew Draper2019-04-121-1/+1
|\ \ | | | | | | Remove lock from method model
| * | Remove lock from method modelSergio Gómez2018-04-121-1/+1
| | |
* | | Merge pull request #35919 from Shopify/simplify-define_url_helperRafael França2019-04-111-12/+10
|\ \ \ | | | | | | | | Simplify and fasten NamedRouteCollection#define_url_helper
| * | | Simplify and fasten NamedRouteCollection#define_url_helperJean Boussier2019-04-101-12/+10
| | |/ | |/|
* / | Adds named_captures to MatchData to emulate RegexBrandon Weaver2019-04-092-0/+13
|/ / | | | | | | | | | | | | | | | | This change adds a `named_captures` method to `ActionDispatch::Journey::Path::MatchData` in order to emulate a similar method present on `Regex`'s `MatchData` present in Ruby core. This method can be useful for introspection of routes without the need to use `zip` while testing or developing in Rails core.
* | `ast` is no longer to be `nil` since #33118Ryuta Kamizono2019-04-051-1/+0
| |
* | Output junit format test reportFumiaki MATSUSHIMA2019-04-041-0/+2
| |
* | Merge pull request #35842 from Shopify/deduplicate-routing-stringsRafael França2019-04-033-6/+10
|\ \ | | | | | | Deduplicate strings held by the router
| * | Deduplicate strings held by the routerJean Boussier2019-04-033-6/+10
| | |
* | | Merge pull request #35825 from jhawthorn/always_filter_view_pathsEileen M. Uchitelle2019-04-032-9/+12
|\ \ \ | |/ / |/| | Make Resolver#find_all_anywhere equivalent to #find_all
| * | 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.
* | | [ci skip] Doc for shallow: false options should use <tt> for better ↵Abhay Nikam2019-04-031-1/+1
| | | | | | | | | | | | readability. PR after #24405
* | | Auto-correct rubocop offencesRyuta Kamizono2019-04-031-15/+15
| | |
* | | Merge pull request #24405 from waits/shallow-falseRafael França2019-04-022-1/+35
|\ \ \ | |/ / |/| | Honor shallow: false on nested resources
| * | Honor shallow: false on nested resourcesDylan Waits2016-04-032-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | Previously there was no way to place a non-shallow resource inside a parent with `shallow: true` set. Now you can set `shallow: false` on a nested child resource to generate normal (non-shallow) routes for it. Fixes #23890.
* | | url -> URL where apt inside actionpack/Sharang Dashputre2019-04-0110-24/+24
| | |
* | | Fix typo in the value of ENCRYPTED_SIGNED_COOKIE_SALT constant (#35619)Emil Shakirov2019-04-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Fix typo in the value of ENCRYPTED_SIGNED_COOKIE_SALT constant * Fix value of cookie in with authenticated encryption flag off in tests [Emil Shakirov + Ryuta Kamizono]
* | | Follow up tweaks b89a3e7e638a50c648a17d09c48b49b707e1d90d [ci skip]Ryuta Kamizono2019-03-311-2/+2
| | | | | | | | | | | | | | | | | | * use backticks instead of `+` * and more (e.g. missed replacing `Array#excluding` and `Enumerable#excluding` in b89a3e7e638a50c648a17d09c48b49b707e1d90d)
* | | 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.
* | | | Fix annotated typoPrathamesh Sonpatki2019-03-292-2/+2
| | | |
* | | | Remove :all symbol from Mime::ALLJohn Hawthorn2019-03-272-1/+14
|/ / / | | | | | | | | | | | | | | | .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.
* | | Merge pull request #35236 from renuo/fix-30467Rafael França2019-03-273-0/+29
|\ \ \ | | | | | | | | Prohibit sneaky custom params from being drawn (Fix #30467)
| * | | Raise if resource custom params contain colonsJosua Schmid2019-03-263-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this change it's not possible anymore to configure routes like this: routes.draw do resources :users, param: "name/:sneaky" end Fixes #30467.
* | | | Add the `Mime::Type::InvalidMimeType` error in the default rescue_response:Edouard CHIN2019-03-265-3/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/35604 introduced a vulnerability fix to raise an error in case the `HTTP_ACCEPT` headers contains malformated mime type. This will cause applications to throw a 500 if a User Agent sends an invalid header. This PR adds the `InvalidMimeType` in the default `rescue_responses` from the ExceptionWrapper and will return a 406. I looked up the HTTP/1.1 RFC and it doesn't stand what should be returned when the UA sends malformated mime type. Decided to get 406 as it seemed to be the status the better suited for this.
* | | Address rubocop offencesRyuta Kamizono2019-03-211-1/+1
| | |
* | | Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specsRafael França2019-03-192-1/+14
|\ \ \ | | | | | | | | Don't override @set_cookies on CookieJar#update_cookies_from_jar'
| * | | Don't override @set_cookies on CookieJar#update_cookies_from_jar'André Luis Leal Cardoso Junior2019-03-172-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | When building the cookie_jar for the current test request. It was possible for this method to override keys currently being set on the test itself. In situations such as when making two requests mixing creating the cookie on the test and the controller.
* | | | 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.
* | | | Merge pull request #35669 from cpruitt/update-mime-type-regexpAaron Patterson2019-03-192-1/+19
|\ \ \ \ | | | | | | | | | | Update regular expression for checking valid MIME type