roda 3.79.0 → 3.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e77e7eba739ca8bf0afe44555c8af8c9188f4ce8668310aad110a2afc638701
-  data.tar.gz: 19db55450dfe15e7aa4f678d7556ec427e52bcad421a096791d47a5a3fe128b4
+  metadata.gz: a9d94f31e568bd2774c3e582152f0bcdbffdf3fcd7e5a95241e73b3fd5b7ac3c
+  data.tar.gz: b9ad44642acdbaa0035cbd6ece521ca3432d2e7c23d75a331172ecd6c6288c60
 SHA512:
-  metadata.gz: f504398b08e35ca42b765afca4357d750836ce5d7e3e7ec9ba73b061dde57fd2bbd3fa5d7752b9e6995739fac8a8718b0a8a71d70432ec14b65c95e13dadeb29
-  data.tar.gz: ceb20219c23d4e44d006c5fe177fff3ef2cacb77ec75e109b92c03d12f0e9cf434459759d007df96becfa0e426c89f4f8f9517c00c579135cfbb0e613852a0a1
+  metadata.gz: 1cd64e84b47a1a7a01d9165d16e14d95d2c43287b58f2557d9492a201832c1388157152eab1fd12052c7691e3969e5ce1cb9c0ad706e73ad6de822dcc29e1590
+  data.tar.gz: 86320c603d0c9b90e2c82f16cc5229b76afe66dde5bdbccce9b28ce076e80808a35410098fe0eae5cb3f5b3180b79f4265b3d525e7861a9dd65890315d274fad

data/CHANGELOG

@@ -1,3 +1,15 @@
+= 3.81.0 (2024-06-12)
+
+* Make assets plugin :early_hints option follow Rack 3 SPEC if using Rack 3 (jeremyevans)
+
+* Correctly parse Ruby 3.4 backtraces in exception_page plugin (jeremyevans)
+
+* Support :until and :seconds option in hmac_paths plugin, for paths valid only until a specific time (jeremyevans)
+
+= 3.80.0 (2024-05-10)
+
+* Support :namespace option in hmac_paths plugin, allowing for easy per-user/per-group HMAC paths (jeremyevans)
+
 = 3.79.0 (2024-04-12)
 
 * Do not update template mtime when there is an error reloading templates in the render plugin (jeremyevans)

data/doc/release_notes/3.80.0.txt

@@ -0,0 +1,31 @@
+= New Features
+
+* The hmac_paths plugin now supports a :namespace option for both hmac_path and
+  r.hmac_path.  The :namespace option makes the generated HMAC values unique
+  per namespace, allowing easy use of per user/group HMAC paths. This can
+  be useful if the same path will show different information to different
+  users/groups, and you want to prevent path enumeration for each user/group
+  (not allow paths enumerated by one user/group to be valid for a different
+  user/group). Example:
+
+    hmac_path('/widget/1', namespace: '1')
+    # => "/3793ac2a72ea399c40cbd63f154d19f0fe34cdf8d347772134c506a0b756d590/n/widget/1"
+
+    hmac_path('/widget/1', namespace: '2')
+    # => "/0e1e748860d4fd17fe9b7c8259b1e26996502c38e465f802c2c9a0a13000087c/n/widget/1"
+  
+  The HMAC path created with namespace: '1' will only be valid when calling
+  r.hmac_path with namespace: '1' (similar for namespace: '2').
+
+  It is expected that the most common use of the :namespace option is to
+  reference session values, so the value of each path depends on the logged in
+  user.  You can use the :namespace_session_key plugin option to set the
+  default namespace for both hmac_path and r.hmac_path:
+
+    plugin :hmac_paths, secret: 'some-secret-value-with-at-least-32-bytes',
+           namespace_session_key: 'account_id'
+
+  This will use <tt>session['account_id']</tt> (converted to a string) as the namespace
+  for both hmac_path and r.hmac_path, unless a specific :namespace option is
+  given, making it simple to implement per user/group HMAC paths across an
+  application.

data/doc/release_notes/3.81.0.txt

@@ -0,0 +1,24 @@
+= New Features
+
+* The hmac_paths plugin now supports :until and :seconds options for
+  hmac_path, to create a path that is only valid for a specific amount of
+  time.  :until sets a specific time that the path will be valid until,
+  and :seconds makes the path only valid for the given number of seconds.
+
+    hmac_path('/widget/1', until: Time.utc(2100))
+    # =>  "/dc8b6e56e4cbe7815df7880d42f0e02956b2e4c49881b6060ceb0e49745a540d/t/4102444800/widget/1"
+
+  Requests for the path after the given time will not be matched by
+  r.hmac_path.
+
+= Other Improvements
+
+* The early_hints plugin now correctly follows the Rack 3 SPEC when
+  using Rack 3.  This was not caught previously because Rack only
+  added official support for early_hints in the last month.
+
+* Ruby 3.4 backtraces are now parsed correctly in the exception_page
+  plugin.
+
+* Some plugins that accept a block no longer issue an unused block
+  warning on Ruby 3.4.

data/lib/roda/plugins/assets.rb

@@ -736,7 +736,9 @@ class Roda
           paths = assets_paths(type)
           if o[:early_hints]
             early_hint_as = ltype == :js ? 'script' : 'style'
-            send_early_hints('Link'=>paths.map{|p| "<#{p}>; rel=preload; as=#{early_hint_as}"}.join("\n"))
+            early_hints = paths.map{|p| "<#{p}>; rel=preload; as=#{early_hint_as}"}
+            early_hints = early_hints.join("\n") if Rack.release < '3'
+            send_early_hints(RodaResponseHeaders::LINK=>early_hints)
           end
           paths.map{|p| "#{tag_start}#{h(p)}#{tag_end}"}.join("\n")
         end

data/lib/roda/plugins/exception_page.rb

@@ -245,7 +245,7 @@ END
 
             frames = exception.backtrace.map.with_index do |line, i|
               frame = {:id=>i}
-              if line =~ /\A(.*?):(\d+)(?::in `(.*)')?\Z/
+              if line =~ /\A(.*?):(\d+)(?::in [`'](.*)')?\Z/
                 filename = frame[:filename] = $1
                 lineno = frame[:lineno] = $2.to_i
                 frame[:function] = $3

data/lib/roda/plugins/filter_common_logger.rb

@@ -21,7 +21,7 @@ class Roda
     #     !request.path.start_with?('/admin/')
     #   end
     module FilterCommonLogger
-      def self.load_dependencies(app)
+      def self.load_dependencies(app, &_)
         app.plugin :common_logger
       end
 

data/lib/roda/plugins/hmac_paths.rb

@@ -112,13 +112,53 @@ class Roda
     # this for POST requests (or other HTTP verbs that can have request bodies), use +r.GET+
     # instead of +r.params+ to specifically check query string parameters.
     #
-    # You can use +:root+, +:method+, and +:params+ at the same time:
+    # The generated paths can be timestamped, so that they are only valid until a given time
+    # or for a given number of seconds after they are generated, using the :until or :seconds
+    # options:
     #
-    #   hmac_path('/1', root: '/widget', method: :get, params: {foo: 'bar'})
-    #   # => "/widget/9169af1b8f40c62a1c2bb15b1b377c65bda681b8efded0e613a4176387468c15/mp/1?foo=bar"
+    #   hmac_path('/widget/1', until: Time.utc(2100))
+    #   # =>  "/dc8b6e56e4cbe7815df7880d42f0e02956b2e4c49881b6060ceb0e49745a540d/t/4102444800/widget/1"
+    #
+    #   hmac_path('/widget/1', seconds: Time.utc(2100).to_i - Time.now.to_i)
+    #   # =>  "/dc8b6e56e4cbe7815df7880d42f0e02956b2e4c49881b6060ceb0e49745a540d/t/4102444800/widget/1"
+    #
+    # The :namespace option, if provided, should be a string, and it modifies the generated HMACs
+    # to only match those in the same namespace.  This can be used to provide different paths to
+    # different users or groups of users.
+    #
+    #   hmac_path('/widget/1', namespace: '1')
+    #   # => "/3793ac2a72ea399c40cbd63f154d19f0fe34cdf8d347772134c506a0b756d590/n/widget/1"
+    #
+    #   hmac_path('/widget/1', namespace: '2')
+    #   # => "/0e1e748860d4fd17fe9b7c8259b1e26996502c38e465f802c2c9a0a13000087c/n/widget/1"
+    #
+    # The +r.hmac_path+ method accepts a :namespace option, and if a :namespace option is
+    # provided, it will only match an hmac path if the namespace given matches the one used
+    # when the hmac path was created.
+    #
+    #   r.hmac_path(namespace: '1'){}
+    #   # will match "/3793ac2a72ea399c40cbd63f154d19f0fe34cdf8d347772134c506a0b756d590/n/widget/1"
+    #   # will not match "/0e1e748860d4fd17fe9b7c8259b1e26996502c38e465f802c2c9a0a13000087c/n/widget/1"
+    #
+    # The most common use of the :namespace option is to reference session values, so the value of
+    # each path depends on the logged in user.  You can use the +:namespace_session_key+ plugin
+    # option to set the default namespace for both +hmac_path+ and +r.hmac_path+:
+    #
+    #   plugin :hmac_paths, secret: 'some-secret-value-with-at-least-32-bytes',
+    #                       namespace_session_key: 'account_id'
+    #
+    # This will use <tt>session['account_id']</tt> as the default namespace for both +hmac_path+
+    # and +r.hmac_path+ (if the session value is not nil, it is converted to a string using +to_s+).
+    # You can override the default namespace by passing a +:namespace+ option when calling +hmac_path+
+    # and +r.hmac_path+.
+    #
+    # You can use +:root+, +:method+, +:params+, and +:namespace+ at the same time:
+    #
+    #   hmac_path('/1', root: '/widget', method: :get, params: {foo: 'bar'}, namespace: '1')
+    #   # => "/widget/c14c78a81d34d766cf334a3ddbb7a6b231bc2092ef50a77ded0028586027b14e/mpn/1?foo=bar"
     #
     # This gives you a path only valid for a GET request with a root of <tt>/widget</tt> and
-    # a query string of <tt>foo=bar</tt>.
+    # a query string of <tt>foo=bar</tt>, using namespace +1+.
     #
     # To handle secret rotation, you can provide an +:old_secret+ option when loading the
     # plugin.
@@ -128,6 +168,48 @@ class Roda
     #
     # This will use +:secret+ for constructing new paths, but will respect paths generated by
     # +:old_secret+.
+    #
+    # = HMAC Construction
+    #
+    # This describes the internals for how HMACs are constructed based on the options provided
+    # to +hmac_path+.  In the examples below:
+    #
+    # * +HMAC+ is the raw HMAC-SHA256 output (first argument is secret, second is data)
+    # * +HMAC_hex+ is the hexidecimal version of +HMAC+
+    # * +secret+ is the plugin :secret option
+    #
+    # The +:secret+ plugin option is never used directly as the HMAC secret.  All HMACs are
+    # generated with a root-specific secret.  The root will be the empty if no +:root+ option
+    # is given.  The hmac path flags are always included in the hmac calculation, prepended to the
+    # path:
+    #
+    #  r.hmac_path('/1')
+    #  HMAC_hex(HMAC_hex(secret, ''), '/0/1')
+    # 
+    #  r.hmac_path('/1', root: '/2')
+    #  HMAC_hex(HMAC_hex(secret, '/2'), '/0/1')
+    #
+    # The +:method+ option uses an uppercase version of the method prepended to the path. This
+    # cannot conflict with the path itself, since paths must start with a slash.
+    #
+    #  r.hmac_path('/1', method: :get)
+    #  HMAC_hex(HMAC_hex(secret, ''), 'GET:/m/1')
+    # 
+    # The +:params+ option includes the query string for the params in the HMAC:
+    #
+    #  r.hmac_path('/1', params: {k: 2})
+    #  HMAC_hex(HMAC_hex(secret, ''), '/p/1?k=2')
+    #
+    # The +:until+ and +:seconds+ option include the timestamp in the HMAC:
+    #
+    #  r.hmac_path('/1', until: Time.utc(2100))
+    #  HMAC_hex(HMAC_hex(secret, ''), '/t/4102444800/1')
+    #
+    # If a +:namespace+ option is provided, the original secret used before the +:root+ option is
+    # an HMAC of the +:secret+ plugin option and the given namespace.
+    # 
+    #  r.hmac_path('/1', namespace: '2')
+    #  HMAC_hex(HMAC_hex(HMAC(secret, '2'), ''), '/n/1')
     module HmacPaths
       def self.configure(app, opts=OPTS)
         hmac_secret = opts[:secret]
@@ -143,6 +225,10 @@ class Roda
 
         app.opts[:hmac_paths_secret] = hmac_secret
         app.opts[:hmac_paths_old_secret] = hmac_old_secret
+
+        if opts[:namespace_session_key]
+          app.opts[:hmac_paths_namespace_session_key] = opts[:namespace_session_key]
+        end
       end
 
       module InstanceMethods
@@ -152,12 +238,17 @@ class Roda
         # valid paths.  The given path should be a string starting with +/+.  Options:
         #
         # :method :: Limits the returned path to only be valid for the given request method.
+        # :namespace :: Make the HMAC value depend on the given namespace. If this is not
+        #               provided, the default namespace is used.  To explicitly not use a
+        #               namespace when there is a default namespace, pass a nil value.
         # :params :: Includes parameters in the query string of the returned path, and
         #            limits the returned path to only be valid for that exact query string.
         # :root :: Should be an empty string or string starting with +/+. This will be
         #          the already matched path of the routing tree using r.hmac_path. Defaults
         #          to the empty string, which will returns paths valid for r.hmac_path at
         #          the top level of the routing tree.
+        # :seconds :: Make the given path valid for the given integer number of seconds.
+        # :until :: Make the given path valid until the given Time.
         def hmac_path(path, opts=OPTS)
           unless path.is_a?(String) && path.getbyte(0) == 47
             raise RodaError, "path must be a string starting with /"
@@ -168,6 +259,12 @@ class Roda
             raise RodaError, "root must be empty string or string starting with /"
           end
 
+          if valid_until = opts[:until]
+            valid_until = valid_until.to_i
+          elsif seconds = opts[:seconds]
+            valid_until = Time.now.to_i + seconds
+          end
+
           flags = String.new
           path = path.dup
 
@@ -180,6 +277,15 @@ class Roda
             path << '?' << Rack::Utils.build_query(params)
           end
 
+          if hmac_path_namespace(opts)
+            flags << 'n'
+          end
+
+          if valid_until
+            flags << 't'
+            path = "/#{valid_until}#{path}"
+          end
+
           flags << '0' if flags.empty?
           
           hmac_path = if method
@@ -188,7 +294,7 @@ class Roda
             "/#{flags}#{path}"
           end
 
-          "#{root}/#{hmac_path_hmac(root, hmac_path)}/#{flags}#{path}"
+          "#{root}/#{hmac_path_hmac(root, hmac_path, opts)}/#{flags}#{path}"
         end
 
         # The HMAC to use in hmac_path, for the given root, path, and options.
@@ -196,14 +302,34 @@ class Roda
           OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, hmac_path_hmac_secret(root, opts), path)
         end
 
+        # The namespace to use for the hmac path.  If a :namespace option is not
+        # provided, and a :namespace_session_key option was provided, this will
+        # use the value of the related session key, if present.
+        def hmac_path_namespace(opts=OPTS)
+          opts.fetch(:namespace){hmac_path_default_namespace}
+        end
+
         private
 
         # The secret used to calculate the HMAC in hmac_path. This is itself an HMAC, created
-        # using the secret given in the plugin, for the given root and options. If the 
+        # using the secret given in the plugin, for the given root and options.
+        # This always returns a hexidecimal string.
         def hmac_path_hmac_secret(root, opts=OPTS)
           secret = opts[:secret] || self.opts[:hmac_paths_secret]
+
+          if namespace = hmac_path_namespace(opts)
+            secret = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, secret, namespace)
+          end
+
           OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, root)
         end
+
+        # The default namespace to use for hmac_path, if a :namespace option is not provided.
+        def hmac_path_default_namespace
+          if (key = opts[:hmac_paths_namespace_session_key]) && (value = session[key])
+            value.to_s
+          end
+        end
       end
 
       module RequestMethods
@@ -221,6 +347,13 @@ class Roda
             if submitted_hmac.bytesize == 64
               on String do |flags|
                 if flags.bytesize >= 1
+                  if flags.include?('n') ^ !scope.hmac_path_namespace(opts).nil?
+                    # Namespace required and not provided, or provided and not required.
+                    # Bail early to avoid unnecessary HMAC calculation.
+                    @remaining_path = orig_path
+                    return
+                  end
+
                   if flags.include?('m')
                     rpath = "#{env['REQUEST_METHOD'].to_s.upcase}:#{rpath}"
                   end
@@ -229,8 +362,20 @@ class Roda
                     rpath = "#{rpath}?#{env["QUERY_STRING"]}"
                   end
 
-                  if hmac_path_valid?(mpath, rpath, submitted_hmac)
-                    always(&block)
+                  if hmac_path_valid?(mpath, rpath, submitted_hmac, opts)
+                    if flags.include?('t')
+                      on Integer do |int|
+                        if int >= Time.now.to_i
+                          always(&block)
+                        else
+                          # Return from method without matching
+                          @remaining_path = orig_path
+                          return
+                        end
+                      end
+                    else
+                      always(&block)
+                    end
                   end
                 end
 
@@ -249,11 +394,13 @@ class Roda
         private
 
         # Determine whether the provided hmac matches.
-        def hmac_path_valid?(root, path, hmac)
-          if Rack::Utils.secure_compare(scope.hmac_path_hmac(root, path), hmac)
+        def hmac_path_valid?(root, path, hmac, opts=OPTS)
+          if Rack::Utils.secure_compare(scope.hmac_path_hmac(root, path, opts), hmac)
             true
           elsif old_secret = roda_class.opts[:hmac_paths_old_secret]
-            Rack::Utils.secure_compare(scope.hmac_path_hmac(root, path, secret: old_secret), hmac)
+            opts = opts.dup
+            opts[:secret] = old_secret
+            Rack::Utils.secure_compare(scope.hmac_path_hmac(root, path, opts), hmac)
           else
             false
           end

data/lib/roda/plugins/indifferent_params.rb

@@ -53,13 +53,10 @@ class Roda
           
           class Params < Rack::QueryParser::Params
             if Rack.release >= '3'
-              # rack main branch compatibility
-              # :nocov:
               if Params < Hash
                 def initialize
                   super(&INDIFFERENT_PROC)
                 end
-              # :nocov:
               else
                 def initialize
                   @size   = 0

data/lib/roda/plugins/not_found.rb

@@ -31,7 +31,7 @@ class Roda
     # still exists mainly for backward compatibility.
     module NotFound
       # Require the status_handler plugin
-      def self.load_dependencies(app)
+      def self.load_dependencies(app, &_)
         app.plugin :status_handler
       end
 

data/lib/roda/plugins/route_csrf.rb

@@ -172,7 +172,7 @@ class Roda
       # a valid CSRF token was not provided.
       class InvalidToken < RodaError; end
 
-      def self.load_dependencies(app, opts=OPTS)
+      def self.load_dependencies(app, opts=OPTS, &_)
         app.plugin :_base64
       end
 

data/lib/roda/plugins/sessions.rb

@@ -476,7 +476,7 @@ class Roda
           serialized_data << json_data
 
           cipher_secret = opts[:cipher_secret]
-          if per_cookie_secret = opts[:per_cookie_cipher_secret]
+          if opts[:per_cookie_cipher_secret]
             version = "\1"
             per_cookie_secret_base = SecureRandom.random_bytes(32)
             cipher_secret = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, cipher_secret, per_cookie_secret_base)

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 79
+  RodaMinorVersion = 81
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.79.0
+  version: 3.81.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -254,6 +254,8 @@ extra_rdoc_files:
 - doc/release_notes/3.78.0.txt
 - doc/release_notes/3.79.0.txt
 - doc/release_notes/3.8.0.txt
+- doc/release_notes/3.80.0.txt
+- doc/release_notes/3.81.0.txt
 - doc/release_notes/3.9.0.txt
 files:
 - CHANGELOG
@@ -340,6 +342,8 @@ files:
 - doc/release_notes/3.78.0.txt
 - doc/release_notes/3.79.0.txt
 - doc/release_notes/3.8.0.txt
+- doc/release_notes/3.80.0.txt
+- doc/release_notes/3.81.0.txt
 - doc/release_notes/3.9.0.txt
 - lib/roda.rb
 - lib/roda/cache.rb
@@ -505,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Routing tree web toolkit