oso-cloud 1.10.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dac67a8075972556f7ae65a0536ec256633cb2262e09bc846c0d9abd5d076b7
-  data.tar.gz: 5f99588ce46c6aa63eec48ba8c157f493a86f6341f7c3983ebaaef82712d424d
+  metadata.gz: f66bca1d07a3adbcedf23dd7fb2e8962788a209645c8ecf2e1147f35a00bbeab
+  data.tar.gz: ad34aa74fea952b3a7b1a8d5c1ac9f26f56a4e23ed14187675f854b22aa34d58
 SHA512:
-  metadata.gz: e208dbfa5c8d680d6887369deb5acaf157ab3d06ed408b9fa375823a00c39a9c7a2bf397d1fb14d0716d71b9518bd1f7124900d7dc0ae586a2b12f964ff23315
-  data.tar.gz: c4485eaf638f9e262c8b035c5b6606b0162fea19babe548f1ffd14cbee977e1ee0408f3679bc2f87eb984debeef86f176c4e0dcbed5c3164dea3acd7066fc515
+  metadata.gz: e4011b1d7408ced5b4797d44cf725f0d364a42444586d7bee9be77025dffd995b63066fdbdfc778635410b1368f92ff01e8cc6728cb7c696eff3fecf0e08d693
+  data.tar.gz: a2d207b0e58b5e1937e22b89c5ebea872f81539b018b6fcd9790c88468016c43ca8a21a40e71874c758783d9d1512285698b9591446b63364e79b9119e34dfcc

data/.gitignore

@@ -1,2 +1,3 @@
 .bundle
 vendor
+*.gem

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in oso-cloud.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"

data/Gemfile.lock

@@ -1,67 +1,121 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.10.0)
-      faraday (~> 2.5.2)
+    oso-cloud (1.11.2)
+      faraday (>= 2.14.1, < 3.0)
       faraday-net_http_persistent (~> 2.0)
-      faraday-retry (~> 2.0.0)
+      faraday-retry (~> 2.0)
 
 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)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       timeout (>= 0.4.0)
-    activesupport (7.1.3)
+    activesupport (7.2.3.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       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)
-    faraday-net_http (3.0.2)
-    faraday-net_http_persistent (2.1.0)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    drb (2.2.3)
+    faraday (2.14.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    faraday-net_http_persistent (2.3.1)
       faraday (~> 2.5)
-      net-http-persistent (~> 4.0)
-    faraday-retry (2.0.0)
+      net-http-persistent (>= 4.0.4, < 5)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
-    i18n (1.14.1)
+    i18n (1.14.8)
       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)
+    json (2.19.5)
+    logger (1.7.0)
+    minitest (5.27.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-http-persistent (4.0.8)
+      connection_pool (>= 2.2.4, < 4)
+    pg (1.6.3)
+    pg (1.6.3-aarch64-linux)
+    pg (1.6.3-aarch64-linux-musl)
+    pg (1.6.3-arm64-darwin)
+    pg (1.6.3-x86_64-darwin)
+    pg (1.6.3-x86_64-linux)
+    pg (1.6.3-x86_64-linux-musl)
+    rake (13.4.2)
+    securerandom (0.4.1)
+    timeout (0.6.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
 
 PLATFORMS
+  aarch64-linux
+  aarch64-linux-musl
+  arm64-darwin
   ruby
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-musl
 
 DEPENDENCIES
   activerecord (~> 7.0)
   minitest (~> 5.15)
   oso-cloud!
   pg (~> 1.0)
-  rake (~> 12.0)
+  rake (~> 13.0)
+
+CHECKSUMS
+  activemodel (7.2.3.1) sha256=39e1869b85e7a0b64a8ccddf19f3fb0c44261b329785384bb88f878eab51c0d0
+  activerecord (7.2.3.1) sha256=b89513e275da5b34183c5f2a497c154b02dcc7c811d399ab557e67e36170a05d
+  activesupport (7.2.3.1) sha256=11ebed516a43a0bb47346227a35ebae4d9427465a7c9eb197a03d5c8d283cb34
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
+  concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
+  connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  faraday (2.14.1) sha256=a43cceedc1e39d188f4d2cdd360a8aaa6a11da0c407052e426ba8d3fb42ef61c
+  faraday-net_http (3.4.2) sha256=f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c
+  faraday-net_http_persistent (2.3.1) sha256=23ffba37d6a27807a10f033d01918ec958aa73fa6ff0fccfbcd5ce2d2e68fca3
+  faraday-retry (2.4.0) sha256=7b79c48fb7e56526faf247b12d94a680071ff40c9fda7cf1ec1549439ad11ebe
+  i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
+  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
+  net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
+  net-http-persistent (4.0.8) sha256=ef3de8319d691537b329053fae3a33195f8b070bbbfae8bf1a58c796081960e6
+  oso-cloud (1.11.2)
+  pg (1.6.3) sha256=1388d0563e13d2758c1089e35e973a3249e955c659592d10e5b77c468f628a99
+  pg (1.6.3-aarch64-linux) sha256=0698ad563e02383c27510b76bf7d4cd2de19cd1d16a5013f375dd473e4be72ea
+  pg (1.6.3-aarch64-linux-musl) sha256=06a75f4ea04b05140146f2a10550b8e0d9f006a79cdaf8b5b130cde40e3ecc2c
+  pg (1.6.3-arm64-darwin) sha256=7240330b572e6355d7c75a7de535edb5dfcbd6295d9c7777df4d9dddfb8c0e5f
+  pg (1.6.3-x86_64-darwin) sha256=ee2e04a17c0627225054ffeb43e31a95be9d7e93abda2737ea3ce4a62f2729d6
+  pg (1.6.3-x86_64-linux) sha256=5d9e188c8f7a0295d162b7b88a768d8452a899977d44f3274d1946d67920ae8d
+  pg (1.6.3-x86_64-linux-musl) sha256=9c9c90d98c72f78eb04c0f55e9618fe55d1512128e411035fe229ff427864009
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
 
 BUNDLED WITH
-   2.5.6
+  4.0.3

data/lib/oso/api.rb

@@ -22,7 +22,10 @@ module OsoCloud
 
     # @!visibility private
     class ApiError < StandardError
-      def initialize(message:)
+      attr_reader :status_code, :retry_after
+      def initialize(message:, status_code: nil, retry_after: nil)
+        @status_code = status_code
+        @retry_after = retry_after
         super(message)
       end
     end
@@ -164,23 +167,26 @@ module OsoCloud
 
     # @!visibility private
     class ListResult
-      attr_reader :results
+      attr_reader :results, :next_page_token
 
-      def initialize(results:)
+      def initialize(results:, next_page_token: nil)
         @results = results
+        @next_page_token = next_page_token
       end
     end
 
     # @!visibility private
     class ListQuery
-      attr_reader :actor_type, :actor_id, :action, :resource_type, :context_facts
+      attr_reader :actor_type, :actor_id, :action, :resource_type, :context_facts, :page_size, :page_token
 
-      def initialize(actor_type:, actor_id:, action:, resource_type:, context_facts:)
+      def initialize(actor_type:, actor_id:, action:, resource_type:, context_facts:, page_size: nil, page_token: nil)
         @actor_type = actor_type
         @actor_id = actor_id
         @action = action
         @resource_type = resource_type
         @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
+        @page_size = page_size
+        @page_token = page_token
       end
     end
 
@@ -229,17 +235,6 @@ module OsoCloud
       end
     end
 
-    # @!visibility private
-    class StatsResult
-      attr_reader :num_roles, :num_relations, :num_facts
-
-      def initialize(num_roles:, num_relations:, num_facts:)
-        @num_roles = num_roles
-        @num_relations = num_relations
-        @num_facts = num_facts
-      end
-    end
-
     # @!visibility private
     class LocalAuthQuery
       attr_reader :query, :data_bindings
@@ -298,6 +293,9 @@ module OsoCloud
             interval_randomness: 0.005,
             max_interval: 1,
             backoff_factor: 2,
+            # 409 (Conflict) is intentionally not retried here. The server uses 409
+            # with Retry-After for paginated results not yet ready, which needs
+            # longer delays than HTTP-level backoff. Handled by per-page retry in list().
             retry_statuses: [429, 500, 502, 503, 504],
             # This is the default set of methods plus POST.
             # ref: https://github.com/lostisland/faraday-retry#specify-which-methods-will-be-retried
@@ -439,12 +437,6 @@ module OsoCloud
         QueryResult.new(**result)
       end
 
-      def get_stats
-        url = '/stats'
-        result = GET(url, {})
-        StatsResult.new(**result)
-      end
-
       def post_authorize_query(query, parity_handle = nil)
         url = '/authorize_query'
         data = LocalAuthQuery.new(query: query, data_bindings: @data_bindings)
@@ -598,10 +590,13 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
-        create_api_error(resp, error.message)
+        status_code = resp && resp[:status]
+        retry_after = resp && resp[:headers] && resp[:headers]['Retry-After']
+        retry_after = retry_after.to_f if retry_after
+        create_api_error(resp, error.message, status_code: status_code, retry_after: retry_after)
       end
 
-      def create_api_error(resp, message)
+      def create_api_error(resp, message, status_code: nil, retry_after: nil)
         formatted_request_id = if resp.nil? || resp[:headers].nil? || resp[:headers]['X-Request-ID'].nil?
                                  ''
                                else
@@ -613,7 +608,11 @@ module OsoCloud
               else
                 resp[:body][:message]
               end
-        raise ApiError.new(message: err + formatted_request_id)
+
+        sc = status_code || (resp && resp[:status])
+        ra = retry_after || (resp && resp[:headers] && resp[:headers]['Retry-After'] ? resp[:headers]['Retry-After'].to_f : nil)
+
+        raise ApiError.new(message: err + formatted_request_id, status_code: sc, retry_after: ra)
       end
 
       def post_expected_result(expected_result)

data/lib/oso/oso.rb

@@ -228,15 +228,50 @@ module OsoCloud
     # @return [Array<String>]
     # @see Oso for more information about facts
     def list(actor, action, resource_type, context_facts = [])
+      all_results = []
+      page_token = nil
+      loop do
+        page = list_paginated(actor, action, resource_type, 10000, page_token: page_token, context_facts: context_facts)
+        all_results.concat(page.results)
+        break if page.next_page_token.nil?
+        page_token = page.next_page_token
+      end
+      all_results
+    end
+
+    ##
+    # List authorized resources with pagination
+    #
+    # Fetches a page of resource ids on which an actor can perform a
+    # particular action. Returns a ListResult with `results` and `next_page_token`.
+    # Pass `next_page_token` to fetch subsequent pages.
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource_type [String]
+    # @param page_size [Integer]
+    # @param page_token [String, nil]
+    # @param context_facts [Array<fact>]
+    # @return [OsoCloud::Core::ListResult]
+    def list_paginated(actor, action, resource_type, page_size, page_token: nil, context_facts: [])
       actor_typed_id = actor.to_api_value
-      result = @api.post_list(OsoCloud::Core::ListQuery.new(
-                                actor_type: actor_typed_id.type,
-                                actor_id: actor_typed_id.id,
-                                action: action,
-                                resource_type: resource_type,
-                                context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-                              ))
-      result.results
+      10.times do |attempt|
+        begin
+          return @api.post_list(OsoCloud::Core::ListQuery.new(
+                                  actor_type: actor_typed_id.type,
+                                  actor_id: actor_typed_id.id,
+                                  action: action,
+                                  resource_type: resource_type,
+                                  context_facts: OsoCloud::Helpers.params_to_facts(context_facts),
+                                  page_size: page_size,
+                                  page_token: page_token
+                                ))
+        rescue OsoCloud::Core::ApiError => e
+          raise unless e.status_code == 409 && e.retry_after && attempt < 9
+          sleep(e.retry_after)
+        end
+      end
+      raise OsoCloud::Core::ApiError.new(message: 'Page not available after retries', status_code: 409)
     end
 
     ##

data/lib/oso/version.rb

@@ -2,5 +2,5 @@
 
 # !! IMPORTANT: Update the ruby docs to reflect the latest version !!
 module OsoCloud
-  VERSION = '1.10.0'
+  VERSION = '1.11.2'
 end

data/oso-cloud.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 2.5.2'
-  spec.add_dependency 'faraday-retry', '~> 2.0.0'
+  spec.add_dependency 'faraday', '>= 2.14.1', '< 3.0'
+  spec.add_dependency 'faraday-retry', '~> 2.0'
   spec.add_dependency 'faraday-net_http_persistent', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.15'
   spec.add_development_dependency 'pg', '~> 1.0'

metadata

@@ -1,43 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Oso Security, Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday-net_http_persistent
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +99,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description:
 email:
 - support@osohq.com
 executables: []
@@ -120,7 +124,6 @@ homepage: https://www.osohq.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Oso Cloud Ruby client
 test_files: []