actionpack 6.1.7.5 → 7.0.8.1

data/lib/action_controller/metal/conditional_get.rb

@@ -33,77 +33,100 @@ module ActionController
       end
     end
 
-    # Sets the +etag+, +last_modified+, or both on the response and renders a
+    # Sets the +etag+, +last_modified+, or both on the response, and renders a
     # <tt>304 Not Modified</tt> response if the request is already fresh.
     #
-    # === Parameters:
-    #
-    # * <tt>:etag</tt> Sets a "weak" ETag validator on the response. See the
-    #   +:weak_etag+ option.
-    # * <tt>:weak_etag</tt> Sets a "weak" ETag validator on the response.
-    #   Requests that set If-None-Match header may return a 304 Not Modified
-    #   response if it matches the ETag exactly. A weak ETag indicates semantic
-    #   equivalence, not byte-for-byte equality, so they're good for caching
-    #   HTML pages in browser caches. They can't be used for responses that
-    #   must be byte-identical, like serving Range requests within a PDF file.
-    # * <tt>:strong_etag</tt> Sets a "strong" ETag validator on the response.
-    #   Requests that set If-None-Match header may return a 304 Not Modified
-    #   response if it matches the ETag exactly. A strong ETag implies exact
-    #   equality: the response must match byte for byte. This is necessary for
-    #   doing Range requests within a large video or PDF file, for example, or
-    #   for compatibility with some CDNs that don't support weak ETags.
-    # * <tt>:last_modified</tt> Sets a "weak" last-update validator on the
-    #   response. Subsequent requests that set If-Modified-Since may return a
-    #   304 Not Modified response if last_modified <= If-Modified-Since.
-    # * <tt>:public</tt> By default the Cache-Control header is private, set this to
-    #   +true+ if you want your application to be cacheable by other devices (proxy caches).
-    # * <tt>:template</tt> By default, the template digest for the current
-    #   controller/action is included in ETags. If the action renders a
-    #   different template, you can include its digest instead. If the action
-    #   doesn't render a template at all, you can pass <tt>template: false</tt>
-    #   to skip any attempt to check for a template digest.
-    #
-    # === Example:
+    # ==== Options
+    #
+    # [+:etag+]
+    #   Sets a "weak" ETag validator on the response. See the +:weak_etag+ option.
+    # [+:weak_etag+]
+    #   Sets a "weak" ETag validator on the response. Requests that specify an
+    #   +If-None-Match+ header may receive a <tt>304 Not Modified</tt> response
+    #   if the ETag matches exactly.
+    #
+    #   A weak ETag indicates semantic equivalence, not byte-for-byte equality,
+    #   so they're good for caching HTML pages in browser caches. They can't be
+    #   used for responses that must be byte-identical, like serving +Range+
+    #   requests within a PDF file.
+    # [+:strong_etag+]
+    #   Sets a "strong" ETag validator on the response. Requests that specify an
+    #   +If-None-Match+ header may receive a <tt>304 Not Modified</tt> response
+    #   if the ETag matches exactly.
+    #
+    #   A strong ETag implies exact equality -- the response must match byte for
+    #   byte. This is necessary for serving +Range+ requests within a large
+    #   video or PDF file, for example, or for compatibility with some CDNs that
+    #   don't support weak ETags.
+    # [+:last_modified+]
+    #   Sets a "weak" last-update validator on the response. Subsequent requests
+    #   that specify an +If-Modified-Since+ header may receive a <tt>304 Not Modified</tt>
+    #   response if +last_modified+ <= +If-Modified-Since+.
+    # [+:public+]
+    #   By default the +Cache-Control+ header is private. Set this option to
+    #   +true+ if you want your application to be cacheable by other devices,
+    #   such as proxy caches.
+    # [+:cache_control+]
+    #   When given, will overwrite an existing +Cache-Control+ header. For a
+    #   list of +Cache-Control+ directives, see the {article on
+    #   MDN}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control].
+    # [+:template+]
+    #   By default, the template digest for the current controller/action is
+    #   included in ETags. If the action renders a different template, you can
+    #   include its digest instead. If the action doesn't render a template at
+    #   all, you can pass <tt>template: false</tt> to skip any attempt to check
+    #   for a template digest.
+    #
+    # ==== Examples
     #
     #   def show
     #     @article = Article.find(params[:id])
     #     fresh_when(etag: @article, last_modified: @article.updated_at, public: true)
     #   end
     #
