shikashi 0.5.0 → 0.5.1

data/AUTHORS

@@ -3,5 +3,6 @@ shikashi de tario <rseminara@hotmail.com>
 
 Thanks to:
 	- Stellard for the contribution with the backstick and percent security bypass test ( test/security/test_system_calls.rb )
+	- Mark Pentland for the performance feedback
 
 

data/README

@@ -24,6 +24,16 @@ OR
 
 sudo gem install shikashi-X.X.X.gem.
 
+=== Troubleshooting
+
+ERROR:  While executing gem ... (Gem::DependencyError)
+    Unable to resolve dependencies: ruby2ruby requires sexp_processor (~> 3.0); ruby_parser requires sexp_processor (~> 3.0)
+
+The version of ruby2ruby and ruby_parser required depends on sexp_processor 3.X but for some reason this version of the gem
+is not automatically installed by gem, you can workaround this issue by installing it before using:
+
+gem install sexp_processor --version '~> 3.2'
+
 == Documentation
 
 Full API documentation can be found on:

data/Rakefile

@@ -1,12 +1,12 @@
 require 'rubygems'
 require 'rake'
+require 'rdoc/task'
+require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shikashi'
-  s.version = '0.5.0'
+  s.version = '0.5.1'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY
@@ -21,15 +21,6 @@ spec = Gem::Specification.new do |s|
     [ 'LICENSE', 'AUTHORS', 'CHANGELOG', 'README', 'Rakefile', 'TODO' ]
 end
 
-desc 'Run tests'
-task :default => [ :test ]
-
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = '{test}/**/test_*.rb'
-  t.verbose = true
-end
-
 desc 'Generate RDoc'
 Rake::RDocTask.new :rdoc do |rd|
   rd.rdoc_dir = 'doc'
@@ -38,7 +29,7 @@ Rake::RDocTask.new :rdoc do |rd|
 end
 
 desc 'Build Gem'
-Rake::GemPackageTask.new spec do |pkg|
+Gem::PackageTask.new spec do |pkg|
   pkg.need_tar = true
 end
 

data/lib/shikashi/sandbox.rb

@@ -281,7 +281,8 @@ module Shikashi
     # :base_namespace   Alternate module to contain all classes and constants defined by the unprivileged code
     #                   if not specified, by default, the base_namespace is created with the sandbox itself
     # :no_base_namespace  Specify to do not use a base_namespace (default false, not recommended to change)
-    #
+    # :encoding           Specify the encoding of source (example: "utf-8"), the encoding also can be
+    #                     specified on header like a ruby normal source file
     #
     #The arguments can be passed in any order and using hash notation or not, examples:
     #
@@ -343,6 +344,8 @@ module Shikashi
     # :base_namespace   Alternate module to contain all classes and constants defined by the unprivileged code
     #                   if not specified, by default, the base_namespace is created with the sandbox itself
     # :no_base_namespace  Specify to do not use a base_namespace (default false, not recommended to change)
+    # :encoding           Specify the encoding of source (example: "utf-8"), the encoding also can be
+    #                     specified on header like a ruby normal source file
     #
     # NOTE: arguments are the same as for Sandbox#run method, except for timeout and binding which can be
     # used when calling Shikashi::Sandbox::Packet#run
@@ -367,6 +370,7 @@ module Shikashi
       base_namespace = args.pick(:base_namespace) do nil end
       no_base_namespace = args.pick(:no_base_namespace) do @no_base_namespace end
       privileges_ = args.pick(Privileges,:privileges) do Privileges.new end
+      encoding = get_source_encoding(code) || args.pick(:encoding) do nil end
 
       hook_handler = nil
 
@@ -392,6 +396,10 @@ module Shikashi
         end
       end
 
+      if encoding
+        code = "# encoding: #{encoding}\n" + code
+      end
+
       evalhook_packet = @hook_handler.packet(code)
       Shikashi::Sandbox::Packet.new(evalhook_packet, privileges_, source)
     end
@@ -438,6 +446,7 @@ private
             source = args.pick(:source) do generate_id end
             base_namespace = args.pick(:base_namespace) do nil end
             no_base_namespace = args.pick(:no_base_namespace) do @no_base_namespace end
+            encoding = get_source_encoding(code) || args.pick(:encoding) do nil end
 
             hook_handler = nil
 
@@ -461,6 +470,10 @@ private
               end
             end
 
+            if encoding
+              # preend encoding
+              code = "# encoding: #{encoding}\n" + code
+            end
             hook_handler.evalhook(code, binding_, source)
           end
         rescue ::Timeout::Error
@@ -471,7 +484,15 @@ private
 
   end
 
-
+  def get_source_encoding(code)
+    first_line = code.to_s.lines.first.to_s
+    m = first_line.match(/encoding:(.*)$/)
+    if m
+      m[1]
+    else
+      nil
+    end
+  end
 end
 
 Shikashi.global_binding = binding()

metadata

@@ -1,82 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shikashi
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+version: !ruby/object:Gem::Version
+  version: 0.5.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dario Seminara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: evalhook
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &82511730 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: getsource
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *82511730
+- !ruby/object:Gem::Dependency
+  name: getsource
+  requirement: &82511270 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *82511270
 description: 
 email: robertodarioseminara@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
-- examples/benchmark/bm1.rb
-- examples/benchmark/bm2.rb
-- examples/basic/example1.rb
+files:
+- examples/basic/example2.rb
 - examples/basic/example3.rb
 - examples/basic/example5.rb
-- examples/basic/example4.rb
 - examples/basic/example8.rb
+- examples/basic/example4.rb
+- examples/basic/example1.rb
 - examples/basic/example6.rb
 - examples/basic/example.rb
 - examples/basic/example7.rb
-- examples/basic/example2.rb
+- examples/benchmark/bm2.rb
+- examples/benchmark/bm1.rb
 - examples/timeout/example1.rb
 - lib/shikashi.rb
 - lib/shikashi/pick_argument.rb
 - lib/shikashi/sandbox.rb
-- lib/shikashi/privileges/exceptions.rb
 - lib/shikashi/privileges/singleton_methods.rb
 - lib/shikashi/privileges/classes.rb
+- lib/shikashi/privileges/exceptions.rb
 - lib/shikashi/privileges.rb
 - LICENSE
 - AUTHORS
@@ -84,39 +65,30 @@ files:
 - README
 - Rakefile
 - TODO
-has_rdoc: true
 homepage: http://github.com/tario/shikashi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: shikashi is a ruby sandbox that permits the execution of "unprivileged" scripts by defining the permitted methods and constants the scripts can invoke with a white list logic
+summary: shikashi is a ruby sandbox that permits the execution of "unprivileged" scripts
+  by defining the permitted methods and constants the scripts can invoke with a white
+  list logic
 test_files: []
-