oso-cloud 1.1.1 → 1.3.0.dev.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9268075db2dd7d76b41905d870962afa84ec350ff9d0b335f4c473cef169868e
-  data.tar.gz: 7eacd7959071d7d2500ceeebf14d09846d5482cd5189139a92667155df796db9
+  metadata.gz: 93c11d4552281f1cbf95ec309bbbcd5e8d1289a7f0ee2000724f8d6eb4386617
+  data.tar.gz: 62fd22884497116c5db29b06a012b2b06ad82de78b96ed4823b0dbd22862ef37
 SHA512:
-  metadata.gz: 8fbea6dd735db2f768fd9d1c8a6af8b3219abc5e688b3d9bc2e557b512aa9303fa2e6afa792f701aa60bebc0443d6703fa6fcd3e48ce5a6fcfd3aad8a09e17c4
-  data.tar.gz: 84baac085041cf7d3e34c0b2261b3bf66a83245ea82d42b42ed3d47de39600d28939e31bf119d000477d5e67dce09a40a3a4a64bd60ecf0bf80ceb1d2f3d8c97
+  metadata.gz: 5139439b2e01ab083c0e73827ddb520a54dc0c2606d1ca20203bad6b56fc446f747a638cc603a83584da35ae65e500ecf4354fd53065c109fa044aef6ba2950f
+  data.tar.gz: eac48b47137286b49a1e27197cfb7867bbcd982b6fe6523f9e50ed9d8659934ceaea9b548f3d543510e9983872c9a9859400d417f149af8ef82f9319ea7b9f3e

data/Gemfile.lock

@@ -1,22 +1,46 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.1.1)
+    oso-cloud (1.2.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)
-    minitest (5.15.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'
@@ -203,7 +204,7 @@ module OsoCloud
 
     # @!visibility private
     class Api
-      def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil)
+      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
         @url = url
         @connection = Faraday.new(url: url) do |faraday|
           faraday.request :json
@@ -211,7 +212,7 @@ module OsoCloud
           # responses are processed in reverse order; this stack implies the
           # retries are attempted before an error is raised, and the json
           # parser is only applied if there are no errors
-          faraday.response :json, preserve_raw: true
+          faraday.response :json, parser_options: { symbolize_names: true }
           faraday.response :raise_error
           faraday.request :retry, {
             max: (options && options[:max_retries]) || 10,
@@ -246,122 +247,106 @@ 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
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
+        @last_offset = nil
       end
 
       def get_policy
-        params = {}
-        data = nil
         url = '/policy'
-        result = GET(url, params, data)
+        result = GET(url, nil)
         GetPolicyResult.new(**result)
       end
 
       def post_policy(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/policy'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_facts(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/facts'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         Fact.new(**result)
       end
 
       def delete_facts(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/facts'
-        result = DELETE(url, params, data)
+        result = DELETE(url, data)
         ApiResult.new(**result)
       end
 
       def post_bulk_load(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk_load'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_bulk_delete(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk_delete'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_bulk(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_authorize(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/authorize'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         AuthorizeResult.new(**result)
       end
 
       def post_authorize_resources(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/authorize_resources'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         AuthorizeResourcesResult.new(**result)
       end
 
       def post_list(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/list'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         ListResult.new(**result)
       end
 
       def post_actions(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/actions'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         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)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/query'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         QueryResult.new(**result)
       end
 
       def get_stats
-        params = {}
-        data = nil
         url = '/stats'
-        result = GET(url, params, data)
+        result = GET(url, {})
         StatsResult.new(**result)
       end
 
       def clear_data
-        params = {}
-        data = nil
         url = '/clear_data'
-        result = POST(url, params, data)
+        result = POST(url, nil, nil, true)
         ApiResult.new(**result)
       end
 
@@ -378,57 +363,86 @@ module OsoCloud
             params["args.#{i}.id"] = arg_query.id
           end
         end
-        data = nil
         url = '/facts'
-        result = GET(url, params, data)
+        result = GET(url, params)
         result.map { |v| Fact.new(**v) }
       end
 
       def headers
-        {
+        default_headers = {
           'Authorization' => format('Bearer %s', @api_key),
           'User-Agent' => @user_agent,
           Accept: 'application/json',
           'Content-Type': 'application/json',
-          'X-OsoApiVersion': '0'
+          'X-OsoApiVersion': '0',
         }
+        # set OsoOffset is last_offset is not nil
+        default_headers[:OsoOffset] = @last_offset unless @last_offset.nil?
+        default_headers
       end
 
-      def GET(path, params, _body)
-        response = @connection.get("api#{path}", params, headers)
-        handle_faraday_response response
+      def GET(path, params)
+        response = @connection.get("api#{path}")  do |req|
+          req.params = params unless params.nil?
+          req.headers = headers
+        end
+        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end
 
-      def POST(path, params, body)
-        response = @connection.post("api#{path}", body, headers) do |req|
-          req.params = params
+      def POST_BATCH(path, params, body_array, isMutation)
+        responses = []
+        @connection.in_parallel do
+          body_array.each do |body|
+          responses <<  @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
+        if isMutation
+          @last_offset = responses[-1].headers[:OsoOffset]
         end
-        handle_faraday_response response
+        responses
       rescue Faraday::Error => e
         handle_faraday_error e
       end
 
-      def DELETE(path, params, body)
-        response = @connection.delete("api#{path}", params, headers) do |req|
-          req.body = body
+      def POST(path, params, body, isMutation)
+        response = @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
-        handle_faraday_response response
+
+        if isMutation
+          @last_offset = response.headers[:OsoOffset]
+        end
+        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end
 
-      def handle_faraday_response(response)
-        # TODO: (@patrickod) refactor duplicative JSON parsing
-        JSON.parse(response.env[:raw_body], symbolize_names: true)
+      def DELETE(path, body)
+        response = @connection.delete("api#{path}") do |req|
+          req.headers = headers
+          req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
+        end
+        response.body
+      rescue Faraday::Error => e
+        handle_faraday_error e
       end
 
       def handle_faraday_error(error)
-        err = JSON.parse(error.response[:body], symbolize_names: true)
-        raise ApiError.new(**err)
-      rescue JSON::ParserError => e
-        raise ApiError.new(message: e.message)
+        resp = error.response
+        err = if resp.respond_to? :body
+            resp.body[:message]
+        else
+          error.message
+        end
+        raise ApiError.new(message: err)
       end
     end
   end

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.1.1'.freeze
+  VERSION = '1.3.0.dev.0'.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.1.1
+  version: 1.3.0.dev.0
 platform: ruby
 authors:
 - Oso Security, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-09-22 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: []