-    # This will render the show template if the request isn't sending a matching ETag or
-    # If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match.
+    # This will send a <tt>304 Not Modified</tt> response if the request
+    # specifies a matching ETag and +If-Modified-Since+ header. Otherwise, it
+    # will render the +show+ template.
     #
-    # You can also just pass a record. In this case +last_modified+ will be set
-    # by calling +updated_at+ and +etag+ by passing the object itself.
+    # You can also just pass a record:
     #
     #   def show
     #     @article = Article.find(params[:id])
     #     fresh_when(@article)
     #   end
     #
+    # +etag+ will be set to the record, and +last_modified+ will be set to the
+    # record's +updated_at+.
+    #
     # You can also pass an object that responds to +maximum+, such as a
-    # collection of active records. In this case +last_modified+ will be set by
-    # calling <tt>maximum(:updated_at)</tt> on the collection (the timestamp of the
-    # most recently updated record) and the +etag+ by passing the object itself.
+    # collection of records:
     #
     #   def index
     #     @articles = Article.all
     #     fresh_when(@articles)
     #   end
     #
-    # When passing a record or a collection, you can still set the public header:
+    # In this case, +etag+ will be set to the collection, and +last_modified+
+    # will be set to <tt>maximum(:updated_at)</tt> (the timestamp of the most
+    # recently updated record).
+    #
+    # When passing a record or a collection, you can still specify other
+    # options, such as +:public+ and +:cache_control+:
     #
     #   def show
     #     @article = Article.find(params[:id])
-    #     fresh_when(@article, public: true)
+    #     fresh_when(@article, public: true, cache_control: { no_cache: true })
     #   end
     #
-    # When rendering a different template than the default controller/action
-    # style, you can indicate which digest to include in the ETag:
+    # The above will set <tt>Cache-Control: public, no-cache</tt> in the response.
+    #
+    # When rendering a different template than the controller/action's default
+    # template, you can indicate which digest to include in the ETag:
     #
-    #   before_action { fresh_when @article, template: 'widgets/show' }
+    #   before_action { fresh_when @article, template: "widgets/show" }
     #
-    def fresh_when(object = nil, etag: nil, weak_etag: nil, strong_etag: nil, last_modified: nil, public: false, template: nil)
+    def fresh_when(object = nil, etag: nil, weak_etag: nil, strong_etag: nil, last_modified: nil, public: false, cache_control: {}, template: nil)
+      response.cache_control.delete(:no_store)
       weak_etag ||= etag || object unless strong_etag
       last_modified ||= object.try(:updated_at) || object.try(:maximum, :updated_at)
 
@@ -117,43 +140,21 @@ module ActionController
 
       response.last_modified = last_modified if last_modified
       response.cache_control[:public] = true if public
+      response.cache_control.merge!(cache_control)
 
       head :not_modified if request.fresh?(response)
     end
 
-    # Sets the +etag+ and/or +last_modified+ on the response and checks it against
-    # the client request. If the request doesn't match the options provided, the
-    # request is considered stale and should be generated from scratch. Otherwise,
-    # it's fresh and we don't need to generate anything and a reply of <tt>304 Not Modified</tt> is sent.
-    #
-    # === Parameters:
-    #
-    # * <tt>:etag</tt> Sets a "weak" ETag validator on the response. See the
-    #   +:weak_etag+ option.
-    # * <tt>:weak_etag</tt> Sets a "weak" ETag validator on the response.
-    #   Requests that set If-None-Match header may return a 304 Not Modified
-    #   response if it matches the ETag exactly. A weak ETag indicates semantic
-    #   equivalence, not byte-for-byte equality, so they're good for caching
-    #   HTML pages in browser caches. They can't be used for responses that
-    #   must be byte-identical, like serving Range requests within a PDF file.
-    # * <tt>:strong_etag</tt> Sets a "strong" ETag validator on the response.
-    #   Requests that set If-None-Match header may return a 304 Not Modified
-    #   response if it matches the ETag exactly. A strong ETag implies exact
-    #   equality: the response must match byte for byte. This is necessary for
-    #   doing Range requests within a large video or PDF file, for example, or
-    #   for compatibility with some CDNs that don't support weak ETags.
-    # * <tt>:last_modified</tt> Sets a "weak" last-update validator on the
-    #   response. Subsequent requests that set If-Modified-Since may return a
-    #   304 Not Modified response if last_modified <= If-Modified-Since.
-    # * <tt>:public</tt> By default the Cache-Control header is private, set this to
-    #   +true+ if you want your application to be cacheable by other devices (proxy caches).
-    # * <tt>:template</tt> By default, the template digest for the current
-    #   controller/action is included in ETags. If the action renders a
-    #   different template, you can include its digest instead. If the action
-    #   doesn't render a template at all, you can pass <tt>template: false</tt>
-    #   to skip any attempt to check for a template digest.
-    #
-    # === Example:
+    # Sets the +etag+ and/or +last_modified+ on the response and checks them
+    # against the request. If the request doesn't match the provided options, it
+    # is considered stale, and the response should be rendered from scratch.
+    # Otherwise, it is fresh, and a <tt>304 Not Modified</tt> is sent.
+    #
+    # ==== Options
+    #
+    # See #fresh_when for supported options.
+    #
+    # ==== Examples
     #
     #   def show
     #     @article = Article.find(params[:id])
@@ -166,8 +167,7 @@ module ActionController
     #     end
     #   end
     #
-    # You can also just pass a record. In this case +last_modified+ will be set
-    # by calling +updated_at+ and +etag+ by passing the object itself.
+    # You can also just pass a record:
     #
     #   def show
     #     @article = Article.find(params[:id])
@@ -180,10 +180,11 @@ module ActionController
     #     end
     #   end
     #
+    # +etag+ will be set to the record, and +last_modified+ will be set to the
+    # record's +updated_at+.
+    #
     # You can also pass an object that responds to +maximum+, such as a
-    # collection of active records. In this case +last_modified+ will be set by
-    # calling <tt>maximum(:updated_at)</tt> on the collection (the timestamp of the
-    # most recently updated record) and the +etag+ by passing the object itself.
+    # collection of records:
     #
     #   def index
     #     @articles = Article.all
@@ -196,24 +197,31 @@ module ActionController
     #     end
     #   end
     #
-    # When passing a record or a collection, you can still set the public header:
+    # In this case, +etag+ will be set to the collection, and +last_modified+
+    # will be set to <tt>maximum(:updated_at)</tt> (the timestamp of the most
+    # recently updated record).
+    #
+    # When passing a record or a collection, you can still specify other
+    # options, such as +:public+ and +:cache_control+:
     #
     #   def show
     #     @article = Article.find(params[:id])
     #
-    #     if stale?(@article, public: true)
-    #       @statistics = @article.really_expensive_call
+    #     if stale?(@article, public: true, cache_control: { no_cache: true })
+    #       @statistics = @articles.really_expensive_call
     #       respond_to do |format|
     #         # all the supported formats
     #       end
     #     end
     #   end
     #
-    # When rendering a different template than the default controller/action
-    # style, you can indicate which digest to include in the ETag:
+    # The above will set <tt>Cache-Control: public, no-cache</tt> in the response.
+    #
+    # When rendering a different template than the controller/action's default
+    # template, you can indicate which digest to include in the ETag:
     #
     #   def show
-    #     super if stale? @article, template: 'widgets/show'
+    #     super if stale?(@article, template: "widgets/show")
     #   end
     #
     def stale?(object = nil, **freshness_kwargs)
@@ -221,29 +229,50 @@ module ActionController
       !request.fresh?(response)
     end
 
