aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Only build middleware proxy when instrumentatingJohn Hawthorn2019-05-081-2/+13
| | | | | | | | | | | | | | | | | The instrumentation proxy adds three stack frames per-middleware, even when nothing is listening. This commit, when the middleware stack is built, only adds instrumentation when the `process_middleware.action_dispatch` event has already been subscribed to. The advantage to this is that we don't have any extra stack frames in apps which don't need middleware instrumentation. The disadvantage is that the subscriptions need to be in place when the middleware stack is built (during app boot). I think this is likely okay because temporary AS::Notifications subscriptions are strongly discouraged.
* 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.
* Merge pull request #36196 from st0012/fix-29947Eileen M. Uchitelle2019-05-075-4/+14
| | | | | | | 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-241-2/+2
|
* 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-201-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+2
|\ \ | | | | | | handle long or duplicated screenshot filenames
| * | truncate screenshot filenames to avoid errorJosi McClellan2019-04-181-1/+2
| |/
* | Refactor after the most recent code reviewGenadi Samokovarov2019-04-191-2/+2
| |
* | Dispatch actions only if config.consider_all_requests_local is setGenadi Samokovarov2019-04-191-1/+1
| |
* | Drop the ambiguous `ActiveSupport::ActionableError#===` checkGenadi Samokovarov2019-04-191-13/+11
| |
* | Manage ActionDispatch::ActionableExceptions from the default middleware stackGenadi Samokovarov2019-04-191-1/+1
| |
* | Introduce Actionable ErrorsGenadi Samokovarov2019-04-198-2/+71
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-1/+2
|\ | | | | mounted routes with non-word characters
| * mounted routes with non-word charactersxithan2019-04-151-1/+2
| |
* | 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-091-0/+4
|/ / | | | | | | | | | | | | | | | | 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
| |
* | Deduplicate strings held by the routerJean Boussier2019-04-032-4/+8
| |
* | [ci skip] Doc for shallow: false options should use <tt> for better ↵Abhay Nikam2019-04-031-1/+1
| | | | | | | | readability. PR after #24405
* | Merge pull request #24405 from waits/shallow-falseRafael França2019-04-021-1/+4
|\ \ | | | | | | Honor shallow: false on nested resources
| * | Honor shallow: false on nested resourcesDylan Waits2016-04-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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-011-1/+1
| | |
* | | Fix annotated typoPrathamesh Sonpatki2019-03-292-2/+2
| | |
* | | Remove :all symbol from Mime::ALLJohn Hawthorn2019-03-271-1/+1
| | | | | | | | | | | | | | | | | | .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-271-0/+4
|\ \ \ | | | | | | | | Prohibit sneaky custom params from being drawn (Fix #30467)
| * | | Raise if resource custom params contain colonsJosua Schmid2019-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-3/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specsRafael França2019-03-191-1/+1
|\ \ \ | | | | | | | | 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-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #35669 from cpruitt/update-mime-type-regexpAaron Patterson2019-03-191-1/+4
|\ \ \ \ | | | | | | | | | | Update regular expression for checking valid MIME type
| * | | | Update regular expression for checking valid MIME typeCliff Pruitt2019-03-191-1/+4
| | | | | | | | | | | | | | | | | | | | MIME Type validation regular expression does not allow for MIME types initialized with strings that contain parameters after the MIME type name.
* | | | | Instrument middleware processingDaniel Schierbeck2019-03-191-1/+22
|/ / / / | | | | | | | | | | | | | | | | Adds ActiveSupport::Notifications instrumentation of the processing of each middleware in the stack.
* | | | Merge pull request #35358 from tjwallace/patch-1Eileen M. Uchitelle2019-03-191-0/+3
|\ \ \ \ | | | | | | | | | | Add documentation for the resource(s) :param option
| * | | | Add documentation for the resource(s) :param optionJeff Wallace2019-02-211-0/+3
| | | | |
* | | | | Merge pull request #35604 from jhawthorn/validate_mime_typesEileen M. Uchitelle2019-03-192-2/+11
|\ \ \ \ \ | | | | | | | | | | | | Raise exception when building invalid mime type
| * | | | | Raise exception when building invalid mime typeJohn Hawthorn2019-03-142-2/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows mime types in the form text/html, text/*, or */* This required a few minor test/code changes where previously nil was used as a mime string.
* / | | | Suggest 'strict-origin' Referrer-Policy headerTom Richards2019-03-171-1/+1
|/ / / /
* | | | Merge tag 'v6.0.0.beta3'eileencodes2019-03-133-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | v6.0.0.beta3 release
| * | | | Prep releaseeileencodes2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update RAILS_VERSION * Bundle * rake update_versions * rake changelog:header
| * | | | Fix possible dev mode RCEAaron Patterson2019-03-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the secret_key_base is nil in dev or test generate a key from random bytes and store it in a tmp file. This prevents the app developers from having to share / checkin the secret key for dev / test but also maintains a key between app restarts in dev/test. [CVE-2019-5420] Co-Authored-By: eileencodes <eileencodes@gmail.com> Co-Authored-By: John Hawthorn <john@hawthorn.email>
| * | | | Only accept formats from registered mime typesJohn Hawthorn2019-03-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | [CVE-2019-5418] [CVE-2019-5419]
* | | | | Update small typo in documentation.Kurt Mueller2019-03-121-1/+1
| | | | |