oso-oso 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dbfedef3bc14832b47137d1c17b247af0cf8bf3
-  data.tar.gz: 3bad36d04f6744069299b72855be913bc4bd9562
+  metadata.gz: c85bc41901e0ed5de32a11d192da0c26b79ac44c
+  data.tar.gz: 97f8718e22c0cee489fe7ed0db324d29fa1fb0a4
 SHA512:
-  metadata.gz: 13d18f6a934a266e82ec7e981187f7f8523c998b55158044bc09271c255fa56e40159246a55096447296971d88e9c5c68355684d37db99cea59b911810949cd9
-  data.tar.gz: 5cdae20c3b4c08752db940bcce466d65a787e9728ec935b837eb20eb98fffda4e88f812f63c1d75822f2bd25e6e741c1ae6df8620f2b587ca4b5db0f4901029b
+  metadata.gz: ac34d5b51b0f981965098265b2279b9b1f1b73488267e39fffe5eff3e74f484f8f46a9b03e86a6f6fd2326e23af7d93e5d139f57f807fa9e2560dd80392f6b04
+  data.tar.gz: d89cf2110f9e7e9e6a6a8070565a59bae49770545fe918fd3ebd7f3b408743446af77a152b4fa4e524aacd999f57d6b0403986adafc04bac6c06228e27d94d39

data/Gemfile.lock

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

data/lib/oso/polar/errors.rb

@@ -38,6 +38,7 @@ module Oso
     # TODO: I think this should probably have some arguments to say what the call is
     class InvalidCallError < PolarRuntimeError; end
     class InvalidConstructorError < PolarRuntimeError; end
+    class InvalidIteratorError < PolarRuntimeError; end
     class InvalidQueryTypeError < PolarRuntimeError; end
     class NullByteInPolarFileError < PolarRuntimeError; end
     class UnexpectedPolarTypeError < PolarRuntimeError; end

data/lib/oso/polar/polar.rb

@@ -38,6 +38,9 @@ module Oso
         @ffi_polar = FFI::Polar.create
         @host = Host.new(ffi_polar)
 
+        # Register global constants.
+        register_constant nil, name: 'nil'
+
         # Register built-in classes.
         register_class PolarBoolean, name: 'Boolean'
         register_class Integer

data/lib/oso/polar/query.rb

@@ -36,33 +36,6 @@ module Oso
         ffi_query.question_result(result, call_id: call_id)
       end
 
-      # Register a Ruby method call, wrapping the call result in a generator if
-      # it isn't already one.
-      #
-      # @param method [#to_sym]
-      # @param call_id [Integer]
-      # @param instance [Hash<String, Object>]
-      # @param args [Array<Hash>]
-      # @raise [InvalidCallError] if the method doesn't exist on the instance or
-      #   the args passed to the method are invalid.
-      def register_call(attribute, call_id:, instance:, args:, kwargs:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        return if calls.key?(call_id)
-
-        instance = host.to_ruby(instance)
-        args = args.map { |a| host.to_ruby(a) }
-        kwargs = Hash[kwargs.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
-        # The kwargs.empty? check is for Ruby < 2.7.
-        result = if kwargs.empty?
-                   instance.__send__(attribute, *args)
-                 else
-                   instance.__send__(attribute, *args, **kwargs)
-                 end
-        result = [result].to_enum unless result.is_a? Enumerator # Call must be a generator.
-        calls[call_id] = result.lazy
-      rescue ArgumentError, NoMethodError
-        raise InvalidCallError
-      end
-
       # Send next result of Ruby method call across FFI boundary.
       #
       # @param result [String]
@@ -97,13 +70,33 @@ module Oso
       # @param call_id [Integer]
       # @param instance [Hash<String, Object>]
       # @raise [Error] if the FFI call raises one.
-      def handle_call(attribute, call_id:, instance:, args:, kwargs:)
-        register_call(attribute, call_id: call_id, instance: instance, args: args, kwargs: kwargs)
-        result = JSON.dump(next_call_result(call_id))
+      def handle_call(attribute, call_id:, instance:, args:, kwargs:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        instance = host.to_ruby(instance)
+        args = args.map { |a| host.to_ruby(a) }
+        kwargs = Hash[kwargs.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
+        # The kwargs.empty? check is for Ruby < 2.7.
+        result = if kwargs.empty?
+                   instance.__send__(attribute, *args)
+                 else
+                   instance.__send__(attribute, *args, **kwargs)
+                 end
+        result = JSON.dump(host.to_polar(result))
         call_result(result, call_id: call_id)
-      rescue InvalidCallError => e
+      rescue ArgumentError, NoMethodError => e
         application_error(e.message)
         call_result(nil, call_id: call_id)
+      end
+
+      def handle_next_external(call_id, iterable)
+        unless calls.key? call_id
+          value = host.to_ruby iterable
+          raise InvalidIteratorError unless value.is_a? Enumerable
+
+          calls[call_id] = value.lazy
+        end
+
+        result = JSON.dump(next_call_result(call_id))
+        call_result(result, call_id: call_id)
       rescue StopIteration
         call_result(nil, call_id: call_id)
       end
@@ -173,6 +166,10 @@ module Oso
               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

data/lib/oso/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi