oso-cloud 1.4.0 → 1.4.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd2119868a2abbe622d6407dc78aa07ee13065145d32b566645f607de594259
-  data.tar.gz: 7d39612599e9ae9cab250d3a954c9b510a07c2f14f0975ed746198fbbd655489
+  metadata.gz: a4142cfc4502df10c914ba05acf90676bff499445afc0a4725ca0626e2bd86b2
+  data.tar.gz: 27a7afb62bb3e51e18b5578d396c1afcef411e01fb006d2c75ac9a67c6810d55
 SHA512:
-  metadata.gz: e568154a43523df7260a16123328fccf4176dedf982fcb5938b551973f26059a7df73781a0d5950fb699e4310ce3381941aa041833befacef9f8793a07034c7a
-  data.tar.gz: eeffb701a6bbc5cceaf0934f0f5660a2d232d2951eb4ae54bb36ee43c837fe59a68d719fad86dc63cb45e885366bd20bfdeab15ba7f538f3d30d2cb780f630bb
+  metadata.gz: 70f7c7849d93ad2f1b3d348202a87670fc6b2b728dca642fc01add67154978a7f2867305f9a855df8da034f360d95f97898f645d71cbad14d67cc6a26204ac5b
+  data.tar.gz: e2ee31a01a51e4eba0ae81f7a9f53fd0ae5b3749ef36214d85945d3f6d1ca6c0f181092c9026b0fc6c25f2abfa14605d8d622b15a54d24b8b20a909b0469eddb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.4.0)
+    oso-cloud (1.4.1.pre)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)
@@ -9,7 +9,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
+    drb (2.2.0)
+      ruby2_keywords
     faraday (2.5.2)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -19,19 +40,28 @@ GEM
       net-http-persistent (~> 4.0)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     minitest (5.18.0)
+    mutex_m (0.2.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
+    pg (1.5.4)
     rake (12.3.3)
     ruby2_keywords (0.0.5)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 7.0)
   minitest (~> 5.15)
   oso-cloud!
+  pg (~> 1.0)
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.3.13
+   2.5.6

data/lib/oso/api.rb

@@ -202,9 +202,38 @@ module OsoCloud
       end
     end
 
+    # @!visibility private
+    class LocalAuthQuery
+      attr_reader :query, :data_bindings
+
+      def initialize(query:, data_bindings:)
+        @query = query
+        @data_bindings = data_bindings
+      end
+    end
+
+    # @!visibility private
+    class LocalListQuery
+      attr_reader :query, :data_bindings
+
+      def initialize(query:, data_bindings:)
+        @query = query
+        @data_bindings = data_bindings
+      end
+    end
+
+    # @!visibility private
+    class LocalQueryResult
+      attr_reader :sql
+
+      def initialize(sql:)
+        @sql = sql
+      end
+    end
+
     # @!visibility private
     class Api
-      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
+      def initialize(url: 'https://api.osohq.com', api_key: nil, data_bindings: nil, options: nil)
         @url = url
         @connection = Faraday.new(url: url) do |faraday|
           faraday.request :json
@@ -212,8 +241,8 @@ 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, parser_options: { symbolize_names: true }
           faraday.response :raise_error
+          faraday.response :json, parser_options: { symbolize_names: true }
           faraday.request :retry, {
             max: (options && options[:max_retries]) || 10,
             interval: 0.01,
@@ -262,6 +291,7 @@ module OsoCloud
         @api_key = api_key
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
+        @data_bindings = IO.read(data_bindings) unless data_bindings.nil?
       end
 
       def fallback_eligible(path)
@@ -356,6 +386,20 @@ module OsoCloud
         StatsResult.new(**result)
       end
 
+      def post_authorize_query(query)
+        url = '/authorize_query'
+        data = LocalAuthQuery.new(query: query, data_bindings: @data_bindings)
+        result = POST(url, nil, data, false)
+        LocalQueryResult.new(**result)
+      end
+
+      def post_list_query(query)
+        url = '/list_query'
+        data = LocalListQuery.new(query: query, data_bindings: @data_bindings)
+        result = POST(url, nil, data, false)
+        LocalQueryResult.new(**result)
+      end
+
       def clear_data
         url = '/clear_data'
         result = POST(url, nil, nil, true)
@@ -452,10 +496,10 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
-        err = if resp.respond_to? :body
-            resp.body[:message]
-        else
+        err = if resp.nil? || resp[:body].nil? || resp[:body][:message].nil?
           error.message
+        else
+          resp[:body][:message]
         end
         raise ApiError.new(message: err)
       end

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, fallback_url: nil)
-      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, options: { :fallback_url => fallback_url })
+    def initialize(url: 'https://cloud.osohq.com', api_key: nil, fallback_url: nil, data_bindings: nil)
+      @api = OsoCloud::Core::Api.new(url: url, api_key: api_key, data_bindings: data_bindings, options: { :fallback_url => fallback_url })
     end
 
     ##
@@ -71,6 +71,50 @@ module OsoCloud
       result.allowed
     end
 
+    ##
+    # Check a permission depending on data both in Oso Cloud and stored in a local database
+    #
+    # Returns a SQL query to run against the local database
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource [OsoCloud::Value]
+    # @return [Array<String>]
+    def authorize_local(actor, action, resource)
+      actor_typed_id = actor.to_api_value
+      resource_typed_id = resource.to_api_value
+      result = @api.post_authorize_query(OsoCloud::Core::AuthorizeQuery.new(
+                                  actor_type: actor_typed_id.type,
+                                  actor_id: actor_typed_id.id,
+                                  action: action,
+                                  resource_type: resource_typed_id.type,
+                                  resource_id: resource_typed_id.id,
+                                  context_facts: []
+                                ))
+      result.sql
+    end
+
+    ##
+    # List authorized resources depending on data both in Oso Cloud and stored in a local database
+    #
+    # Returns a SQL query to run against the local database
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource_type [String]
+    # @return [Array<String>]
+    def list_local(actor, action, resource_type)
+      actor_typed_id = actor.to_api_value
+      result = @api.post_list_query(OsoCloud::Core::ListQuery.new(
+                      actor_type: actor_typed_id.type,
+                      actor_id: actor_typed_id.id,
+                      action: action,
+                      resource_type: resource_type,
+                      context_facts: []
+                    ))
+      result.sql
+    end
+
     ##
     # Check authorized resources
     #

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1.pre'.freeze
 end

data/oso-cloud.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-retry', '~> 2.0.0'
   spec.add_dependency 'faraday-net_http_persistent', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.15'
+  spec.add_development_dependency 'pg', '~> 1.0'
+  spec.add_development_dependency 'activerecord', '~> 7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1.pre
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.15'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: 
 email:
 - support@osohq.com
@@ -102,9 +130,9 @@ 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: