oso-cloud 1.2.0 → 1.3.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3991004d30f9fb3930a74494eb15f9658d469bf198440888ef4247b04e0e90fe
-  data.tar.gz: 19a847a4fa5ef0940606838879aa99cb5e1cb9f0b0b591fac9d30ee1b03adf90
+  metadata.gz: ea1469d68034a213af21a5a0300d2b1b1c7df2d00a3a2518f0a5e48fc0b5756b
+  data.tar.gz: 9491bc2e2bc622296b16a473c0996fdb89a67eb2242f046637ccba173a9e9fb4
 SHA512:
-  metadata.gz: a69a9097271580148040e9790d49b297d2ca4c90fb5c032d088f51b619e0e995b5348312e46e3748fc2d2d95a4c16cf9a98bba017d5e09292b64a65202b47b25
-  data.tar.gz: 3dfcf182d1283311f79c5ad806ff53e8e8a40c2f36b12cc54b459cfa3d23c215b92e5b59d24b9553df8e2c3a2b874a70e67f87e7ab2f9a647e492188dc4960fc
+  metadata.gz: 4baf074d8e2a237287699be969ad02959f5ba1c626cc582c0542931c198cc3c7728b5aa2ec5fa1d323a1368a027d7734fea5c07490247df81f16153c4192cdc4
+  data.tar.gz: '083f190963c58855ac7c5514a07f4547edb2d4b01cb01ac1ef2e11594375401d1b5481a23811134ac484242b8a257a1897e57c36da59241da4a2e95e6fc4d694'

data/Gemfile.lock

@@ -1,22 +1,46 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.2.0)
+    oso-cloud (1.3.0.dev.0)
       faraday (~> 2.5.2)
       faraday-retry (~> 2.0.0)
+      faraday-typhoeus (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.3)
+    debug_inspector (1.1.0)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     faraday (2.5.2)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
+    faraday-typhoeus (1.0.0)
+      faraday (~> 2.0)
+      typhoeus (~> 1.4)
+    ffi (1.15.5)
+    interception (0.5)
+    method_source (1.0.0)
     minitest (5.18.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-rescue (1.5.2)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.6.1)
+      binding_of_caller (~> 1.0)
+      pry (~> 0.13)
     rake (12.3.3)
     ruby2_keywords (0.0.5)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
 
 PLATFORMS
   ruby
@@ -24,6 +48,8 @@ PLATFORMS
 DEPENDENCIES
   minitest (~> 5.15)
   oso-cloud!
+  pry-rescue
+  pry-stack_explorer
   rake (~> 12.0)
 
 BUNDLED WITH

data/lib/oso/api.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'uri'
 require 'faraday'
 require 'faraday/retry'
+require 'faraday/typhoeus'
 
 require 'oso/helpers'
 require 'oso/version'
@@ -246,7 +247,12 @@ module OsoCloud
               end
             end
           else
-            faraday.adapter :net_http
+            # faraday.adapter :net_http
+            # faraday.adapter :net_http_persistent, pool_size: 5 do |http|
+            #   # yields Net::HTTP::Persistent
+            #   http.idle_timeout = 1000
+            # end
+             faraday.adapter :typhoeus, forbid_reuse: true, maxredirs: 1
           end
         end
         @api_key = api_key
@@ -320,6 +326,12 @@ module OsoCloud
         ActionsResult.new(**result)
       end
 
+      def post_actions_batch(batch_data)
+        url = '/actions'
+        results = POST_BATCH(url, nil, batch_data, false)
+        results.map { |result| ActionsResult.new(**result.body) }
+      end
+
       def post_query(data)
         url = '/query'
         result = POST(url, nil, data, false)
@@ -379,6 +391,34 @@ module OsoCloud
         handle_faraday_error e
       end
 
+      def POST_BATCH(path, params, body_array, isMutation)
+        @connection.in_parallel do
+          @responses = body_array.map do |body|
+            @connection.post("api#{path}") do |req|
+              req.params = params unless params.nil?
+              req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
+              req.headers = headers
+            end
+          end
+        end
+
+        connection_failed = @responses.find { |r| r.env.custom_members[:typhoeus_connection_failed] }
+        if connection_failed
+          raise Faraday::ConnectionFailed, connection_failed.env.custom_members[:typhoeus_return_message]
+        end
+
+        timed_out = @responses.find { |r| r.env.custom_members[:typhoeus_timed_out] }
+        if timed_out
+          raise Faraday::TimeoutError, timed_out.env.custom_members[:typhoeus_return_message]
+        end
+        if isMutation
+          @last_offset = @responses[-1].headers[:OsoOffset]
+        end
+        @responses
+      rescue Faraday::Error => e
+        handle_faraday_error e
+      end
+
       def POST(path, params, body, isMutation)
         response = @connection.post("api#{path}") do |req|
           req.params = params unless params.nil?

data/lib/oso/oso.rb

@@ -32,7 +32,6 @@ module OsoCloud
       @api = OsoCloud::Core::Api.new(url: url, api_key: api_key)
     end
 
-    ##
     # Update the active policy
     #
     # Updates the active policy in Oso Cloud, The string passed into
@@ -270,5 +269,22 @@ module OsoCloud
                                                          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)))
       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)
+          )
+      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.2.0'.freeze
+  VERSION = '1.3.0.dev.1'.freeze
 end

data/oso-cloud.gemspec

@@ -22,5 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday', '~> 2.5.2'
   spec.add_dependency 'faraday-retry', '~> 2.0.0'
+  # spec.add_dependency 'faraday-net_http_persistent', '~> 2.0'
+  spec.add_dependency 'faraday-typhoeus', '~> 1.0.0'
+  #
   spec.add_development_dependency 'minitest', '~> 5.15'
+  spec.add_development_dependency 'pry-rescue'
+  spec.add_development_dependency 'pry-stack_explorer'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.dev.1
 platform: ruby
 authors:
 - Oso Security, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: faraday-typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +66,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.15'
-description: 
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - support@osohq.com
 executables: []
@@ -77,7 +119,7 @@ homepage: https://www.osohq.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,12 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Oso Cloud Ruby client
 test_files: []