oso-oso 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09ee09c3366406a34633c870ddfe4ff271971529'
-  data.tar.gz: 764b0f3b440d567e19e45b71eff823b9000f35ef
+  metadata.gz: cf2c949f57a56b4849f24ed9593c78da58baa5a0
+  data.tar.gz: 31ac99dcfa3bba1bbbee68474a3fe3702fb7484d
 SHA512:
-  metadata.gz: fdae19c2528c46a85004241f0a8e59639123e416724239670cb9ff2ffc1172a87bb116b481d575e466c74f634213abdced263211f991721f1ff990e1e085d884
-  data.tar.gz: 309a196e2a0a3725e3bc1f45be8382ed85026dc7fc271662efaef8e207b0df2891f26da48ece702f1d9ce3e3731ea52c0a6cea30bf50af6acde54f08b44d79ec
+  metadata.gz: f1708d82f2531d50456ddcadb967bd024414700808e81b440836eb344f542cfda46af651382a6445a098dce9cf1e1c63c6802df73e3f97713a819d0b07ef5aae
+  data.tar.gz: d96b91d530555ed98d040c2d3c8e8e0adbdffa352cef6bd49c22e6f225c16bfa9f4c488d37468201e16e0950791581621737b94f1b9d5ffc8b8c4dffeaa4e656

data/Gemfile.lock

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

data/Makefile

@@ -3,17 +3,17 @@
 rust:
 	$(MAKE) -C ../.. rust-build
 
-install: rust
+install:
 	bundle install
 
-test: install
+test: install rust
 	bundle exec rake spec
 
-lint:
+lint: install
 	bundle exec rubocop
 
-typecheck:
+typecheck: install
 	bundle exec solargraph typecheck
 
-repl: install
+repl: install rust
 	bundle exec oso

data/lib/oso/polar/errors.rb

@@ -27,6 +27,7 @@ module Oso
     class UnsupportedError < PolarRuntimeError; end
     class PolarTypeError < PolarRuntimeError; end
     class StackOverflowError < PolarRuntimeError; end
+    class FileLoadingError < PolarRuntimeError; end
 
     # Errors originating from this side of the FFI boundary.
 
@@ -37,26 +38,12 @@ module Oso
     class InvalidCallError < PolarRuntimeError; end
     class InvalidConstructorError < PolarRuntimeError; end
     class InvalidQueryTypeError < PolarRuntimeError; end
-    class InlineQueryFailedError < PolarRuntimeError; end
     class NullByteInPolarFileError < PolarRuntimeError; end
     class UnexpectedPolarTypeError < PolarRuntimeError; end
-    class PolarFileAlreadyLoadedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      def initialize(file)
-        super("File #{file} has already been loaded.")
-      end
-    end
-    class PolarFileContentsChangedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      def initialize(file)
-        super("A file with the name #{file}, but different contents, has already been loaded.")
-      end
-    end
-    class PolarFileNameChangedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      # @param existing [String]
-      def initialize(file, existing)
-        super("A file with the same contents as #{file} named #{existing} has already been loaded.")
+    class InlineQueryFailedError < PolarRuntimeError; # rubocop:disable Style/Documentation
+      # @param source [String]
+      def initialize(source)
+        super("Inline query failed: #{source}")
       end
     end
     class PolarFileExtensionError < PolarRuntimeError # rubocop:disable Style/Documentation

data/lib/oso/polar/ffi.rb

@@ -46,6 +46,13 @@ module Oso
           Rust.free(ptr) unless ptr.null?
         end
       end
+
+      # Wrapper class for Source FFI pointer.
+      class Source < ::FFI::AutoPointer
+        def self.release(ptr)
+          Rust.free(ptr) unless ptr.null?
+        end
+      end
     end
     private_constant :FFI
   end
@@ -56,3 +63,4 @@ require 'oso/polar/ffi/query'
 require 'oso/polar/ffi/query_event'
 require 'oso/polar/ffi/error'
 require 'oso/polar/ffi/message'
+require 'oso/polar/ffi/source'

data/lib/oso/polar/ffi/error.rb

@@ -83,6 +83,8 @@ module Oso
             ::Oso::Polar::PolarTypeError.new(msg, details: details)
           when 'StackOverflow'
             ::Oso::Polar::StackOverflowError.new(msg, details: details)
+          when 'FileLoading'
+            ::Oso::Polar::FileLoadingError.new(msg, details: details)
           else
             ::Oso::Polar::PolarRuntimeError.new(msg, details: details)
           end

data/lib/oso/polar/ffi/message.rb

@@ -26,7 +26,7 @@ module Oso
           when 'Print'
             puts(msg)
           when 'Warning'
-            warn('[warning] %<msg>s')
+            warn(format('[warning] %<msg>s', msg: msg))
           end
         end
 

data/lib/oso/polar/ffi/polar.rb

@@ -10,7 +10,7 @@ module Oso
           ffi_lib FFI::LIB_PATH
 
           attach_function :new, :polar_new, [], FFI::Polar
