oso-cloud 1.3.0.dev.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b5b319f475adefc2e05c6bf2e9cf6f22b20164d38fb9c1cb59b1b7c6c291ee
-  data.tar.gz: d9d50d1adcc35c04309b65cde6d2d802eec75ccdd62d6b2d5e05907e7bb9806f
+  metadata.gz: 7449894386d2dd2bfd681e8586f59637b8cbc69eb9058da28e8a09ad5e97cabe
+  data.tar.gz: 1b2766a45d78838742694759ab8bc1698dc9a219b8e9ccb05283cc9677777fac
 SHA512:
-  metadata.gz: e8f770aaefda73dba90e6410be04dec0dc5ec1089535d7977f1aa5bd1d6310023954c6e2aae3e1d6c9e458ef2ceb5df58cf7dd16bc3c3183036da4965fcdaf02
-  data.tar.gz: 669d14ebf88e20a6f2a1bebdc609a7bda2e3eb6c20fc3d5eb7f4efa2b686ea611bc5a7ad28dcd4cd450a36226f1df5594daa09927a755d91ab97abe819363181
+  metadata.gz: 7e6e454bdd19f96680fba49fa045b781443be54e3060aeb7bf1c37f2938f711d73c430d270aa85e429f0ffe77353fadc412a65b35abceab5f2cb8b026a27c38f
+  data.tar.gz: 2d5bde575259087917b2575ae2bc85fa82d27821426799507a32021a4a61c0a4b69c055b4b6c4bede5ed7a2916557b05ba3de0e6a5af00c6ca7c68d22ec7e79b

data/Gemfile.lock

@@ -1,53 +1,22 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.5)
+    oso-cloud (1.3.0)
       faraday (~> 2.5.2)
-      faraday-net_http_persistent (~> 2.0)
       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)
-    connection_pool (2.4.1)
-    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-net_http_persistent (2.1.0)
-      faraday (~> 2.5)
-      net-http-persistent (~> 4.0)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
-    faraday-typhoeus (1.0.0)
-      faraday (~> 2.0)
-      typhoeus (~> 1.4)
-    ffi (1.16.2)
-    interception (0.5)
-    method_source (1.0.0)
     minitest (5.18.0)
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
-    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
@@ -55,8 +24,6 @@ PLATFORMS
 DEPENDENCIES
   minitest (~> 5.15)
   oso-cloud!
-  pry-rescue
-  pry-stack_explorer
   rake (~> 12.0)
 
 BUNDLED WITH

data/lib/oso/api.rb

@@ -2,8 +2,6 @@ require 'json'
 require 'uri'
 require 'faraday'
 require 'faraday/retry'
-require 'faraday/typhoeus'
-require 'faraday/net_http_persistent'
 
 require 'oso/helpers'
 require 'oso/version'
@@ -205,8 +203,9 @@ module OsoCloud
 
     # @!visibility private
     class Api
-      def get_connection(options: nil)
-        Faraday.new(url: @url) do |faraday|
+      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
+        @url = url
+        @connection = Faraday.new(url: url) do |faraday|
           faraday.request :json
 
           # responses are processed in reverse order; this stack implies the
@@ -231,7 +230,7 @@ module OsoCloud
                 /api/actions
                 /api/query
               ].include? env.url.path
-            },
+            }
           }
 
           if options && options[:test_adapter]
@@ -246,23 +245,32 @@ module OsoCloud
                 options[:test_adapter][:func].call
               end
             end
-          elsif options && options[:parallel_adapter]
-            faraday.adapter :typhoeus, forbid_reuse: false, maxredirs: 1, connecttimeout: 30
           else
-            faraday.adapter :net_http_persistent, pool_size: 10, idle_timeout: 30
+            faraday.adapter :net_http
           end
         end
-      end
 
-      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
-        @url = url
-        @connection = get_connection(options: options)
-        @parallel_connection = get_connection(options: { parallel_adapter: true })
+        if options && options[:fallback_url]
+          @fallback_connection = Faraday.new(url: options[:fallback_url]) do |faraday|
+            faraday.request :json
+            faraday.response :json, parser_options: { symbolize_names: true }
+            faraday.response :raise_error
+            faraday.adapter :net_http
+          end
+        end
         @api_key = api_key
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
       end
 
+      def fallback_eligible(path)
+        !@fallback_connection.nil? && ['/authorize',
+                                       '/authorize_resources',
+                                       '/list',
+                                       '/actions',
+                                       '/query'].include?(path)
+      end
+
       def get_policy
         url = '/policy'
         result = GET(url, nil)
@@ -329,12 +337,6 @@ 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)
@@ -385,56 +387,48 @@ module OsoCloud
       end
 
       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_BATCH(path, params, body_array, isMutation)
-        connection = @parallel_connection
-        responses = []
-        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
+        begin
+          response = @connection.get("api#{path}")  do |req|
+            req.params = params unless params.nil?
+            req.headers = headers
           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
+          response.body
+        rescue Faraday::ServerError, Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError => e
+          raise e unless fallback_eligible(path)
 
-        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]
+          response = @fallback_connection.get("api#{path}") do |req|
+            req.params = params unless params.nil?
+            req.headers = headers
+          end
+          response.body
         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?
-          req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
-          req.headers = headers
-        end
+        begin
+          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
 
-        if isMutation
-          @last_offset = response.headers[:OsoOffset]
+          if isMutation
+            @last_offset = response.headers[:OsoOffset]
+          end
+          response.body
+        # only attempt fallback on 5xx, and connection failure conditions
+        rescue Faraday::ServerError, Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError => e
+          raise e unless fallback_eligible(path)
+
+          response = @fallback_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
+          response.body
         end
-        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end

data/lib/oso/oso.rb

@@ -28,10 +28,11 @@ 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, fallback_url: nil)
+      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, options: { :fallback_url => fallback_url })
     end
 
+    ##
     # Update the active policy
     #
     # Updates the active policy in Oso Cloud, The string passed into
@@ -269,38 +270,5 @@ 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
-    #
-    # 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.6'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/oso-cloud.gemspec

@@ -22,10 +22,5 @@ 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.3.0.dev.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Oso Security, Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: faraday-net_http_persistent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.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
@@ -80,35 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.15'
-- !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:
+description: 
 email:
 - support@osohq.com
 executables: []
@@ -133,7 +77,7 @@ homepage: https://www.osohq.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -144,12 +88,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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Oso Cloud Ruby client
 test_files: []