sequel-privacy 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54198780e9744c541e3915d3ac5722ccb16b119a77729b5013b854e698604511
-  data.tar.gz: 5219bec34c9542ce88f928bc39c1998586e6ed2c15637296dead03d958e12db1
+  metadata.gz: 7dd8660d0cc93e21c96080ba66f777e9b39f00ec7a5ca4f8fa211739a97dbe62
+  data.tar.gz: 85952e038e33a535adf8adaed566c08310e003f2540a406457029d678e889009
 SHA512:
-  metadata.gz: 8673ccf1e4e6cb592299c9a930ee7ff779e0343e66753a245f71f4aa26d21906c486dc1435d55af53c1c8b09c8166f24fec2e8036ce3f962598df4d8a29cadf9
-  data.tar.gz: 34bc11e989421e4cd7d5207fc531d7bcf17cf681c8b10c3104918c12d5d2a9eb8cdf68274dd64397c8b49ba51b6c59b3de4fd4ef73e8acbf06b1fdd671039cce
+  metadata.gz: 9276223bd19d31daaabbaa34076e15c6dce4ce2439daadc30bee5e021fc7a88571323ce213ab2840afbe533b53d73129625817177a44b7a178f1fc93b6f21c37
+  data.tar.gz: d6c2e72d8eea11c83b42be27a64dd5076e0e320a7d15efe7a6092ca543714203cf643ad14eee190b986eda570a331fca2b8d519126494ff35d5caef421f2fb9a

data/lib/sequel/plugins/privacy.rb

@@ -148,17 +148,24 @@ module Sequel
           :@allow_unsafe_access => nil
         )
 
-        # Allows the model to be accessed without a ViewerContext,
-        # useful when you're migrating an existing codebase or adopting gradually.
-        sig { void }
-        def allow_unsafe_access!
+        # Allows the model to be accessed without a ViewerContext, useful when
+        # you're migrating an existing codebase or adopting gradually.
+        # You can prevent this from applying to certain fields or associations by
+        # passing `except:`.
+        sig { params(except: T::Array[Symbol]).void }
+        def allow_unsafe_access!(except: [])
           @allow_unsafe_access = T.let(true, T.nilable(T::Boolean))
+          @unsafe_access_except = T.let(except.map(&:to_sym), T.nilable(T::Array[Symbol]))
           Sequel::Privacy.logger&.warn("#{self} allows unsafe access - migrate to use for_vc()")
         end
 
-        sig { returns(T::Boolean) }
-        def allow_unsafe_access?
-          @allow_unsafe_access == true
+        # Checks if the model or a field/association allows unsafe access.
+        sig { params(name: T.nilable(Symbol)).returns(T::Boolean) }
+        def allow_unsafe_access?(name = nil)
+          return false unless @allow_unsafe_access == true
+          return true if name.nil?
+
+          !(@unsafe_access_except || []).include?(name)
         end
 
         # Per-class thread-local key carrying the current VC during row
@@ -246,7 +253,7 @@ module Sequel
             vc = instance_variable_get(:@viewer_context)
 
             unless vc
-              return original_method.bind(self).() if T.unsafe(self.class).allow_unsafe_access?
+              return original_method.bind(self).() if T.unsafe(self.class).allow_unsafe_access?(field)
 
               Kernel.raise Sequel::Privacy::MissingViewerContext,
                            "#{self.class}##{field} requires a ViewerContext"
@@ -406,6 +413,12 @@ module Sequel
 
           define_method(name) do
             vc = instance_variable_get(:@viewer_context)
+
+            if vc.nil? && !T.unsafe(self.class).allow_unsafe_access?(name)
+              Kernel.raise Sequel::Privacy::MissingViewerContext,
+                           "#{self.class}##{name} requires a ViewerContext"
+            end
+
             assoc_class ||= assoc_reflection.associated_class
 
             obj = if vc && assoc_class.respond_to?(:privacy_vc_key)
@@ -444,6 +457,12 @@ module Sequel
 
           define_method(name) do
             vc = instance_variable_get(:@viewer_context)
+
+            if vc.nil? && !T.unsafe(self.class).allow_unsafe_access?(name)
+              Kernel.raise Sequel::Privacy::MissingViewerContext,
+                           "#{self.class}##{name} requires a ViewerContext"
+            end
+
             assoc_class ||= assoc_reflection.associated_class
 
             objs = if vc && assoc_class.respond_to?(:privacy_vc_key)
@@ -475,8 +494,8 @@ module Sequel
           end
         end
 
-        sig { params(_assoc_name: Symbol, singular_name: Symbol, policies: T::Array[T.untyped]).void }
-        def _wrap_association_add(_assoc_name, singular_name, policies)
+        sig { params(assoc_name: Symbol, singular_name: Symbol, policies: T::Array[T.untyped]).void }
+        def _wrap_association_add(assoc_name, singular_name, policies)
           method_name = :"add_#{singular_name}"
           original = instance_method(method_name)
 
@@ -484,7 +503,7 @@ module Sequel
             vc = instance_variable_get(:@viewer_context)
 
             unless vc
-              return original.bind(self).(obj) if T.unsafe(self.class).allow_unsafe_access?
+              return original.bind(self).(obj) if T.unsafe(self.class).allow_unsafe_access?(assoc_name)
 
               Kernel.raise Sequel::Privacy::MissingViewerContext,
                            "Cannot #{method_name} without a viewer context"
@@ -506,8 +525,8 @@ module Sequel
           end
         end
 
-        sig { params(_assoc_name: Symbol, singular_name: Symbol, policies: T::Array[T.untyped]).void }
-        def _wrap_association_remove(_assoc_name, singular_name, policies)
+        sig { params(assoc_name: Symbol, singular_name: Symbol, policies: T::Array[T.untyped]).void }
+        def _wrap_association_remove(assoc_name, singular_name, policies)
           method_name = :"remove_#{singular_name}"
           original = instance_method(method_name)
 
@@ -515,7 +534,7 @@ module Sequel
             vc = instance_variable_get(:@viewer_context)
 
             unless vc
-              return original.bind(self).(obj) if T.unsafe(self.class).allow_unsafe_access?
+              return original.bind(self).(obj) if T.unsafe(self.class).allow_unsafe_access?(assoc_name)
 
               Kernel.raise Sequel::Privacy::MissingViewerContext,
                            "Cannot #{method_name} without a viewer context"
@@ -537,8 +556,8 @@ module Sequel
           end
         end
 
-        sig { params(_assoc_name: Symbol, plural_name: Symbol, policies: T::Array[T.untyped]).void }
-        def _wrap_association_remove_all(_assoc_name, plural_name, policies)
+        sig { params(assoc_name: Symbol, plural_name: Symbol, policies: T::Array[T.untyped]).void }
+        def _wrap_association_remove_all(assoc_name, plural_name, policies)
           method_name = :"remove_all_#{plural_name}"
           original = instance_method(method_name)
 
@@ -546,7 +565,7 @@ module Sequel
             vc = instance_variable_get(:@viewer_context)
 
             unless vc
-              return original.bind(self).() if T.unsafe(self.class).allow_unsafe_access?
+              return original.bind(self).() if T.unsafe(self.class).allow_unsafe_access?(assoc_name)
 
               Kernel.raise Sequel::Privacy::MissingViewerContext,
                            "Cannot #{method_name} without a viewer context"

data/lib/sequel/privacy/version.rb

@@ -3,6 +3,6 @@
 
 module Sequel
   module Privacy
-    VERSION = '0.5.4'
+    VERSION = '0.5.5'
   end
 end

metadata

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