oso-cloud 1.6.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48ecc6151f39a3d6201a3cf2484cfcf38d434f7d611741bd08a6442d321e707
-  data.tar.gz: b7b901e42b41796396ef6e58c2f0772cf9f03c35f7349e411c66b32ed54bfcdc
+  metadata.gz: 78d81ade4fd246a2398c1a0224ecc8a6ff3852b968e03c0c79c1d28295358cfd
+  data.tar.gz: cdfa7bb5f957f1aaf7d801d8b5bca4e3e2dc4b1df8044d9cc30114aae5d012fe
 SHA512:
-  metadata.gz: 562381acc9b486e722b03096a18d588e3971f37f811f33c2286ea7a8655ed6fd462b6b07f7551a10f74c0fc85e2da67b245abfd04854de6aaa975acdea6497c9
-  data.tar.gz: c107f84d6290b88fd757221195909d5ba007c89919161fd52f0b169f6a5e51815b272a6b8752e5db078b63111ea6b6755f6c84f0f3fbb07f53ce31cc3785d4ae
+  metadata.gz: dc3fa7da1c706b47ffe89e6d9ed03ed9950cb8c756051ef2cc3e7ed81e2931f34dbdad8e6c8e217f9d061a4c9a2d5ad36784acdbba0772a3d16102bc43d8e09f
+  data.tar.gz: e48be352ec530bfb99afe81723abbfca673a9c63d295388d68f34bebf97b973a8c911d68133cc11668622cef26553cb92e5336346b1410d081bd1dac41c9c881

data/Gemfile.lock

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

data/lib/oso/api.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'faraday'
 require 'faraday/retry'
 require 'faraday/net_http_persistent'
+require 'securerandom'
 
 require 'oso/helpers'
 require 'oso/version'
@@ -260,6 +261,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
@@ -322,6 +333,7 @@ module OsoCloud
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
         @data_bindings = IO.read(data_bindings) unless data_bindings.nil?
+        @client_id = SecureRandom.uuid
       end
 
       def fallback_eligible(path)
@@ -436,6 +448,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)
@@ -467,6 +486,8 @@ module OsoCloud
           Accept: 'application/json',
           'Content-Type': 'application/json',
           'X-OsoApiVersion': '0',
+          'X-Request-ID' => SecureRandom.uuid,
+          'X-Oso-Instance-Id' => @client_id
         }
         # set OsoOffset is last_offset is not nil
         default_headers[:OsoOffset] = @last_offset unless @last_offset.nil?
@@ -532,12 +553,18 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
+        formatted_request_id = if resp.nil? || resp[:headers].nil? || resp[:headers]['X-Request-ID'].nil?
+          ""
+        else
+          " (Request ID: " + resp[:headers]['X-Request-ID'] + ")"
+        end
+
         err = if resp.nil? || resp[:body].nil? || resp[:body][:message].nil?
           error.message
         else
           resp[:body][:message]
         end
-        raise ApiError.new(message: err)
+        raise ApiError.new(message: err + formatted_request_id)
       end
     end
   end

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

@@ -41,7 +41,7 @@ module OsoCloud
     # @param actor [OsoCloud::Value]
     # @param action [String]
     # @param resource [OsoCloud::Value]
-    # @return [Array<String>]
+    # @return [String]
     def authorize_local(actor, action, resource)
       actor_typed_id = actor.to_api_value
       resource_typed_id = resource.to_api_value
@@ -67,7 +67,7 @@ module OsoCloud
     # @param action [String]
     # @param resource_type [String]
     # @param column [String]
-    # @return [Array<String>]
+    # @return [String]
     def list_local(actor, action, resource_type, column)
       actor_typed_id = actor.to_api_value
       result = @api.post_list_query(
@@ -83,6 +83,29 @@ module OsoCloud
       result.sql
     end
 
+    ##
+    # 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
+
     ##
     # Update the active policy
     #

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday