script_core 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19d1c83197db63d2ddbf7f70ed6f02fd5398d6f1247d84b0f21b7152bc69d5d
-  data.tar.gz: ce5ef153d196492d536a18bd04a39b0e7137fa2411e0c9dc55ad0a38a7a87e1f
+  metadata.gz: 5625cda9a35dc19c13582dc07e8bb2bec7845bc1c37c41df871ca51eafacbc95
+  data.tar.gz: c147044d8b43a6ca3c89d5a930cd8f7ee3855d914821d3ec9e6bd96bf39ecadf
 SHA512:
-  metadata.gz: 68cb35a85e86480436c3c8a2dfa8ae8ded6f8f31c93e4429d37dd63dea54503b1d902383743327a2d967f4735ad39613cbf3eb319d72c25ce7e2dd93649b819a
-  data.tar.gz: 804c806c5328bb8785e1011f28bf4655bd607c083646f11d8e78a66caad3abd45d92af74beb2ca752a3019f3e949e1412e6325bf023a7f9d5f67f340aa33e315
+  metadata.gz: fc78b84f71299af081e7fdc70090cb818ed54aa93053505b85605958affe6d76a43d613727c65ec9b8d1ca5832cb4f1afe2101677d920e048e4ca2e385a08676
+  data.tar.gz: 41f9a441d31541d8c25d42773ecc77b310a4ec7025dc8cf9690b1aad7b60e633d21edef707f43ce647e1948e317603e13766ea58be0a4fa6398abec6268dfb66

data/.rubocop.yml

@@ -4,6 +4,7 @@ require:
 
 AllCops:
   TargetRubyVersion: 2.5
+  DisabledByDefault: true
   Exclude:
     - bin/**/*
     - tests/**/*
@@ -15,35 +16,8 @@ AllCops:
     - spec/dummy/db/schema.rb
     - spec/dummy/bin/**/*
 
-Rails:
-  Enabled: true
-
-Layout/LineLength:
-  Max: 150
-
-Metrics/MethodLength:
-  Max: 100
-
-Metrics/BlockLength:
-  Max: 50
-
-Metrics/ClassLength:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Naming/AccessorMethodName:
-  Enabled: false
-
-Naming/MemoizedInstanceVariableName:
-  Enabled: false
+#Metrics/AbcSize:
+#  Max: 30
 
 # Prefer assert_not over assert !
 Rails/AssertNot:
@@ -55,25 +29,23 @@ Rails/RefuteMethods:
   Include:
     - 'test/**/*'
 
-# Prefer &&/|| over and/or.
-Style/AndOr:
+Rails/IndexBy:
   Enabled: true
 
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/HashEachMethods:
+Rails/IndexWith:
   Enabled: true
 
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
+# Prefer &&/|| over and/or.
+Style/AndOr:
   Enabled: true
 
 # Align `when` with `case`.
 Layout/CaseIndentation:
   Enabled: true
 
+Layout/ClosingHeredocIndentation:
+  Enabled: true
+
 # Align comments with method definitions.
 Layout/CommentIndentation:
   Enabled: true
@@ -91,6 +63,9 @@ Layout/EndAlignment:
 Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+
 Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 
@@ -106,13 +81,13 @@ Layout/EmptyLinesAroundMethodBody:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
-Layout/FirstArgumentIndentation:
-  Enabled: true
-
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
   Enabled: true
 
+Layout/FirstArgumentIndentation:
+  Enabled: true
+
 # Method definitions after `private` or `protected` isolated calls need one
 # extra level of indentation.
 Layout/IndentationConsistency:
@@ -141,10 +116,10 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundKeyword:
   Enabled: true
 
-Layout/SpaceAroundOperators:
+Layout/SpaceBeforeComma:
   Enabled: true
 
-Layout/SpaceBeforeComma:
+Layout/SpaceBeforeComment:
   Enabled: true
 
 Layout/SpaceBeforeFirstArg:
@@ -164,9 +139,6 @@ Style/FrozenStringLiteralComment:
 Style/RedundantFreeze:
   Enabled: true
 
-Style/AccessModifierDeclarations:
-  Enabled: false
-
 # Use `foo {}` not `foo{}`.
 Layout/SpaceBeforeBlockBraces:
   Enabled: true