-    # Sets an HTTP 1.1 Cache-Control header. Defaults to issuing a +private+
-    # instruction, so that intermediate caches must not cache the response.
+    # Sets the +Cache-Control+ header, overwriting existing directives. This
+    # method will also ensure an HTTP +Date+ header for client compatibility.
+    #
+    # Defaults to issuing the +private+ directive, so that intermediate caches
+    # must not cache the response.
+    #
+    # ==== Options
+    #
+    # [+:public+]
+    #   If true, replaces the default +private+ directive with the +public+
+    #   directive.
+    # [+:must_revalidate+]
+    #   If true, adds the +must-revalidate+ directive.
+    # [+:stale_while_revalidate+]
+    #   Sets the value of the +stale-while-revalidate+ directive.
+    # [+:stale_if_error+]
+    #   Sets the value of the +stale-if-error+ directive.
     #
-    #   expires_in 20.minutes
-    #   expires_in 3.hours, public: true
-    #   expires_in 3.hours, public: true, must_revalidate: true
+    # Any additional key-value pairs are concatenated as directives. For a list
+    # of supported +Cache-Control+ directives, see the {article on
+    # MDN}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control].
     #
-    # This method will overwrite an existing Cache-Control header.
-    # See https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
+    # ==== Examples
     #
-    # HTTP Cache-Control Extensions for Stale Content. See https://tools.ietf.org/html/rfc5861
-    # It helps to cache an asset and serve it while is being revalidated and/or returning with an error.
+    #   expires_in 10.minutes
+    #   # => Cache-Control: max-age=600, private
     #
-    #   expires_in 3.hours, public: true, stale_while_revalidate: 60.seconds
-    #   expires_in 3.hours, public: true, stale_while_revalidate: 60.seconds, stale_if_error: 5.minutes
+    #   expires_in 10.minutes, public: true
+    #   # => Cache-Control: max-age=600, public
     #
-    # HTTP Cache-Control Extensions other values: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
-    # Any additional key-value pairs are concatenated onto the `Cache-Control` header in the response:
+    #   expires_in 10.minutes, public: true, must_revalidate: true
+    #   # => Cache-Control: max-age=600, public, must-revalidate
     #
-    #   expires_in 3.hours, public: true, "s-maxage": 3.hours, "no-transform": true
+    #   expires_in 1.hour, stale_while_revalidate: 60.seconds
+    #   # => Cache-Control: max-age=3600, private, stale-while-revalidate=60
+    #
+    #   expires_in 1.hour, stale_if_error: 5.minutes
+    #   # => Cache-Control: max-age=3600, private, stale-if-error=300
+    #
+    #   expires_in 1.hour, public: true, "s-maxage": 3.hours, "no-transform": true
+    #   # => Cache-Control: max-age=3600, public, s-maxage=10800, no-transform=true
     #
-    # The method will also ensure an HTTP Date header for client compatibility.
     def expires_in(seconds, options = {})
+      response.cache_control.delete(:no_store)
       response.cache_control.merge!(
         max_age: seconds,
         public: options.delete(:public),
@@ -257,7 +286,7 @@ module ActionController
       response.date = Time.now unless response.date?
     end
 
-    # Sets an HTTP 1.1 Cache-Control header of <tt>no-cache</tt>. This means the
+    # Sets an HTTP 1.1 +Cache-Control+ header of <tt>no-cache</tt>. This means the
     # resource will be marked as stale, so clients must always revalidate.
     # Intermediate/browser caches may still store the asset.
     def expires_now
@@ -280,6 +309,12 @@ module ActionController
                       public: public)
     end
 
+    # Sets an HTTP 1.1 +Cache-Control+ header of <tt>no-store</tt>. This means the
+    # resource may not be stored in any cache.
+    def no_store
+      response.cache_control.replace(no_store: true)
+    end
+
     private
       def combine_etags(validator, options)
         [validator, *etaggers.map { |etagger| instance_exec(options, &etagger) }].compact

data/lib/action_controller/metal/content_security_policy.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-module ActionController #:nodoc:
+module ActionController # :nodoc:
   module ContentSecurityPolicy
-    # TODO: Documentation
     extend ActiveSupport::Concern
 
     include AbstractController::Helpers
@@ -14,6 +13,29 @@ module ActionController #:nodoc:
     end
 
     module ClassMethods
