oso-cloud 1.3.0.dev.5 → 1.3.0.dev.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51dc4187ef8812ede5669c392262eceb0cf09ed962831f0263c0eb931703ba21
-  data.tar.gz: 37f0a58b35e23da57458685ad36a9171e20c933fa90a80685226ef0d3a9b9cf6
+  metadata.gz: 844583229037d7124d91b588abfbef062026c934d5cd1dcd0e4892a6d539b969
+  data.tar.gz: 889f910639d097b5c5e29fa64e36959a7c7aebbe7ffe48dfa080f8bbef119015
 SHA512:
-  metadata.gz: 732ec34bb79ad29287de13c6e6d696e374b21478dd4943059d0b7e4adb41ff96d31908b339e69f346bc7ee64704bdaeca1973ffdb49ae088dd73991615da43b8
-  data.tar.gz: a397403259a48af1d934cefe3563c0a5816810b00a213e30f99aabaa41affacfa95e276c234da9201f36474ddca0305d83969816ca2ea5021eb862e2b717b579
+  metadata.gz: 77883cfc4f1584d65a31f1d620d239bcb98b70de099320c91590de55b4a39ee8b4aa7d5c80bbe7b94b8f6f16a02aeab6d54efb5aeecb1a289e7f93ac9048e1a8
+  data.tar.gz: ecd8b9f6377a4465b9cc39622d35da59a548229ab6df9edc212859e0f282041a812644c02f4cc9e25065e047e805d1fd594b69f5adeb9b40e4e0a4ddab5711a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.5)
+    oso-cloud (1.3.0.dev.6)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)

data/lib/oso/api.rb

@@ -203,6 +203,17 @@ module OsoCloud
       end
     end
 
+    class OsoAdapter < Faraday::Adapter::Typhoeus
+      @@max_concurrency = 20
+
+      def self.setup_parallel_manager(options = {})
+        options[:max_concurrency] = @@max_concurrency
+        ::Typhoeus::Hydra.new(options)
+      end
+    end
+
+    Faraday::Adapter.register_middleware(oso_http: OsoAdapter)
+
     # @!visibility private
     class Api
       def get_connection(options: nil)
@@ -214,6 +225,7 @@ module OsoCloud
           # parser is only applied if there are no errors
           faraday.response :json, parser_options: { symbolize_names: true }
           faraday.response :raise_error
+          # faraday.response :logger
           faraday.request :retry, {
             max: (options && options[:max_retries]) || 10,
             interval: 0.01,
@@ -247,17 +259,20 @@ module OsoCloud
               end
             end
           elsif options && options[:parallel_adapter]
-            faraday.adapter :typhoeus, forbid_reuse: false, maxredirs: 1, connecttimeout: 30
+            if options[:max_concurrency]
+              OsoAdapter.class_variable_set(:@@max_concurrency, options[:max_concurrency])
+            end
+            faraday.adapter :oso_http, forbid_reuse: false, maxredirs: 1, connecttimeout: 30
           else
             faraday.adapter :net_http_persistent, pool_size: 10, idle_timeout: 30
           end
         end
       end
 
-      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
+      def initialize(url: 'https://api.osohq.com', api_key: nil, options: {})
         @url = url
         @connection = get_connection(options: options)
-        @parallel_connection = get_connection(options: { parallel_adapter: true })
+        @parallel_connection = get_connection(options: { parallel_adapter: true, max_concurrency: options[:max_concurrency] })
         @api_key = api_key
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil

data/lib/oso/oso.rb

@@ -28,8 +28,8 @@ module OsoCloud
   # Any other elements in the array, which together represent the fact's arguments,
   # can be "OsoCloud::Value" objects or strings.
   class Oso
-    def initialize(url: 'https://cloud.osohq.com', api_key: nil)
-      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key)
+    def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil)
+      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, options: options || {})
     end
 
     # Update the active policy
@@ -270,21 +270,37 @@ module OsoCloud
       OsoCloud::Helpers.facts_to_params(result.results)
     end
 
-    def actions_batch(actor, resources, context_facts = [])
-      actor_typed_id = actor.to_api_value
-      data = resources.map do |r|
-        resource_typed_id = r.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)
-          )
+    ##
+    # List authorized actions for a batch of queries
+    #
+    # Fetches a list of actions which an actor can perform on a particular resource.
+    #
+    # @param actor [OsoCloud::Value]
+    # @param queries [Array<OsoCloud::Value>] | Array<[OsoCloud::Value, Array<fact>]>
+    # @return [Array<Array<String>>]
+    # @see Oso for more information about facts
+    def actions_batch(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)
+            )
       end
       @api.post_actions_batch(data).map { |result| result.results}
     end
   end
 
 end
-

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.3.0.dev.5'.freeze
+  VERSION = '1.3.0.dev.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev.5
+  version: 1.3.0.dev.7
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday