oso-cloud 1.5.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 543c9f70374f12ec330aa655fe0deea23947f36c617dcf25428f0ccc6945b206
-  data.tar.gz: 6796fbb6d239a400ea63ef2fe3e8758ada1a5bc13e6acfb2197324956d540125
+  metadata.gz: 747cf1fda61eae9e9a96076e782a503e3c440a3aa7049a6b8f74ce8d0c697273
+  data.tar.gz: 5a3fcbb8574c21416fa81dbf8e1054dfef59337da6c72ff686c06304b3c27711
 SHA512:
-  metadata.gz: 970a457c345a128ae7833bb78405d2f119df5901a59460d93ff29bb9a6f90cd90fca3415cd821097a1689edaffedcd13ea8c8d8ef11a51343e9e6a5fb8fa42dd
-  data.tar.gz: 23f7a1318a526e3cf9a2da95f932a68ca69ed655314df1b777b5e449ab0aa64b1b6aa8956196d63027789fa11119d98ca9c9912b8a3cd005eb0a0d861cd211be
+  metadata.gz: 1f0a4732c2f76b499f1dc962a0ee806fd6d2c17abdb734d2a1ce448c35eff4781dafce6aec90f39ede78e06fac44bcdbbb11033949867d562007c3f15a3fcee7
+  data.tar.gz: 41b95a2e852e431e1e1598277abeaad8b76bb174ea562d52a6e9c1d9c644f12a5799e1cde75063bf1d6757eb4cd62be0463c369192f8644353bb791a69391e43

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.5.2)
+    oso-cloud (1.7.0)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)

data/lib/oso/api.rb

@@ -260,6 +260,16 @@ module OsoCloud
       end
     end
 
+    # @!visibility private
+    class LocalActionsQuery
+      attr_reader :query, :data_bindings
+
+      def initialize(query:, data_bindings:)
+        @query = query
+        @data_bindings = data_bindings
+      end
+    end
+
     # @!visibility private
     class LocalQueryResult
       attr_reader :sql
@@ -436,6 +446,13 @@ module OsoCloud
         LocalQueryResult.new(**result)
       end
 
+      def post_actions_query(query)
+        url = '/actions_query'
+        data = LocalActionsQuery.new(query: query, data_bindings: @data_bindings)
+        result = POST(url, nil, data, false)
+        LocalQueryResult.new(**result)
+      end
+
       def clear_data
         url = '/clear_data'
         result = POST(url, nil, nil, true)

data/lib/oso/helpers.rb

@@ -4,8 +4,9 @@ module OsoCloud
     # @!visibility private
     def self.extract_value(x)
       return OsoCloud::Core::Value.new(type: 'String', id: x) if x.is_a? String
-
       return OsoCloud::Core::Value.new(type: nil, id: nil) if x.nil?
+      return OsoCloud::Core::Value.new(type: 'Boolean', id: x.to_s) if [true, false].include? x
+      return OsoCloud::Core::Value.new(type: 'Integer', id: x.to_s) if x.is_a? Integer
 
       type = (x.type.nil? ? nil : x.type.to_s)
       id = (x.id.nil? ? nil : x.id.to_s)

data/lib/oso/oso.rb

@@ -28,67 +28,82 @@ module OsoCloud
   # Any other elements in the array, which together represent the fact's arguments,
   # can be "OsoCloud::Value" objects or strings.
   class Oso
-    attr_reader :experimental
-
     def initialize(url: 'https://cloud.osohq.com', api_key: nil, fallback_url: nil, data_bindings: nil)
-      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, data_bindings: data_bindings, options: { :fallback_url => fallback_url })
-      @experimental = Experimental.new(@api)
+      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, data_bindings: data_bindings,
+                                     options: { fallback_url: fallback_url })
     end
 
-    class Experimental
-      def initialize(api)
-        @api = api
-      end
-
-      ##
-      # Check a permission depending on data both in Oso Cloud and stored in a local database
-      #
-      # Returns a SQL query to run against the local database
-      #
-      # @param actor [OsoCloud::Value]
-      # @param action [String]
-      # @param resource [OsoCloud::Value]
-      # @param column [String]
-      # @return [Array<String>]
-      def authorize_local(actor, action, resource)
-        actor_typed_id = actor.to_api_value
-        resource_typed_id = resource.to_api_value
-        result = @api.post_authorize_query(
-          OsoCloud::Core::AuthorizeQuery.new(
-            actor_type: actor_typed_id.type,
-            actor_id: actor_typed_id.id,
-            action: action,
-            resource_type: resource_typed_id.type,
-            resource_id: resource_typed_id.id,
-            context_facts: []
-          )
+    ##
+    # Check a permission depending on data both in Oso Cloud and stored in a local database
+    #
+    # Returns a SQL query to run against the local database
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource [OsoCloud::Value]
+    # @return [String]
+    def authorize_local(actor, action, resource)
+      actor_typed_id = actor.to_api_value
+      resource_typed_id = resource.to_api_value
+      result = @api.post_authorize_query(
+        OsoCloud::Core::AuthorizeQuery.new(
+          actor_type: actor_typed_id.type,
+          actor_id: actor_typed_id.id,
+          action: action,
+          resource_type: resource_typed_id.type,
+          resource_id: resource_typed_id.id,
+          context_facts: []
         )
-        result.sql
-      end
+      )
+      result.sql
+    end
+
+    ##
+    # List authorized resources depending on data both in Oso Cloud and stored in a local database
+    #
+    # Returns a SQL query to run against the local database
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource_type [String]
+    # @param column [String]
+    # @return [String]
+    def list_local(actor, action, resource_type, column)
+      actor_typed_id = actor.to_api_value
+      result = @api.post_list_query(
+        query: OsoCloud::Core::ListQuery.new(
+          actor_type: actor_typed_id.type,
+          actor_id: actor_typed_id.id,
+          action: action,
+          resource_type: resource_type,
+          context_facts: []
+        ),
+        column: column
+      )
+      result.sql
+    end
 
-      ##
-      # List authorized resources depending on data both in Oso Cloud and stored in a local database
-      #
-      # Returns a SQL query to run against the local database
-      #
-      # @param actor [OsoCloud::Value]
-      # @param action [String]
-      # @param resource_type [String]
-      # @return [Array<String>]
-      def list_local(actor, action, resource_type, column)
-        actor_typed_id = actor.to_api_value
-        result = @api.post_list_query(
-          query: OsoCloud::Core::ListQuery.new(
-            actor_type: actor_typed_id.type,
-            actor_id: actor_typed_id.id,
-            action: action,
-            resource_type: resource_type,
-            context_facts: []
-          ),
-          column: column
+    ##
+    # Fetches a query that can be run against your database to fetch the actions an actor can perform on a resource.
+    #
+    # Returns a SQL query to run against the local database
+    #
+    # @param actor [OsoCloud::Value]
+    # @param resource [OsoCloud::Value]
+    # @return [String]
+    def actions_local(actor, resource)
+      actor_typed_id = actor.to_api_value
+      resource_typed_id = resource.to_api_value
+      result = @api.post_actions_query(
+        OsoCloud::Core::ActionsQuery.new(
+          actor_type: actor_typed_id.type,
+          actor_id: actor_typed_id.id,
+          resource_type: resource_typed_id.type,
+          resource_id: resource_typed_id.id,
+          context_facts: []
         )
-        result.sql
-      end
+      )
+      result.sql
     end
 
     ##
@@ -335,6 +350,7 @@ module OsoCloud
                                                          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)))
       OsoCloud::Helpers.facts_to_params(result.results)
     end
+
     ##
     # List authorized actions for a batch of queries
     #
@@ -345,26 +361,26 @@ module OsoCloud
     # @return [Array<Array<String>>]
     # @see Oso for more information about facts
     def bulk_actions(actor, queries:)
-        actor_typed_id = actor.to_api_value
-        data = queries.map do |q|
-          context_facts = []
-          resource = nil
-          if (q.is_a?(Array))
-            resource = q[0]
-            context_facts = q[1]
-          else
-            resource = q
-          end
-          resource_typed_id = resource.to_api_value
-          OsoCloud::Core::ActionsQuery.new(
-              actor_type: actor_typed_id.type,
-              actor_id: actor_typed_id.id,
-              resource_type: resource_typed_id.type,
-              resource_id: resource_typed_id.id,
-              context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-            )
+      actor_typed_id = actor.to_api_value
+      data = queries.map do |q|
+        context_facts = []
+        resource = nil
+        if q.is_a?(Array)
+          resource = q[0]
+          context_facts = q[1]
+        else
+          resource = q
+        end
+        resource_typed_id = resource.to_api_value
+        OsoCloud::Core::ActionsQuery.new(
+          actor_type: actor_typed_id.type,
+          actor_id: actor_typed_id.id,
+          resource_type: resource_typed_id.type,
+          resource_id: resource_typed_id.id,
+          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
+        )
       end
-      @api.post_bulk_actions(data).map { |result| result.results}
+      @api.post_bulk_actions(data).map(&:results)
     end
   end
 end

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday