oso-oso 0.12.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90c38cd26ea70588d5a3ce3c431e5eab66cd05b
-  data.tar.gz: 7d4275421ee83c3531062c194dee730f0e391a39
+  metadata.gz: ab6ed22597c52c4a77ff24aa6455492ba9cf7ed7
+  data.tar.gz: 3aaa0186592b86e63d9a2dcb2976f03154e0dcda
 SHA512:
-  metadata.gz: f612e88f6c77a68da43362baa0cd8df67dc12e32619fb3b36e6c069a427a42fdf89ae99485cedd38836038c0e1a4a84fbdc4f20aadab1510fec8bc171e10dcd2
-  data.tar.gz: a612da2ec758841cb4cdebd8abc391b6e8c0226dbd1d94a8a44f5b38b97a453340bb8d93c877e31839f23f315c4dcf2f2446b3f657ba6427bd1272724f62d4f0
+  metadata.gz: 9e7ce6bbf44da47f40c4cc5b53fab5d17870125dd5eed7443be858d9f8e0adb98fcce7799eb7fb404c867d3e10fdb5522b52d69ebc5ac6ffa280f11ad56a9623
+  data.tar.gz: d032a1742948a1f21f8fd19576aaf99479ef534a2247bac4e7a13e9f2910292a0b74eed56cef67deece467e2ae85ba6dc31df6b3a0d2761618703647895ae19a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-oso (0.12.1)
+    oso-oso (0.13.1)
       ffi (~> 1.0)
 
 GEM
@@ -14,7 +14,7 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.4.4)
     e2mmap (0.1.0)
-    ffi (1.15.0)
+    ffi (1.15.1)
     jaro_winkler (1.5.4)
     maruku (0.7.3)
     method_source (1.0.0)

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.1'
+  VERSION = '0.13.1'
 end

metadata

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