oso-oso 0.12.4 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5adc1e8d113b85c152b3168283dc65faeeeee66c
-  data.tar.gz: a24516694f568ef878f905e918f60ef8b62fcb59
+  metadata.gz: ffbf1065665531684ef3ae06cc1e1ccf71156926
+  data.tar.gz: 6d32e5b6fa9510b9cafe473dcc1c15b6565cf04a
 SHA512:
-  metadata.gz: 6dde362c0e9628faed46026a782aae82bb3d711640409a851823291b7c7ac0c517a107a7a668efed9acb1c370e9416116434564472090f8b99f706ca85483660
-  data.tar.gz: 409b7fb99a4ac4497abbd6da542da7067245e8c1218885f3683c03cbd9a0c507287bc0e03f4449f6dc5c1eff0ae6ef6122b51967bbca194d632f7ad6baa81a72
+  metadata.gz: 94046154aaab4d511f9f73fb8e9ccf6272afd0d7daa5a1fc675309ca54f8d859a04dd9287d71021e5bfc908a51cf85a11bb4de2ec00c6f0dd0509bc292841d8e
+  data.tar.gz: 06dca843a843d2686e8112cecd5a7ae85c24f4212323158786e6dc35d1d512144cd3e1e01b55e154cfcd880f9ba643bdd56b62f5013649b4eb1370fb84b5925c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-oso (0.12.4)
+    oso-oso (0.13.0)
       ffi (~> 1.0)
 
 GEM

data/lib/oso/oso.rb

@@ -17,10 +17,7 @@ module Oso
     # @param resource [Object] Object.
     # @return [Boolean] An access control decision.
     def allowed?(actor:, action:, resource:)
-      query_rule('allow', actor, action, resource).next
-      true
-    rescue StopIteration
-      false
+      !query_rule('allow', actor, action, resource).first.nil?
     end
   end
 end

data/lib/oso/polar/polar.rb

@@ -81,7 +81,7 @@ module Oso
       # @raise [InlineQueryFailedError] on the first failed inline query.
       # @raise [Error] if any of the FFI calls raise one.
       # @return [self] for chaining.
-      def load_str(str, filename: nil) # rubocop:disable Metrics/MethodLength
+      def load_str(str, filename: nil)
         raise NullByteInPolarFileError if str.chomp("\0").include?("\0")
 
         ffi_polar.load(str, filename: filename)
@@ -89,11 +89,7 @@ module Oso
           next_query = ffi_polar.next_inline_query
           break if next_query.nil?
 
-          begin
-            Query.new(next_query, host: host).results.next
-          rescue StopIteration
-            raise InlineQueryFailedError, next_query.source
-          end
+          raise InlineQueryFailedError, next_query.source if Query.new(next_query, host: host).first.nil?
         end
         self
       end
@@ -118,7 +114,7 @@ module Oso
         else
           raise InvalidQueryTypeError
         end
-        Query.new(ffi_query, host: new_host).results
+        Query.new(ffi_query, host: new_host)
       end
 
       # Query for a rule.
@@ -214,7 +210,7 @@ module Oso
         end
 
         begin
-          results = Query.new(ffi_query, host: host).results.to_a
+          results = Query.new(ffi_query, host: host).to_a
         rescue PolarRuntimeError => e
           print_error(e)
           return

data/lib/oso/polar/query.rb

@@ -6,8 +6,7 @@ module Oso
   module Polar
     # A single Polar query.
     class Query # rubocop:disable Metrics/ClassLength
-      # @return [Enumerator]
-      attr_reader :results
+      include Enumerable
 
       # @param ffi_query [FFI::Query]
       # @param host [Oso::Polar::Host]
@@ -15,7 +14,6 @@ module Oso
         @calls = {}
         @ffi_query = ffi_query
         @host = host
-        @results = start
       end
 
       private
@@ -120,61 +118,59 @@ module Oso
       # @yieldparam [Hash<String, Object>]
       # @return [Enumerator]
       # @raise [Error] if any of the FFI calls raise one.
-      def start # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        Enumerator.new do |yielder| # rubocop:disable Metrics/BlockLength
-          loop do # rubocop:disable Metrics/BlockLength
-            event = ffi_query.next_event
-            case event.kind
-            when 'Done'
-              break
-            when 'Result'
-              yielder << event.data['bindings'].transform_values { |v| host.to_ruby(v) }
-            when 'MakeExternal'
-              handle_make_external(event.data)
-            when 'ExternalCall'
-              call_id = event.data['call_id']
-              instance = event.data['instance']
-              attribute = event.data['attribute']
-              args = event.data['args'] || []
-              kwargs = event.data['kwargs'] || {}
-              handle_call(attribute, call_id: call_id, instance: instance, args: args, kwargs: kwargs)
-            when 'ExternalIsSubSpecializer'
-              instance_id = event.data['instance_id']
-              left_tag = event.data['left_class_tag']
-              right_tag = event.data['right_class_tag']
-              answer = host.subspecializer?(instance_id, left_tag: left_tag, right_tag: right_tag)
-              question_result(answer, call_id: event.data['call_id'])
-            when 'ExternalIsa'
-              instance = event.data['instance']
-              class_tag = event.data['class_tag']
-              answer = host.isa?(instance, class_tag: class_tag)
-              question_result(answer, call_id: event.data['call_id'])
-            when 'ExternalUnify'
-              left_instance_id = event.data['left_instance_id']
-              right_instance_id = event.data['right_instance_id']
-              answer = host.unify?(left_instance_id, right_instance_id)
-              question_result(answer, call_id: event.data['call_id'])
-            when 'Debug'
-              puts event.data['message'] if event.data['message']
-              print 'debug> '
-              begin
-                input = $stdin.readline.chomp.chomp(';')
-              rescue EOFError
-                next
-              end
-              command = JSON.dump(host.to_polar(input))
-              ffi_query.debug_command(command)
-            when 'ExternalOp'
-              raise UnimplementedOperationError, 'comparison operators'
-            when 'NextExternal'
-              call_id = event.data['call_id']
-              iterable = event.data['iterable']
-              handle_next_external(call_id, iterable)
-            else
-              raise "Unhandled event: #{JSON.dump(event.inspect)}"
+      def each # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        loop do # rubocop:disable Metrics/BlockLength
+          event = ffi_query.next_event
+          case event.kind
+          when 'Done'
+            break
+          when 'Result'
+            yield event.data['bindings'].transform_values { |v| host.to_ruby(v) }
+          when 'MakeExternal'
+            handle_make_external(event.data)
+          when 'ExternalCall'
+            call_id = event.data['call_id']
+            instance = event.data['instance']
+            attribute = event.data['attribute']
+            args = event.data['args'] || []
+            kwargs = event.data['kwargs'] || {}
+            handle_call(attribute, call_id: call_id, instance: instance, args: args, kwargs: kwargs)
+          when 'ExternalIsSubSpecializer'
+            instance_id = event.data['instance_id']
+            left_tag = event.data['left_class_tag']
+            right_tag = event.data['right_class_tag']
+            answer = host.subspecializer?(instance_id, left_tag: left_tag, right_tag: right_tag)
+            question_result(answer, call_id: event.data['call_id'])
+          when 'ExternalIsa'
+            instance = event.data['instance']
+            class_tag = event.data['class_tag']
+            answer = host.isa?(instance, class_tag: class_tag)
+            question_result(answer, call_id: event.data['call_id'])
+          when 'ExternalUnify'
+            left_instance_id = event.data['left_instance_id']
+            right_instance_id = event.data['right_instance_id']
+            answer = host.unify?(left_instance_id, right_instance_id)
+            question_result(answer, call_id: event.data['call_id'])
+          when 'Debug'
+            puts event.data['message'] if event.data['message']
+            print 'debug> '
+            begin
+              input = $stdin.readline.chomp.chomp(';')
+            rescue EOFError
+              next
             end
+            command = JSON.dump(host.to_polar(input))
+            ffi_query.debug_command(command)
+          when 'ExternalOp'
+            raise UnimplementedOperationError, 'comparison operators'
+          when 'NextExternal'
+            call_id = event.data['call_id']
+            iterable = event.data['iterable']
+            handle_next_external(call_id, iterable)
+          else
+            raise "Unhandled event: #{JSON.dump(event.inspect)}"
           end
-        end.lazy
+        end
       end
     end
   end

data/lib/oso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oso
-  VERSION = '0.12.4'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi