aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | 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.
* | Merge tag 'v6.0.0.beta3'eileencodes2019-03-132-3/+9
|\ \ | | | | | | | | | v6.0.0.beta3 release
| * | 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]
* | | Show friendly message to install action mailbox if the related table does ↵Prathamesh Sonpatki2019-03-122-0/+5
| | | | | | | | | | | | | | | | | | not exist - This is similar to the work done in https://github.com/rails/rails/pull/31534
* | | Merge pull request #35121 from utilum/warning_tried_to_create_proc_without_blockKasper Timm Hansen2019-03-101-2/+2
|\ \ \ | | | | | | | | Ruby 2.7 warning: creating a Proc without a block
| * | | ActionPack Proc.new without a blockutilum2019-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes cases that use pre Ruby [r66772](https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772) syntax that are not tickled by the test suite.
* | | | Support other optional parameters and quoted-strings on Content-Type parserr7kamura2019-03-101-4/+3
| | | |
* | | | Fix code examples' indentation in ActionDispatch::Routing [ci skip]Ricardo Díaz2019-02-261-4/+4
| |/ / |/| |
* | | Restore UploadedFile compatibility with IO.copy_streamJanko Marohnić2019-02-231-1/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/pull/28676 the `#to_path` method was added to `ActionDispatch::Http::UploadedFile`. This broke usage with `IO.copy_stream`: source = ActionDispatch::Http::UploadedFile.new(...) IO.copy_stream(source, destination) # ~> TypeError: can't convert ActionDispatch::Http::UploadedFile to IO (ActionDispatch::Http::UploadedFile#to_io gives Tempfile) Normally `IO.copy_stream` just calls `#read` on the source object. However, when `#to_path` is defined, `IO.copy_stream` calls `#to_io` in order to retrieve the raw `File` object. In that case it trips up, because `ActionDispatch::Http::UploadedFile#to_io` returned a `Tempfile` object, which is not an `IO` subclass. We fix this by having `#to_io` return an actual `File` object.
* | appropriate typo fixalkesh262019-02-191-1/+1
| |
* | Merge pull request #35229 from rails/fix-35222Aaron Patterson2019-02-131-2/+2
|\ \ | |/ |/| Convert lookup context's to a stack for fixing #35222 and #34138
| * Turn lookup context in to a stack, push and pop if formats changeAaron Patterson2019-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | This commit keeps a stack of lookup contexts on the ActionView::Base instance. If a format is passed to render, we instantiate a new lookup context and push it on the stack, that way any child calls to "render" will use the same format information as the parent. This also isolates "sibling" calls to render (multiple calls to render in the same template). Fixes #35222 #34138
* | Merge pull request #35175 from drn/create-sessionGuillermo Iguaran2019-02-121-1/+1
|\ \ | |/ |/| Support testing of non-ActionDispatch-routed apps.
| * Support testing of non-ActionDispatch-routed apps.Darren Cheng2019-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [Grape API framework](https://github.com/ruby-grape/grape) regularly writes tests like [spec/grape/api_spec.rb](https://github.com/ruby-grape/grape/blob/master/spec/grape/api_spec.rb). When attempting to write a test in a Rails environment similar to the following: ``` describe Grape::Api, type: :request do let(:app) { Class.new(Grape::API) do get 'test' do { foo: 'bar' } end end } it '200s' do get 'test' end end ``` The following exception is thrown: ``` NoMethodError: undefined method `url_helpers' for #<Array:0x00007fb4e4bc4c88> -- 0: .../lib/action_dispatch/testing/integration.rb:330:in `block in create_session' 1: .../lib/action_dispatch/testing/integration.rb:326:in `initialize' 2: .../lib/action_dispatch/testing/integration.rb:326:in `new' 3: .../lib/action_dispatch/testing/integration.rb:326:in `create_session' 4: .../lib/action_dispatch/testing/integration.rb:316:in `integration_session' 5: .../lib/action_dispatch/testing/integration.rb:348:in `block (2 levels) in <module:Runner>' ``` This change explicitly ensures that `app.routes` is an `ActionDispatch::Routing::RouteSet` instance.
* | Merge pull request #35036 from rails/av-base-subclassAaron Patterson2019-02-061-0/+4
|\ \ | |/ |/| Move compiled ERB to an AV::Base subclass
| * Pull generated methods up in to the anonymous subclassAaron Patterson2019-02-061-6/+1
| | | | | | | | Then we don't need the extra module.
| * Move templates to an anonymous subclass of AV::BaseAaron Patterson2019-02-061-0/+9
| | | | | | | | | | Now we can throw away the subclass and the generated methods will get GC'd too
* | Update terminal-to-html inline images url in ScreenshotHelperbetterzega2019-02-051-1/+1
| |
* | Merge pull request #35162 from silppuri/fix-incorrectly-matching-unachored-pathsAaron Patterson2019-02-051-1/+1
|\ \ | |/ |/| Fix incorrectly matching unanchored paths
| * Restrict matching with word boundary or end of stringPetri Avikainen2019-02-051-1/+1
| |
| * Define word boundary for unanchored path regexpPetri Avikainen2019-02-051-1/+1
| |
* | Merge pull request #35139 from 7coAim/fix_debug_exceptionsGeorge Claghorn2019-02-052-2/+2
|\ \ | | | | | | Fix NameError : Make debug exceptions works in an environment where ActiveStorage is not loaded.
| * | fix NameErrorkurosawat2019-02-052-2/+2
| | | | | | | | | | | | NameError: uninitialized constant ActionView::CompiledTemplates::ActiveStorage
* | | Merge pull request #35134 from Edouard-chin/ec-cookie-expiry-regressionRafael França2019-02-041-7/+2
|\ \ \ | | | | | | | | Cookie doesn't expire anymore unless a flag is set:
| * | | Cookie doesn't expire anymore unless a flag is set:Edouard CHIN2019-02-041-7/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There is a regression in 6.0 introduced by #32937 where cookie doesn't expire anymore unless the new `use_cookies_with_metadata` configuration is set to `true`. This causes issue for app migration from 5.2 to 6.0 because the `use_cookies_with_metadata` flag can't be set to true until all servers are running on 6.0. Here is a small reproduction script that you can run in the console ```ruby ActionDispatch::Cookies request = ActionDispatch::Request.empty request.env["action_dispatch.key_generator"] = ActiveSupport::KeyGenerator.new('1234567890') request.env["action_dispatch.signed_cookie_salt"] = 'signed cookie' request.env["action_dispatch.cookies_rotations"] = ActiveSupport::Messages::RotationConfiguration.new request.env["action_dispatch.use_authenticated_cookie_encryption"] = true signed_cookie = request.cookie_jar.signed signed_cookie[:foobar] = { value: '123', expires: 1.day.ago } p signed_cookie[:foobar] ```
* | | Merge pull request #35086 from gsamokovarov/cleanup-whitelisting-refsGannon McGibbon2019-02-041-2/+2
|\ \ \ | |_|/ |/| | Cleanup the whitelisting references after #33145
| * | Cleanup the whitelisting references after #33145Genadi Samokovarov2019-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the development of #33145, I have named a few concepts in the code as `whitelisted`. We decided to stay away from the term and I adjusted most of the code afterwards, but here are the cases I forgot to change. I also found a case in the API guide that we could have cleaned up as well. [ci skip]
* | | Use consistent hash syntax for routesAndy Waite2019-02-011-14/+14
| |/ |/| | | | | [ci skip]
* | Fix doc of `ActionDispatch::SystemTestCase` [ci skip]yuuji.yaginuma2019-02-011-7/+7
| | | | | | | | | | | | * Fix broken format. * Need to specify driver to the first argument of `driven_by`. * `add_emulation` doesn't have `device` keyword. Ref: https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/chrome/options.rb#L142-L162
* | Merge pull request #35093 from rails/av-base-constructorAaron Patterson2019-01-301-1/+3
|\ \ | | | | | | Tighten up the AV::Base constructor
| * | Tighten up the AV::Base constructorAaron Patterson2019-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AV::Base constructor was too complicated, and this commit tightens up the parameters it will take. At runtime, AV::Base is most commonly constructed here: https://github.com/rails/rails/blob/94d54fa4ab641a0ddeb173409cb41cc5becc02a9/actionview/lib/action_view/rendering.rb#L72-L74 This provides an AV::Renderer instance, a hash of assignments, and a controller instance. Since this is the common case for construction, we should remove logic from the constructor that handles other cases. This commit introduces special constructors for those other cases. Interestingly, most code paths that construct AV::Base "strangely" are tests.
* | | selenium-webdriver is not always required for system testingRyuta Kamizono2019-01-301-4/+2
| | | | | | | | | | | | | | | | | | But `NameError: uninitialized constant ActionDispatch::SystemTesting::Browser::Selenium` is pretty confused. I've little improved missing constant error to `NameError: uninitialized constant Selenium`.
* | | Fix system testing failureRyuta Kamizono2019-01-301-8/+11
|/ / | | | | | | https://travis-ci.org/rails/rails/jobs/486155626#L1317-L1335
* | Rename methods and update docsEileen Uchitelle2019-01-293-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor update to the named methods for the following: - s/desired_capabilities/capabilities - s/driver_options/capabilities Since they are all the same thing we should keep the name the same throughout the feature. Updated docs to match / be a little bit clearer Also updated the Gemfile for selenium-webdriver.
* | driver_option -> driver_optionsEdouard CHIN2019-01-292-7/+7
| |
* | Implement a way to add browser capabilities:Edouard CHIN2019-01-293-10/+40
|/ | | | | | | | | | | | | | | | | | * There is currently no way to define specific browser capabilities since our SystemTest driver override the `option` key [Ref](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/driver.rb#L35) This option key is used internally by selenium to add custom capabilities on the browser. Depending on the Browser, some option are allowed to be passed inside a hash, the driver takes care of setting whatever you passed on the driver option. An example [here](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/driver.rb#L35) where you are allowed to pass args such as `--no-sandbox` etc However this behavior was only meant for backward compatibility and as you can see it's deprecated. The non-deprecated behavior is to create a `<Driver>::Option` object containing all the capabilities we want. This is what we [currently do](https://github.com/rails/rails/blob/a07d0680787ced3c04b362fa7a238c918211ac70/actionpack/lib/action_dispatch/system_testing/browser.rb#L34-L36) when chrome or firefox are in headless mode. This PR allows to pass a block when calling `driven_by`, the block will be pased a `<Driver>::Option` instance. You can modify this object the way you want by adding any capabilities. The option object will be then passed to selenium. ```ruby driven_by :selenium, using: :chrome do |driver_option| driver_option.add_argument('--no-sandbox') driver_option.add_emulation(device: 'iphone 4') end ```
* Fixed a bug where the debug view does not show the error page properlyYuki Nishijima2019-01-242-11/+15
| | | | | | | | | | | | | | | | | | | | | There are two cases where the debug view does not show the error details properly: * When the cause is mapped to an HTTP status code the last exception is unexpectedly uwrapped * When the last error is thrown from a view template the debug view is not using the `rescues/template_error.html.erb` to generate the view Both the cases could be fixed by not unwrapping the exception. The only case where the exception should be unwrapped is when the last error is an `ActionView::Template::Error` object. In this case the HTTP status code is determined based on the cause. There are actually more wrapper exceptions that are intentionally thrown. However, there is a consistent pattern of setting the original message and original backtrace to the wrapper exception implemented, so the debug view will not lose the information about what went wrong eariler.
* Merge pull request #34994 from schuetzm/host-authorization-only-in-developmentRafael França2019-01-242-4/+4
|\ | | | | Recommend adding the requested domain to hosts whitelist only in deve…