aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * | | | Update regular expression for checking valid MIME typeCliff Pruitt2019-03-192-1/+19
| | | | | | | | | | | | | | | | | | | | 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-192-7/+57
|/ / / / | | | | | | | | | | | | | | | | 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-193-2/+43
|\ \ \ \ \ | | | | | | | | | | | | Raise exception when building invalid mime type
| * | | | | Raise exception when building invalid mime typeJohn Hawthorn2019-03-143-2/+43
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Fix a ContentNegotiation test descriptionSharang Dashputre2019-03-191-1/+1
| | | | |
* | | | | Suggest 'strict-origin' Referrer-Policy headerTom Richards2019-03-171-1/+1
|/ / / /
* | | | Merge tag 'v6.0.0.beta3'eileencodes2019-03-136-10/+33
|\ \ \ \ | | | | | | | | | | | | | | | v6.0.0.beta3 release
| * | | | Prep releaseeileencodes2019-03-112-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-103-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | [CVE-2019-5418] [CVE-2019-5419]
* | | | | Update small typo in documentation.Kurt Mueller2019-03-121-1/+1
| | | | |
* | | | | 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-102-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Ruby 2.7 warning: creating a Proc without a block
| * | | | | ActionPack Proc.new without a blockutilum2019-02-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #35549 from r7kamura/feature/response-charsetRyuta Kamizono2019-03-102-4/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support other optional parameters and quoted-strings on Content-Type parser
| * | | | | | Support other optional parameters and quoted-strings on Content-Type parserr7kamura2019-03-102-4/+37
| | | | | | |
* | | | | | | Merge pull request #35559 from ↵Kasper Timm Hansen2019-03-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ashishprajapati/ashishprajapati/important_textual_improvements Added missing guide links in documentation and minor wording fix
| * | | | | | | Added missing guide links in README documentation and minor wording fix [ci ↵ashishprajapati2019-03-101-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | skip]
* / / / / / / Updated links from http to https in guides, docs, etcAbhay Nikam2019-03-092-2/+2
|/ / / / / /
* | | | | | [ci skip] Fix typosShailesh Kalamkar2019-03-071-1/+1
| | | | | |
* | | | | | Merge pull request #35422 from ricardotk002/fix-indentation-ad-routingRafael França2019-02-261-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix code examples' indentation in ActionDispatch::Routing
| * | | | | | Fix code examples' indentation in ActionDispatch::Routing [ci skip]Ricardo Díaz2019-02-261-4/+4
| | |/ / / / | |/| | | |
* / | | | | Pass locals in to the template object on constructionAaron Patterson2019-02-251-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that locals are passed in to the template objects when they are constructed, then removes the `locals=` mutator on the template object. This means we don't need to mutate Template objects with locals in the `decorate` method.
* | | | | Preparing for 6.0.0.beta2 releaseRafael Mendonça França2019-02-252-1/+3
| | | | |
* | | | | Merge pull request #35400 from aglushkov/stream_manual_cache_controlAaron Patterson2019-02-252-2/+8
|\ \ \ \ \ | | | | | | | | | | | | Allow custom cache-control header in AC::Live
| * | | | | Allow custom cache-control header in AC::LiveAndrey Glushkov2019-02-252-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/35312
* | | | | | Always pass a format to the ActionView::Template constructorAaron Patterson2019-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we can eliminate nil checks and remove some mutations from the `decorate` method.
* | | | | | Restore UploadedFile compatibility with IO.copy_streamJanko Marohnić2019-02-232-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Test ActionDispatch::Http::UploadedFile with an actual TempfileJanko Marohnić2019-02-231-48/+48
| |_|/ / / |/| | | |
* | | | | Merge pull request #35293 from rails/remove-rendered-format-from-cacheAaron Patterson2019-02-192-12/+15
|\ \ \ \ \ | | | | | | | | | | | | Pass the template format to the digestor
| * | | | | Pass the template format to the digestorAaron Patterson2019-02-152-12/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* / / / / appropriate typo fixalkesh262019-02-191-1/+1
|/ / / /
* | | | AbstractController::Translation#t: dup optionsNazar Matus2019-02-151-0/+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