oso-cloud 1.3.0.dev.7 → 1.4.0.dev.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844583229037d7124d91b588abfbef062026c934d5cd1dcd0e4892a6d539b969
-  data.tar.gz: 889f910639d097b5c5e29fa64e36959a7c7aebbe7ffe48dfa080f8bbef119015
+  metadata.gz: bccf4bc9bf1950fba9c250563971c55f3f2be4299677adf9fb1eeadedc5b6e90
+  data.tar.gz: 56572baaeafefc78940e4c3c688e2d7d8dc71cf81ad91246ab89f237a9925f50
 SHA512:
-  metadata.gz: 77883cfc4f1584d65a31f1d620d239bcb98b70de099320c91590de55b4a39ee8b4aa7d5c80bbe7b94b8f6f16a02aeab6d54efb5aeecb1a289e7f93ac9048e1a8
-  data.tar.gz: ecd8b9f6377a4465b9cc39622d35da59a548229ab6df9edc212859e0f282041a812644c02f4cc9e25065e047e805d1fd594b69f5adeb9b40e4e0a4ddab5711a2
+  metadata.gz: 6c3d2b3bcfaff463c156bb2b50341a2350e81d39264d2bcac50fd917f849208f8ba5eb8a5b7335f18bad3604d6d57bb9b12305d10ca4126fa07ecf94e6741a7f
+  data.tar.gz: d0025b3196aadf1dc3d04ca8a7a8cbce61d31fd6ba18b2dd8ec9ab3b185542c668c985e7ab8545697a86ec9d32c22afacdad97c65dcfcc8b7c738f4b959ab3ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.6)
+    oso-cloud (1.4.0.dev.0)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)
@@ -29,7 +29,7 @@ GEM
     faraday-typhoeus (1.0.0)
       faraday (~> 2.0)
       typhoeus (~> 1.4)
-    ffi (1.16.2)
+    ffi (1.16.3)
     interception (0.5)
     method_source (1.0.0)
     minitest (5.18.0)

data/lib/oso/api.rb

@@ -273,11 +273,28 @@ module OsoCloud
         @url = url
         @connection = get_connection(options: options)
         @parallel_connection = get_connection(options: { parallel_adapter: true, max_concurrency: options[:max_concurrency] })
+
+        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)
@@ -400,11 +417,21 @@ module OsoCloud
       end
 
       def GET(path, params)
-        response = @connection.get("api#{path}")  do |req|
-          req.params = params unless params.nil?
-          req.headers = headers
+        begin
+          response = @connection.get("api#{path}")  do |req|
+            req.params = params unless params.nil?
+            req.headers = headers
+          end
+          response.body
+        rescue Faraday::ServerError, Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError => e
+          raise e unless fallback_eligible(path)
+
+          response = @fallback_connection.get("api#{path}") do |req|
+            req.params = params unless params.nil?
+            req.headers = headers
+          end
+          response.body
         end
-        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end
@@ -440,16 +467,28 @@ module OsoCloud
       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,8 +28,10 @@ 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, options: nil)
-      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, options: options || {})
+    def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil, fallback_url: nil)
+      options ||= {}
+      options[:fallback_url] = fallback_url unless fallback_url.nil?
+      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, options: options)
     end
 
     # Update the active policy

data/lib/oso/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev.7
+  version: 1.4.0.dev.0
 platform: ruby
 authors:
 - Oso Security, Inc.