+      # Overrides parts of the globally configured +Content-Security-Policy+
+      # header:
+      #
+      #   class PostsController < ApplicationController
+      #     content_security_policy do |policy|
+      #       policy.base_uri "https://www.example.com"
+      #     end
+      #   end
+      #
+      # Options can be passed similar to +before_action+. For example, pass
+      # <tt>only: :index</tt> to override the header on the index action only:
+      #
+      #   class PostsController < ApplicationController
+      #     content_security_policy(only: :index) do |policy|
+      #       policy.default_src :self, :https
+      #     end
+      #   end
+      #
+      # Pass +false+ to remove the +Content-Security-Policy+ header:
+      #
+      #   class PostsController < ApplicationController
+      #     content_security_policy false, only: :index
+      #   end
       def content_security_policy(enabled = true, **options, &block)
         before_action(options) do
           if block_given?
@@ -28,6 +50,18 @@ module ActionController #:nodoc:
         end
       end
 
+      # Overrides the globally configured +Content-Security-Policy-Report-Only+
+      # header:
+      #
+      #   class PostsController < ApplicationController
+      #     content_security_policy_report_only only: :index
+      #   end
+      #
+      # Pass +false+ to remove the +Content-Security-Policy-Report-Only+ header:
+      #
+      #   class PostsController < ApplicationController
+      #     content_security_policy_report_only false, only: :index
+      #   end
       def content_security_policy_report_only(report_only = true, **options)
         before_action(options) do
           request.content_security_policy_report_only = report_only

data/lib/action_controller/metal/cookies.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActionController #:nodoc:
+module ActionController # :nodoc:
   module Cookies
     extend ActiveSupport::Concern
 

data/lib/action_controller/metal/data_streaming.rb

@@ -3,7 +3,7 @@
 require "action_controller/metal/exceptions"
 require "action_dispatch/http/content_disposition"
 
-module ActionController #:nodoc:
+module ActionController # :nodoc:
   # Methods for sending arbitrary data and for streaming files to the browser,
   # instead of rendering.
   module DataStreaming
@@ -11,14 +11,14 @@ module ActionController #:nodoc:
 
     include ActionController::Rendering
 
-    DEFAULT_SEND_FILE_TYPE        = "application/octet-stream" #:nodoc:
-    DEFAULT_SEND_FILE_DISPOSITION = "attachment" #:nodoc:
+    DEFAULT_SEND_FILE_TYPE        = "application/octet-stream" # :nodoc:
+    DEFAULT_SEND_FILE_DISPOSITION = "attachment" # :nodoc:
 
     private
-      # Sends the file. This uses a server-appropriate method (such as X-Sendfile)
-      # via the Rack::Sendfile middleware. The header to use is set via
+      # Sends the file. This uses a server-appropriate method (such as +X-Sendfile+)
+      # via the +Rack::Sendfile+ middleware. The header to use is set via
       # +config.action_dispatch.x_sendfile_header+.
-      # Your server can also configure this for you by setting the X-Sendfile-Type header.
+      # Your server can also configure this for you by setting the +X-Sendfile-Type+ header.
       #
       # Be careful to sanitize the path parameter if it is coming from a web
       # page. <tt>send_file(params[:path])</tt> allows a malicious user to
@@ -28,17 +28,17 @@ module ActionController #:nodoc:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
       #   Defaults to <tt>File.basename(path)</tt>.
       # * <tt>:type</tt> - specifies an HTTP content type.
-      #   You can specify either a string or a symbol for a registered type with <tt>Mime::Type.register</tt>, for example :json.
+      #   You can specify either a string or a symbol for a registered type with <tt>Mime::Type.register</tt>, for example +:json+.
       #   If omitted, the type will be inferred from the file extension specified in <tt>:filename</tt>.
-      #   If no content type is registered for the extension, the default type 'application/octet-stream' will be used.
+      #   If no content type is registered for the extension, the default type +application/octet-stream+ will be used.
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
-      #   Valid values are 'inline' and 'attachment' (default).
+      #   Valid values are <tt>"inline"</tt> and <tt>"attachment"</tt> (default).
       # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
       # * <tt>:url_based_filename</tt> - set to +true+ if you want the browser to guess the filename from
       #   the URL, which is necessary for i18n filenames on certain browsers
       #   (setting <tt>:filename</tt> overrides this option).
       #
