aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Assign `content_type` only onceyui-knk2017-07-131-2/+2
|
* Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-101-0/+9
| | | | | | Since we now default to `protect_from_forgery with: :exception`, provide a wrapper to `skip_before_action :verify_authenticity_token` for disabling forgery protection.
* Protect from forgery by defaultLisa Ugray2017-07-102-0/+12
| | | | | | | | Rather than protecting from forgery in the generated ApplicationController, add it to ActionController::Base by config. This configuration defaults to false to support older versions which have removed it from their ApplicationController, but is set to true for Rails 5.2.
* Fix endRafael Mendonça França2017-07-041-0/+1
|
* Load the Parameters configurations on the right timeRafael Mendonça França2017-07-041-7/+8
| | | | | | | We need to configure it only when ActionController::Base is loaded otherwise configs on initializers will not work. Closes #29527.
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-022-8/+3
|\
| * Merge pull request #29566 from eugeneius/wrap_parameters_queryKasper Timm Hansen2017-07-021-7/+2
| |\ | | | | | | Don't wrap parameters if query parameter exists
| | * Don't wrap parameters if query parameter existsEugene Kenny2017-06-251-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid overwriting a query parameter with the wrapped parameters hash. Previously this was implemented by merging the wrapped parameters at the root level if the key already existed, which was effectively a no-op. The query parameter was still overwritten in the filtered parameters hash, however. We can fix that discrepancy with a simpler implementation and less unnecessary work by skipping parameter wrapping entirely if the key was sent as a query parameter.
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0239-39/+0
| | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0239-0/+39
| |\ \ | | | | | | | | | | | | Enforce frozen string in Rubocop
| | * | Enforce frozen string in RubocopKir Shatrov2017-07-0139-0/+39
| | |/
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-021-1/+1
| |\ \ | | | | | | | | | | | | Make ActiveSupport frozen-string-literal friendly.
| | * | Make ActionView frozen string literal friendly.Pat Allan2017-06-201-1/+1
| | | | | | | | | | | | | | | | Plus a couple of related ActionPack patches.
* | | | [Action Controller] require => require_relativeAkira Matsuda2017-07-016-7/+7
|/ / /
* | | Fix format of `ActionController::Parameters#to_s` doc [ci skip]yuuji.yaginuma2017-07-011-0/+1
| | |
* | | Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-301-1/+8
| |/ |/| | | Fixes https://github.com/rails/rails/issues/29617
* | Don't wrap parameters if key already existsEugene Kenny2017-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't perform parameter wrapping if it would overwrite one of the parameters sent with the request, as that would interfere with reading the parameter directly from the top level `params` hash. The current implementation has logic for this case, but it doesn't handle `nil`/`false` values, which means these parameters: { "user" => nil } are transformed into this `params` hash: { "user" => { "user" => nil } } and `params["user"]` no longer returns the original parameter value.
* | Fix typo in `AC::UnfilteredParameters` message [ci skip]yuuji.yaginuma2017-06-231-2/+2
| | | | | | | | Ref: https://github.com/rails/rails/blob/33b596709388cc48d90ab6d1de99d7bd6e85f916/actionpack/lib/action_controller/metal/strong_parameters.rb#L52..L56
* | Fix examples for `AC::Parameters#to_query` [ci skip]yuuji.yaginuma2017-06-191-1/+6
|/ | | | | | | | | | | | | | | Without `permit`, `AC::Parameters#to_query` raise `AC::UnfilteredParameters`. ```ruby params = ActionController::Parameters.new({ name: "David", nationality: "Danish" }) params.to_query # => ActionController::UnfilteredParameters: unable to convert unpermitted parameters to hash ```
* Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-031-4/+2
|
* Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-297-15/+8
| | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-181-2/+2
|
* Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-101-2/+2
| | | | | | | | In order to fully support the same interface as `Hash#delete`, we need to pass the block through to the underlying method, not just the key. This used to work correctly, but it regressed when `ActionController::Parameters` stopped inheriting from `Hash` in 5.0.
* Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-181-1/+1
| | | | | Since this protection is now in Parameters we can use it instead of reimplementing again.
* Follow the style guide rules in the documetationRafael Mendonça França2017-04-181-30/+30
|
* Improve documentationRafael Mendonça França2017-04-181-4/+4
| | | | | | We are talking about a list of parameters even so we need to use plural. Even if we were talking about the instance of the Parameters object we would have to use the capital and monospaced font.
* Implement ActionController::Parameters#to_query and #to_paramRafael Mendonça França2017-04-181-2/+28
| | | | | | | | | | Previously it was raising an error because it may be unsafe to use those methods in a unpermitted parameter. Now we delegate to to_h that already raise an error when the Parameters instance is not permitted. This also fix a bug when using `#to_query` in a hash that contains a `ActionController::Parameters` instance and was returning the name of the class in the string.
* Add ActionController::Parameters#to_hash to implict conversionRafael Mendonça França2017-04-181-0/+16
| | | | | | | | Now methods that implicit convert objects to a hash will be able to work without requiring the users to change their implementation. This method will return a Hash instead of a HashWithIndefirentAccess to mimic the same implementation of HashWithIndefirentAccess#to_hash.
* Raise exception when calling to_h in a unfiltered ParametersRafael Mendonça França2017-04-181-2/+15
| | | | | | | | | | | | | | | | Before we returned either an empty hash or only the always permitted parameters (:controller and :action by default). The previous behavior was dangerous because in order to get the attributes users usually fallback to use to_unsafe_h that could potentially introduce security issues. The to_unsafe_h API is also not good since Parameters is a object that quacks like a Hash but not in all cases since to_h would return an empty hash and users were forced to check if to_unsafe_h is defined or if the instance is a ActionController::Parameters in order to work with it. This end up coupling a lot of libraries and parts of the application with something that is from the controller layer.
* Add action_controller_api, action_controller_base on_load hookJulian Nadeau2017-04-102-0/+2
|
* Improve logging when Origin header doesn't matchJon Leighton2017-04-061-1/+5
| | | | | | | | | | | | | I came up against this while dealing with a misconfigured server. The browser was setting the Origin header to "https://example.com", but the Rails app returned "http://example.com" from request.base_url (because it was failing to detect that HTTPS was used). This caused verify_authenticity_token to fail, but the message in the log was "Can't verify CSRF token", which is confusing because the failure had nothing to do with the CSRF token sent in the request. This made it very hard to identify the issue, so hopefully this will make it more obvious for the next person.
* Merge pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-302-1/+7
|\ | | | | Do not include default response headers for AC::Metal
| * Do not include default response headers for AC::MetalJon Moss2017-03-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | In Rails 4.2, `ActionController::Metal` controllers did not include the default headers from `ActionDispatch::Response`. However, through e16afe6, and a general shift towards having `ActionController::Metal` objects contain `ActionDispatch::Response` objects (instead of just returning an array of status, headers, and body), this behavior was lost. This PR helps to restore the original behavior by having `ActionController::Metal` controllers generate Response objects without the default headers, while `ActionController::Base` now overrides the factory method to make sure its version does have the default headers.
* | Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-291-0/+2
|/ | | | | | In the context of controller parameters, reverse_merge is commonly used to provide defaults for user input. Having an alias to reverse_merge called with_defaults feels more idiomatic for Rails.
* Small grammar fixJon Moss2017-03-221-1/+1
| | | | [ci skip]
* Wrap store accessors in parametersSid Ngeth2017-03-211-1/+5
| | | | Modified params wrapper to account for model's stored_attributes
* Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-211-1/+0
| | | | | | | | | | | | | | This reverts commit c6f9f8c28a720ad4ec7cf3613dddfa451d5968e2, reversing changes made to c309073c7476f50dfb1e796d058580f176101c36. Reason: This is fixing the behavior in the wrong place. Now the request path after the request is nil and there is no way to assert that. Also the test that was added in that PR also fails in 4.2 where the reporter says it was passing. The reason the bahavior changed between Rails 4.2 and Rails 5 is that the format in the path is now respected. The correct way to fix the problem is not doign two requests in the same controller test and use integrations tests. This change caused a regression between Rails 5.0.1 and 5.0.2.
* Fix HTTPS grammarJon Moss2017-03-131-4/+4
| | | | [ci skip]
* Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ | | | | [docs] fix ActionController docs
| * [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| | | | | | | | [ci skip]
* | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-121-1/+1
| | | | | | | | `env` is undefined.
* | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
|/ | | | [ci skip]
* Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-091-0/+15
| | | | | - This PR adds the `reverse_merge` and `reverse_merge!` method to `ActionController::Parameters` - Fixes #28353
* params --> parametersJon Moss2017-03-071-2/+2
| | | | [ci skip]
* Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
| | | [ci skip]
* Fix malformed asset_url when rendering template with ActionController::RendererGiorgos Vrettos2017-03-061-0/+1
|
* Fix CI failure due to contain <U+2028>Ryuta Kamizono2017-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | ```diff diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index a3159c29dd..1836a07d4e 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -50,8 +50,8 @@ module Redirecting # redirect_to post_url(@post), status: 301, flash: { updated_post_id: @post.id } # redirect_to({ action: 'atom' }, alert: "Something serious happened") # - # Statements after redirect_to in our controller get executed, so redirect_to doesn't stop the execution of the function. - <U+2028># To terminate the execution of the function immediately after the redirect_to, use return. + # Statements after +redirect_to+ in our controller get executed, so +redirect_to+ doesn't stop the execution of the function. + # To terminate the execution of the function immediately after the +redirect_to+, use return. # redirect_to post_url(@post) and return def redirect_to(options = {}, response_status = {}) raise ActionControllerError.new("Cannot redirect to nil!") unless options ``` https://travis-ci.org/rails/rails/jobs/207908041#L549
* Merge pull request #28259 from ChakreshwarSharma/redirect_to_docVipul A M2017-03-051-0/+3
|\ | | | | [ci skip] Use return with redirect_to
| * [ci skip] Use return with redirect_toChakreshwarSharma2017-03-041-0/+3
| |
* | [ci skip] Fix ParameterMissing exception name in docsTejas Bubane2017-03-041-1/+1
|/ | | | | | | | Should be `ActionController::ParameterMissing` and not `ActionController::MissingParameter`. Corresponding change was done in guides in https://github.com/rails/rails/pull/9816.