@@ -192,7 +164,7 @@ Style/StringLiterals:
 Layout/IndentationStyle:
   Enabled: true
 
-# Blank lines should not have any spaces.
+# Empty lines should not have any spaces.
 Layout/TrailingEmptyLines:
   Enabled: true
 
@@ -200,9 +172,6 @@ Layout/TrailingEmptyLines:
 Layout/TrailingWhitespace:
   Enabled: true
 
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
 # Use quotes for string literals when they are enough.
 Style/RedundantPercentQ:
   Enabled: true
@@ -235,19 +204,16 @@ Lint/UselessAssignment:
 Lint/DeprecatedClassMethods:
   Enabled: true
 
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Lint/RaiseException:
+Lint/DeprecatedOpenSSLConstant:
   Enabled: true
 
-Lint/StructNewOverride:
+Style/ParenthesesAroundCondition:
   Enabled: true
 
-Style/ExponentialNotation:
+Style/HashTransformKeys:
   Enabled: true
 
-Style/ParenthesesAroundCondition:
+Style/HashTransformValues:
   Enabled: true
 
 Style/RedundantBegin:
@@ -268,6 +234,12 @@ Style/ColonMethodCall:
 Style/TrivialAccessors:
   Enabled: true
 
+Style/SlicingWithRange:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
 Performance/FlatMap:
   Enabled: true
 
@@ -288,3 +260,9 @@ Performance/ReverseEach:
 
 Performance/UnfreezeString:
   Enabled: true
+
+Performance/DeletePrefix:
+  Enabled: true
+
+Performance/DeleteSuffix:
+  Enabled: true

data/lib/script_core/engine.rb

@@ -21,15 +21,34 @@ def initialize(bin_path = ScriptCore::DEFAULT_BIN_PATH,
       @instructions = File.exist?(preload_instructions_path) ? File.binread(preload_instructions_path) : nil
     end
 
-    def eval(sources, input: nil, instruction_quota_start: nil, environment_variables: {})
+    def eval(
+      sources, input: {}, environment_variables: {},
+      instruction_quota: nil, instruction_quota_start: nil, memory_quota: nil, timeout: nil
+    )
       @executable.run(
-        input: input || {},
+        input: input,
         sources: sources,
         instructions: @instructions,
-        timeout: @timeout,
-        instruction_quota: @instruction_quota,
+        timeout: timeout || @timeout,
+        instruction_quota: instruction_quota || @instruction_quota,
         instruction_quota_start: instruction_quota_start || @instruction_quota_start,
-        memory_quota: @memory_quota,
+        memory_quota: memory_quota || @memory_quota,
+        environment_variables: environment_variables
+      )
+    end
+
+    def eval_mrb(
+      binary_mrb, input: {}, environment_variables: {},
+      instruction_quota: nil, instruction_quota_start: nil, memory_quota: nil, timeout: nil
+    )
+      @executable.run(
+        input: input,
+        sources: [],
+        instructions: binary_mrb,
+        timeout: timeout || @timeout,
+        instruction_quota: instruction_quota || @instruction_quota,
+        instruction_quota_start: instruction_quota_start || @instruction_quota_start,
+        memory_quota: memory_quota || @memory_quota,
         environment_variables: environment_variables
       )
     end

data/lib/script_core/executable.rb

@@ -12,9 +12,10 @@ def initialize(executable_path)
       @executable_path = executable_path.to_s
     end
 
-    def run(input: {}, sources:, instructions: nil,
-            timeout: 1, instruction_quota: 100_000, instruction_quota_start: 0, memory_quota: 8 << 20,
-            environment_variables: {})
+    def run(
+      input: {}, environment_variables: {}, sources:, instructions: nil,
+      timeout: 1, instruction_quota: 100_000, instruction_quota_start: 0, memory_quota: 8 << 20
+    )
       packer = ScriptCore::Protocol.packer_factory.packer
 
       payload = { input: input, sources: sources }

data/lib/script_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ScriptCore
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/tasks/script_core.rake

@@ -63,7 +63,9 @@
       end
 
       Dir.chdir(SCRIPT_CORE_ROOT.join("ext/enterprise_script_service")) do
-        sh("#{env_vars} #{Rails.root.join('bin', 'bundle')} exec rake")
+        bundle_stub_path = Rails.root.join("bin", "bundle")
+        bundle_cmd = File.exists?(bundle_stub_path) ? bundle_stub_path : "bundle"
+        sh("#{env_vars} #{bundle_cmd} exec rake")
       end
     end
 

data/script_core.gemspec

@@ -40,7 +40,6 @@
   spec.add_dependency("msgpack", "~> 1.0")
   spec.add_dependency("rake-compiler", "~> 1.0")
 
-  spec.add_development_dependency("bundler", "~> 1")
-  spec.add_development_dependency("rake", "~> 12.0")
+  spec.add_development_dependency("rake", "~> 12")
   spec.add_development_dependency("rspec", "~> 3.5")
 end

data/spec/dummy/app/lib/script_engine.rb

@@ -2,11 +2,43 @@
 
 module ScriptEngine
   class << self
+    ENGINE_PATH = Rails.root.join("mruby")
+
     def engine
-      @engine ||= ScriptCore::Engine.new Rails.root.join("mruby/bin")
+      @engine ||= ScriptCore::Engine.new ENGINE_PATH.join("bin")
     end
 
-    def run(string, payload: nil, instruction_quota_start: nil)
+    def precompile(code, with_lib: true)
+      wrapped_code =
+        if with_lib
+          "prepare; Output.value = class Object\n#{code}\nend; pack_output"
+        else
+          code
+        end
+
+      mrbc_executable = ENGINE_PATH.join("bin/mrbc").realpath
+      tmp_dir = Rails.root.join("tmp")
+      lib_files = with_lib ? Dir[ENGINE_PATH.join("lib/**/*.rb").to_s] : []
+
+      code_sha = Digest::SHA2.hexdigest(wrapped_code)
+      tmp_rb = tmp_dir.join("#{code_sha}.rb")
+      tmp_output = tmp_dir.join("#{code_sha}.mrb")
+      cmd = "#{mrbc_executable} --remove-lv -o #{tmp_output} #{lib_files.join(' ')} #{tmp_rb}"
+
+      File.write tmp_rb, wrapped_code
+      system(cmd, exception: true)
+
+      compiled = File.binread tmp_output
+
+      FileUtils.rm([tmp_rb, tmp_output])
+
+      compiled
+    end
+
+    def run(
+      string, payload: nil,
+      instruction_quota: nil, instruction_quota_start: nil, memory_quota: nil, timeout: nil
+    )
       sources = [
         %w[preparing prepare],
         ["user", string],
@@ -20,14 +52,41 @@ def run(string, payload: nil, instruction_quota_start: nil)
                     },
                     payload: payload
                   },
+                  environment_variables: { "TZ" => Time.zone.name },
+                  instruction_quota: instruction_quota,
                   instruction_quota_start: instruction_quota_start,
-                  environment_variables: { "TZ" => Time.zone.name }
+                  memory_quota: memory_quota,
+                  timeout: timeout
     end
 
-    def run_inline(string, payload: nil, instruction_quota_start: nil)
+    def run_inline(
+      string, payload: nil,
+      instruction_quota: nil, instruction_quota_start: nil, memory_quota: nil, timeout: nil
+    )
       run "Output.value = class Object\n#{string}\nend",
           payload: payload,
-          instruction_quota_start: instruction_quota_start
+          instruction_quota: instruction_quota,
+          instruction_quota_start: instruction_quota_start,
+          memory_quota: memory_quota,
+          timeout: timeout
+    end
+
+    def run_precompiled(
+      binary_mrb, payload: nil,
+      instruction_quota: nil, instruction_quota_start: nil, memory_quota: nil, timeout: nil
+    )
+      engine.eval_mrb binary_mrb,
+                      input: {
+                        configuration: {
+                          time_zone_offset: Time.zone.formatted_offset(false)
+                        },
+                        payload: payload
+                      },
+                      environment_variables: { "TZ" => Time.zone.name },
+                      instruction_quota: instruction_quota,
+                      instruction_quota_start: instruction_quota_start,
+                      memory_quota: memory_quota,
+                      timeout: timeout
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: script_core
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -2935,7 +2921,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A script engine powered by mruby sandboxie, It's a fork of Shopify's ESS.