-      # The default Content-Type and Content-Disposition headers are
+      # The default +Content-Type+ and +Content-Disposition+ headers are
       # set to download arbitrary binary files in as many browsers as
       # possible. IE versions 4, 5, 5.5, and 6 are all known to have
       # a variety of quirks (especially when downloading over SSL).
@@ -55,18 +55,18 @@ module ActionController #:nodoc:
       #
       #   send_file '/path/to/404.html', type: 'text/html; charset=utf-8', disposition: 'inline', status: 404
       #
-      # Read about the other Content-* HTTP headers if you'd like to
-      # provide the user with more information (such as Content-Description) in
-      # https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11.
+      # You can use other <tt>Content-*</tt> HTTP headers to provide additional
+      # information to the client. See MDN for a
+      # {list of HTTP headers}[https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers].
       #
       # Also be aware that the document may be cached by proxies and browsers.
-      # The Pragma and Cache-Control headers declare how the file may be cached
+      # The +Pragma+ and +Cache-Control+ headers declare how the file may be cached
       # by intermediaries. They default to require clients to validate with
       # the server before releasing cached responses. See
       # https://www.mnot.net/cache_docs/ for an overview of web caching and
-      # https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
-      # for the Cache-Control header spec.
-      def send_file(path, options = {}) #:doc:
+      # {RFC 9111}[https://www.rfc-editor.org/rfc/rfc9111.html#name-cache-control]
+      # for the +Cache-Control+ header spec.
+      def send_file(path, options = {}) # :doc:
         raise MissingFile, "Cannot read file #{path}" unless File.file?(path) && File.readable?(path)
 
         options[:filename] ||= File.basename(path) unless options[:url_based_filename]
@@ -85,12 +85,12 @@ module ActionController #:nodoc:
       #
       # Options:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
-      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'.
-      #   You can specify either a string or a symbol for a registered type with <tt>Mime::Type.register</tt>, for example :json.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to +application/octet-stream+.
+      #   You can specify either a string or a symbol for a registered type with <tt>Mime::Type.register</tt>, for example +:json+.
       #   If omitted, type will be inferred from the file extension specified in <tt>:filename</tt>.
-      #   If no content type is registered for the extension, the default type 'application/octet-stream' will be used.
+      #   If no content type is registered for the extension, the default type +application/octet-stream+ will be used.
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
-      #   Valid values are 'inline' and 'attachment' (default).
+      #   Valid values are <tt>"inline"</tt> and <tt>"attachment"</tt> (default).
       # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
       #
       # Generic data download:
@@ -105,8 +105,8 @@ module ActionController #:nodoc:
       #
       #   send_data image.data, type: image.content_type, disposition: 'inline'
       #
-      # See +send_file+ for more information on HTTP Content-* headers and caching.
-      def send_data(data, options = {}) #:doc:
+      # See +send_file+ for more information on HTTP <tt>Content-*</tt> headers and caching.
+      def send_data(data, options = {}) # :doc:
         send_file_headers! options
         render options.slice(:status, :content_type).merge(body: data)
       end
@@ -138,14 +138,6 @@ module ActionController #:nodoc:
         end
 
         headers["Content-Transfer-Encoding"] = "binary"
-
-        # Fix a problem with IE 6.0 on opening downloaded files:
-        # If Cache-Control: no-cache is set (which Rails does by default),
-        # IE removes the file it just downloaded from its cache immediately
-        # after it displays the "open/save" dialog, which means that if you
-        # hit "open" the file isn't there anymore when the application that
-        # is called for handling the download is run, so let's workaround that
-        response.cache_control[:public] ||= false
       end
   end
 end

data/lib/action_controller/metal/etag_with_flash.rb

@@ -12,7 +12,7 @@ module ActionController
     include ActionController::ConditionalGet
 
     included do
-      etag { flash unless flash.empty? }
+      etag { flash if request.respond_to?(:flash) && !flash.empty? }
     end
   end
 end