sqreen 1.15.6 → 1.15.7.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2954f152a5de09e1e76229fb51bdd4de43c3368a0c147e9d6df5e718b8ef7db2
-  data.tar.gz: 73675a112d80f502a9cbef995eacd48aa53aa7919064b49f0c56faaed2bfceef
+  metadata.gz: 4c12b98d858bc3b796b65d4cbda2f57306371958a84ef0cba7e418279527fdc2
+  data.tar.gz: 1d4e7f4994731ca11be8f5a9d14c0fc302072499490549676376ec9af811f024
 SHA512:
-  metadata.gz: 984f765a0d7995d49cda4515df0d6bed2c2390b38e713e927af566ccd71e0d5cb22c05b2a8c2cde7a225e8ec146d2e42ed80ceb7775b6e11939819422250918f
-  data.tar.gz: 0bf04fb5f2fe03e0b6614e0f2c06f9cacba288bd553c98fa12b7a5bf258eafb32bac45624cc60210a8e8d2d168a19eb6eb3d72c494d066a038eac4acd44fd355
+  metadata.gz: ae84a664f4676c90d088f36b57db1b5de7d324df684bb544391489ac037ed8788dcc76f64f3195b04e8b6d57da1bbb990895681eedebb10508d6c0a825c41533
+  data.tar.gz: dbbe4acbc9d91b8fd79f8d1cbc20223220abcd5cbcb36b505ccdebf8b664b3dc24ecd4b8c78b852c56bff64c197eeeb3aa7a21544abf0a0a2681fa8dfe00e0cf

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -1,4 +1,5 @@
 require 'digest'
+require 'json'
 
 module Sqreen
   module Js
@@ -63,6 +64,89 @@ module Sqreen
       end
     end
 
+    class JsonConversion
+      class << self
+        if defined?(::JSON::Ext::Generator::State)
+          def convert_arguments(_args)
+            args = purge_dangerous_objs(_args)
+            new_state.generate(args)
+          rescue ::JSON::GeneratorError, ::Encoding::UndefinedConversionError
+            fixed_args = fixup_bad_encoding(args)
+            new_state.generate(fixed_args)
+          end
+        else
+          def convert_arguments(_args)
+            args = purge_dangerous_objs(_args)
+            args.to_json(new_state)
+          rescue ::EncodingError
+            fixed_args = fixup_bad_encoding(args)
+            fixed_args.to_json(new_state)
+          end
+        end
+
+        private
+
+        def new_state
+          ::JSON::SAFE_STATE_PROTOTYPE.dup
+        end
+
+        def fixup_bad_encoding(arg, max_depth = 100)
+          return nil if max_depth <= 0
+
+          if arg.is_a?(::Array)
+            return arg.map { |it| fixup_bad_encoding(it, max_depth - 1) }
+          end
+
+          if arg.is_a?(::Hash)
+            return ::Hash[
+              arg.map do |k, v|
+                [fixup_bad_encoding(k, max_depth - 1),
+                 fixup_bad_encoding(v, max_depth - 1)]
+              end
+            ]
+          end
+
+          return arg unless arg.is_a?(::String)
+
+          unless arg.valid_encoding?
+            return arg.dup.force_encoding(::Encoding::ISO_8859_1)
+          end
+
+          # encoding is valid if it reaches this point
+          return arg if arg.encoding == ::Encoding::UTF_8
+
+          begin
+            arg.encode(::Encoding::UTF_8)
+          rescue ::Encoding::UndefinedConversionError
+            arg.dup.force_encoding(::Encoding::ISO_8859_1)
+          end
+        end
+
+        def purge_dangerous_objs(arg, max_depth = 100)
+          return nil if max_depth <= 0
+
+          if arg.is_a?(::Array)
+            arg.map { |it| purge_dangerous_objs(it, max_depth - 1) }
+          elsif arg.is_a?(::Hash)
+            Hash[
+              arg.map do |k, v|
+                [purge_dangerous_objs(k, max_depth - 1),
+                 purge_dangerous_objs(v, max_depth - 1)]
+              end
+            ]
+          elsif arg.is_a?(::String) || arg.nil? || arg == false ||
+            arg == true || arg.is_a?(::Fixnum) || arg.is_a?(::Bignum) ||
+            arg.is_a?(::Float)
+            arg
+          elsif arg.respond_to?(:to_json)
+            arg.to_s
+          else
+            arg
+          end
+        end
+      end
+    end
+
     class MiniRacerExecutableJs < ExecutableJs
       @@ctx_defined = false
 
@@ -93,7 +177,7 @@ module Sqreen
           ctx.add_code(@code_id, @code) unless ctx.has_code?(@code_id)
 
           begin
-            json_args = convert_arguments(arguments)
+            json_args = JsonConversion.convert_arguments(arguments)
             ctx.eval_unsafe(
               "sqreen_data['#{@code_id}']['#{cb_name}'].apply(this, #{json_args})", nil, budget)
           rescue @module::ScriptTerminatedError
@@ -109,45 +193,6 @@ module Sqreen
 
       private
 
-      def convert_arguments(args)
-        JSON.generate(args)
-      rescue JSON::GeneratorError, Encoding::UndefinedConversionError
-        fixed_args = fixup_bad_encoding(args)
-        JSON.generate(fixed_args)
-      end
-
-      def fixup_bad_encoding(arg, max_depth = 100)
-        return nil if max_depth <= 0
-
-        if arg.is_a?(Array)
-          return arg.map { |it| fixup_bad_encoding(it, max_depth - 1) }
-        end
-
-        if arg.is_a?(Hash)
-          return Hash[
-            arg.map do |k, v|
-              [fixup_bad_encoding(k, max_depth - 1),
-               fixup_bad_encoding(v, max_depth - 1)]
-            end
-          ]
-        end
-
-        return arg unless arg.is_a?(String)
-
-        unless arg.valid_encoding?
-          return arg.dup.force_encoding(Encoding::ISO_8859_1)
-        end
-
-        # encoding is valid if it reaches this point
-        return arg if arg.encoding == Encoding::UTF_8
-
-        begin
-          arg.encode(Encoding::UTF_8)
-        rescue Encoding::UndefinedConversionError
-          arg.dup.force_encoding(Encoding::ISO_8859_1)
-        end
-      end
-
       class << self
         def define_sqreen_context(modoole)
           # Context specialized for Sqreen usage

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.15.6'.freeze
+  VERSION = '1.15.7.beta1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.6
+  version: 1.15.7.beta1
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
@@ -134,9 +134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7