sequel-privacy 0.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651aa5392073590a594f91df25458c4e2594ae6de3d8157b53525bfe210ebeef
-  data.tar.gz: 6addd80f151b6a1b272e5f70376ac41e18fd84e7a60cc77d68017d3c6b646dc6
+  metadata.gz: af7fc02c1fb57d47ba358babdebb3289c2d8eb6ec43d2fce25a2c3477a3f2ccc
+  data.tar.gz: a18b09c73b5b03540d2a74f985d32c99b6b2a090a714346f2c87ef5a2997252c
 SHA512:
-  metadata.gz: cb083193065e4d0929beb64dc3f51029e375861d42f5800da2218a3699b1adcd37c16aea5dc55f3cce0d250322967bed98f3c2e53119a693d8e7e9f0111bdab6
-  data.tar.gz: 83840dfe5cded9036995df6371c083c9ab72e983f0c3de1eee69ff7a6b56b0b4e00c3ede0c6225e71669ce3bb14d981f08095c49153c5e75bacf6ee6896c072f
+  metadata.gz: 9f46a3f0f253061be75dcd2fb80cf797c1be229d5fd83b1c9f1c86860621dae4536ea60b06df4e38d2d6b1e66f0e90533f0d3a75dddc48be388898ac1d8517d4
+  data.tar.gz: f4aee413ab143a08366b223e2c34d62165c69f1e63871eee400d6f82af3c096266e0646f3b4d3d4649a761c913e2c07cef8f852586f0c535d0af3daf1d02f9a6

data/lib/sequel/plugins/privacy.rb

@@ -191,12 +191,16 @@ module Sequel
           :"#{self}_privacy_vc"
         end
 
-        # Override Sequel's call method - this is the lowest-level instantiation point
-        # for ALL database-loaded records. Every path goes through here:
-        # - Model[id], Model.first, Model.all, associations, etc.
+        # Override Sequel's call method to act as a strict-mode gate.
+        # Every database-loaded record flows through here (Model[id],
+        # Model.first, Model.all, associations, ...). This checks that a
+        # VC is in scope (or that the class opted out via
+        # allow_unsafe_access!) and defers VC attachment and :view
+        # filtering to DatasetMethods#row_proc — those are per-row
+        # concerns and have context-dependent bypasses (policy
+        # evaluation, eager-load attachment) that don't belong here.
         sig { params(values: T.untyped).returns(T.nilable(Sequel::Model)) }
         def call(values)
-          # Check if we're in a VC context (thread-local set by for_vc)
           vc = Thread.current[privacy_vc_key]
 
           unless vc || allow_unsafe_access?
@@ -204,25 +208,7 @@ module Sequel
                          "#{self} requires a ViewerContext. Use #{self}.for_vc(vc) or call #{self}.allow_unsafe_access!"
           end
 
-          # Create the instance via parent chain
-          instance = super
-
-          # Attach VC if present
-          if vc && instance
-            instance.instance_variable_set(:@viewer_context, vc)
-
-            # During nested policy evaluation, return raw rows so the outer
-            # policy can traverse data (e.g. checking membership) without
-            # recursive :view filtering.
-            return instance if Sequel::Privacy::Enforcer.in_policy_eval?
-
-            unless T.cast(instance, InstanceMethods).allow?(vc, :view)
-              Sequel::Privacy.logger&.debug { "Privacy denied :view on #{self}[#{instance.pk}]" }
-              return nil
-            end
-          end
-
-          instance
+          super
         end
 
         # ─────────────────────────────────────────────────────────────────────
@@ -410,6 +396,8 @@ module Sequel
         # Override Sequel's associate method to wrap associations with privacy checks
         sig { params(type: Symbol, name: Symbol, opts: T.untyped, block: T.untyped).returns(T.untyped) }
         def associate(type, name, opts = {}, &block)
+          opts = _inject_privacy_eager_block(opts)
+
           # Call original to create the association
           result = super
 
@@ -417,8 +405,10 @@ module Sequel
           case type
           when :many_to_one, :one_to_one
             _override_singular_association(name)
+            _override_association_dataset(name)
           when :one_to_many, :many_to_many
             _override_plural_association(name)
+            _override_association_dataset(name)
             # Check if there are already privacy policies defined for this association
             setup_association_privacy(name) if privacy_association_policies[name]
           end
@@ -426,8 +416,51 @@ module Sequel
           result
         end
 
+        # Wrap the association's eager-load dataset with for_vc() so the
+        # child rows are materialized with the current viewer context.
+        # The VC is propagated via a thread-local set by DatasetMethods#all
+        # so that it's only applied during eager loading, not during the
+        # lazy association reader path (which has its own handling).
+        sig { params(opts: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+        def _inject_privacy_eager_block(opts)
+          original = opts[:eager_block]
+          wrapped = proc do |ds|
+            ds = original.call(ds) if original
+            vc = Thread.current[DatasetMethods::EAGER_VC_KEY]
+            if vc && T.unsafe(ds).model.respond_to?(:privacy_vc_key)
+              T.unsafe(ds).for_vc(vc)
+            else
+              ds
+            end
+          end
+          opts.merge(eager_block: wrapped)
+        end
+
         private
 
+        sig { params(name: Symbol).void }
+        def _override_association_dataset(name)
+          dataset_method = :"#{name}_dataset"
+          return unless method_defined?(dataset_method)
+
+          original = instance_method(dataset_method)
+          assoc_reflection = association_reflection(name)
+          assoc_class = T.let(nil, T.nilable(T.class_of(Sequel::Model)))
+
+          define_method(dataset_method) do |*args|
+            ds = original.bind(self).(*args)
+            vc = instance_variable_get(:@viewer_context)
+            return ds unless vc
+
+            assoc_class ||= assoc_reflection.associated_class
+            if assoc_class.respond_to?(:privacy_vc_key) && ds.respond_to?(:for_vc)
+              T.unsafe(ds).for_vc(vc)
+            else
+              ds
+            end
+          end
+        end
+
         sig { params(name: Symbol).void }
         def _override_singular_association(name)
           original = instance_method(name)
@@ -732,14 +765,27 @@ module Sequel
         has_attached_class!(:out)
         requires_ancestor { Sequel::Dataset }
 
+        # Thread-local key for propagating the current VC to eager-load
+        # datasets via the :eager_block injected in ClassMethods#associate.
+        EAGER_VC_KEY = :sequel_privacy_eager_vc
+
         # Attach viewer context to dataset for privacy enforcement on materialization
         sig { params(vc: Sequel::Privacy::ViewerContext).returns(Sequel::Dataset) }
         def for_vc(vc)
           clone(viewer_context: vc)
         end
 
-        # Override row_proc to wrap Model.call with thread-local VC.
-        # This is the single integration point that covers all iteration methods.
+        # Override row_proc to wrap Model.call with the full per-row
+        # privacy pipeline: set the thread-local VC so Model.call's
+        # strict-mode gate passes, attach the VC to the instance, and
+        # apply the :view filter — with two bypasses for materialization
+        # contexts where filtering would be wrong or break callers:
+        #   - in_policy_eval?: policies that traverse protected data
+        #     need raw rows so their checks (e.g. membership) aren't
+        #     short-circuited by recursive :view filtering.
+        #   - EAGER_VC_KEY: Sequel's eager-load attachment block
+        #     dereferences each record to bucket by FK and would crash
+        #     on nils; the association reader filters at read time.
         sig { returns(T.untyped) }
         def row_proc
           vc = opts[:viewer_context]
@@ -751,10 +797,23 @@ module Sequel
             old_vc = Thread.current[vc_key]
             Thread.current[vc_key] = vc
             begin
-              model_class.(values)
+              instance = model_class.(values)
             ensure
               Thread.current[vc_key] = old_vc
             end
+
+            next nil if instance.nil?
+
+            instance.instance_variable_set(:@viewer_context, vc)
+            next instance if Sequel::Privacy::Enforcer.in_policy_eval?
+            next instance if Thread.current[EAGER_VC_KEY]
+
+            if T.cast(instance, InstanceMethods).allow?(vc, :view)
+              instance
+            else
+              Sequel::Privacy.logger&.debug { "Privacy denied :view on #{model_class}[#{instance.pk}]" }
+              nil
+            end
           end
         end
 
@@ -765,6 +824,34 @@ module Sequel
           opts[:viewer_context] ? results.compact : results
         end
 
+        # Sequel calls post_load after rows are fetched but before any
+        # user block. Model's override of post_load triggers eager_load
+        # here. Set the thread-local VC around that call so each
+        # association's injected :eager_block can wrap its child dataset
+        # with for_vc. Children are then materialized with VC attached
+        # but without :view filtering (see Model.call), so Sequel's
+        # attachment block doesn't choke on nils; the accessor wrapper
+        # filters at read time.
+        #
+        # Parents filtered to nil by the :view policy must be dropped
+        # before eager_load runs — its attachment code dereferences each
+        # record, which nil would break.
+        sig { params(all_records: T.untyped).returns(T.untyped) }
+        def post_load(all_records)
+          vc = opts[:viewer_context]
+          return super unless vc && opts[:eager]
+
+          all_records.compact!
+
+          old = Thread.current[EAGER_VC_KEY]
+          Thread.current[EAGER_VC_KEY] = vc
+          begin
+            super
+          ensure
+            Thread.current[EAGER_VC_KEY] = old
+          end
+        end
+
         # Create a new model instance with the viewer context attached
         sig { params(values: T::Hash[Symbol, T.untyped]).returns(T.attached_class) }
         def new(values = {})

data/lib/sequel/privacy/version.rb

@@ -3,6 +3,6 @@
 
 module Sequel
   module Privacy
-    VERSION = '0.4'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-privacy
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.1
 platform: ruby
 authors:
 - Austin Bales