-          attach_function :load_str, :polar_load, [FFI::Polar, :string, :string], :int32
+          attach_function :load, :polar_load, [FFI::Polar, :string, :string], :int32
           attach_function :next_inline_query, :polar_next_inline_query, [FFI::Polar, :uint32], FFI::Query
           attach_function :new_id, :polar_get_external_id, [FFI::Polar], :uint64
           attach_function :new_query_from_str, :polar_new_query, [FFI::Polar, :string, :uint32], FFI::Query
@@ -33,8 +33,8 @@ module Oso
         # @param src [String]
         # @param filename [String]
         # @raise [FFI::Error] if the FFI call returns an error.
-        def load_str(src, filename: nil)
-          loaded = Rust.load_str(self, src, filename)
+        def load(src, filename: nil)
+          loaded = Rust.load(self, src, filename)
           process_messages
           raise FFI::Error.get if loaded.zero?
         end

data/lib/oso/polar/ffi/query.rb

@@ -15,6 +15,7 @@ module Oso
           attach_function :application_error, :polar_application_error, [FFI::Query, :string], :int32
           attach_function :next_event, :polar_next_query_event, [FFI::Query], FFI::QueryEvent
           attach_function :next_message, :polar_next_query_message, [FFI::Query], FFI::Message
+          attach_function :source, :polar_query_source_info, [FFI::Query], FFI::Source
           attach_function :free, :query_free, [FFI::Query], :int32
         end
         private_constant :Rust
@@ -74,6 +75,15 @@ module Oso
             message.process
           end
         end
+
+        # @return [String]
+        # @raise [FFI::Error] if the FFI call returns an error.
+        def source
+          res = Rust.source(self)
+          raise FFI::Error.get if res.null?
+
+          res.to_s
+        end
       end
     end
   end

data/lib/oso/polar/ffi/source.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Oso
+  module Polar
+    module FFI
+      # Wrapper class for Source FFI pointer.
+      class Source < ::FFI::AutoPointer
+        # @return [String]
+        def to_s
+          @to_s ||= read_string.force_encoding('UTF-8')
+        end
+
+        Rust = Module.new do
+          extend ::FFI::Library
+          ffi_lib FFI::LIB_PATH
+
+          attach_function :free, :string_free, [Message], :int32
+        end
+
+        private_constant :Rust
+      end
+    end
+  end
+end

data/lib/oso/polar/polar.rb

@@ -42,8 +42,6 @@ module Oso
       def initialize
         @ffi_polar = FFI::Polar.create
         @host = Host.new(ffi_polar)
-        @loaded_names = {}
-        @loaded_contents = {}
 
         # Register built-in classes.
         register_class PolarBoolean, name: 'Boolean'
@@ -56,8 +54,6 @@ module Oso
 
       # Replace the current Polar instance but retain all registered classes and constructors.
       def clear
-        loaded_names.clear
-        loaded_contents.clear
         @ffi_polar = FFI::Polar.create
       end
 
@@ -66,23 +62,11 @@ module Oso
       # @param name [String]
       # @raise [PolarFileExtensionError] if provided filename has invalid extension.
       # @raise [PolarFileNotFoundError] if provided filename does not exist.
-      def load_file(name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def load_file(name)
         raise PolarFileExtensionError, name unless File.extname(name) == '.polar'
 
         file_data = File.open(name, &:read)
-        hash = Digest::MD5.hexdigest(file_data)
-
-        if loaded_names.key?(name)
-          raise PolarFileAlreadyLoadedError, name if loaded_names[name] == hash
-
-          raise PolarFileContentsChangedError, name
-        elsif loaded_contents.key?(hash)
-          raise PolarFileNameChangedError, name, loaded_contents[hash]
-        else
-          load_str(file_data, filename: name)
-          loaded_names[name] = hash
-          loaded_contents[hash] = name
-        end
+        load_str(file_data, filename: name)
       rescue Errno::ENOENT
         raise PolarFileNotFoundError, name
       end
@@ -97,7 +81,7 @@ module Oso
       def load_str(str, filename: nil) # rubocop:disable Metrics/MethodLength
         raise NullByteInPolarFileError if str.chomp("\0").include?("\0")
 
-        ffi_polar.load_str(str, filename: filename)
+        ffi_polar.load(str, filename: filename)
         loop do
           next_query = ffi_polar.next_inline_query
           break if next_query.nil?
@@ -105,7 +89,7 @@ module Oso
           begin
             Query.new(next_query, host: host).results.next
           rescue StopIteration
-            raise InlineQueryFailedError
+            raise InlineQueryFailedError, next_query.source
           end
         end
       end

data/lib/oso/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -141,6 +141,7 @@ files:
 - lib/oso/polar/ffi/polar.rb
 - lib/oso/polar/ffi/query.rb
 - lib/oso/polar/ffi/query_event.rb
+- lib/oso/polar/ffi/source.rb
 - lib/oso/polar/host.rb
 - lib/oso/polar/polar.rb
 - lib/oso/polar/predicate.rb