safemode 1.3.1 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a2ae334b96360e57f06053963af98bb3565e1d1
-  data.tar.gz: 4ad12d5c492b17595d6dda6aa8caec4ca154f03f
+SHA256:
+  metadata.gz: 9c122fc8f941080a885c335b7356d2e1af7545cec8633ca23571273f069f36e0
+  data.tar.gz: f5555df33c321fbc85bff612c80568c4667e1c17d77aaa74da3311ea659b2574
 SHA512:
-  metadata.gz: '0942dbc88ee4246dc414c598555822b58b5ba18f6b7471edcb3e583ed1e42c442b3b0724a927d4150ea705b9eb95f7f33cd947074f83f2326dfecaabc65d880a'
-  data.tar.gz: 9338694a4120ca2190e4dcf6151d2cf8822b155fc887396ae63e0671734075ba325cad4c5a38a44cc7b98540fa0b37ea28b611aed76be50e6d216c5a4a4f7cec
+  metadata.gz: 253de818e490f1e03030dfb9600960322ee6ea3c2d1d7ae571ccbc9ad44c99cb58af2d23227d6244a4de4006e0d56716b6b12c5fe83fc2fb8c874bbae5f1aca1
+  data.tar.gz: 2b468cf47ef692c3623daba9b1ea100ab4e74243d701aad3c86e46a04cc09d91470a9a57c5ecd117f26142b223ec33f1169b09bc90756d5dc96104d9b00c341e

data/.travis.yml

@@ -0,0 +1,16 @@
+---
+os: linux
+dist: xenial
+language: ruby
+rvm:
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9
+matrix:
+  allow_failures:
+    - rvm: jruby-9
+before_install: gem install bundler --version 1.17.3

data/Gemfile

@@ -1,18 +1,17 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
 
-gem 'sexp_processor', ">= 4.3.0"
-gem 'ruby2ruby', ">= 2.0.6"
-gem "ruby_parser", ">= 3.2.0"
+source 'http://rubygems.org'
+
+gem 'ruby2ruby', '>= 2.4.0'
+gem 'ruby_parser', '>= 3.10.1'
+gem 'sexp_processor', '>= 4.10.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", ">= 0"
-  gem "rcov", :platforms => :ruby_18
-  gem "simplecov", :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "test-unit", :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "rake"
+  gem 'jeweler'
+  gem 'rake'
+  gem 'rdoc', '~> 3.12'
+  gem 'simplecov'
+  gem 'test-unit'
 end

data/README.markdown

@@ -3,6 +3,8 @@
 A library for safe evaluation of Ruby code based on RubyParser and
 Ruby2Ruby. Provides Rails ActionView template handlers for ERB and Haml.
 
+[![Build Status](https://travis-ci.org/svenfuchs/safemode.svg?branch=master)](https://travis-ci.org/svenfuchs/safemode)
+
 ### Word of warning
 
 This library is still highly experimental. Only use it at your own risk for
@@ -52,9 +54,9 @@ class is only accessible when returned by a method or passed into a template.
 For more details about the concepts behind Safemode please refer to the 
 following blog posts until a more comprehensive writeup is available:
 
-* Initial reasoning: [http://www.artweb-design.de/2008/2/5/sexy-theme-templating-with-haml-safemode-finally](http://www.artweb-design.de/2008/2/5/sexy-theme-templating-with-haml-safemode-finally)
-* Refined concept: [http://www.artweb-design.de/2008/2/17/sending-ruby-to-the-jail-an-attemp-on-a-haml-safemode](http://www.artweb-design.de/2008/2/17/sending-ruby-to-the-jail-an-attemp-on-a-haml-safemode)
-* ActionView ERB handler: [http://www.artweb-design.de/2008/4/22/an-erb-safemode-handler-for-actionview](http://www.artweb-design.de/2008/4/22/an-erb-safemode-handler-for-actionview)
+* Initial reasoning: http://www.artweb-design.de/2008/2/5/sexy-theme-templating-with-haml-safemode-finally
+* Refined concept: http://www.artweb-design.de/2008/2/17/sending-ruby-to-the-jail-an-attemp-on-a-haml-safemode
+* ActionView ERB handler: http://www.artweb-design.de/2008/4/22/an-erb-safemode-handler-for-actionview
 
 ### Dependencies
 
@@ -64,14 +66,14 @@ Requires the gems:
 * Ruby2Ruby
 
 As of writing RubyParser alters StringIO and thus breaks usage with Rails.
-See [http://www.zenspider.com/pipermail/parsetree/2008-April/000026.html](http://www.zenspider.com/pipermail/parsetree/2008-April/000026.html)
+See http://www.zenspider.com/pipermail/parsetree/2008-April/000026.html
 
 A patch is included that fixes this issue and can be applied to RubyParser.
 See lib/ruby\_parser\_string\_io\_patch.diff
 
 ### Credits
 
-* Sven Fuchs - Maintainer
+* Sven Fuchs - Initial Maintainer
 * Peter Cooper
 * Matthias Viehweger
 * Ohad Levy

data/Rakefile

@@ -47,20 +47,10 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-if RUBY_VERSION >= "1.9"
-  desc "Generate coverage report for tests"
-  task :coverage do |cov|
-    ENV['COVERAGE'] = 'true'
-    Rake::Task[:test].execute
-  end
-else
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-    test.rcov_opts << '--exclude "gems/*"'
-  end
+desc "Generate coverage report for tests"
+task :coverage do |cov|
+  ENV['COVERAGE'] = 'true'
+  Rake::Task[:test].execute
 end
 
 task :default => :test

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.6

data/lib/action_view/template_handlers/safe_erb.rb

@@ -20,9 +20,9 @@ module ActionView
 
         # code = ::ERB.new(src, nil, @view.erb_trim_mode).src
         code = ::ERB.new("<% __in_erb_template=true %>#{src}", nil, erb_trim_mode, '@output_buffer').src
-        # Ruby 1.9 prepends an encoding to the source. However this is
+        # Ruby 1.9+ prepends an encoding to the source. However this is
         # useless because you can only set an encoding on the first line
-        RUBY_VERSION >= '1.9' ? src.sub(/\A#coding:.*\n/, '') : src
+        src.sub(/\A#coding:.*\n/, '') : src
 
         code.gsub!('\\','\\\\\\') # backslashes would disappear in compile_template/modul_eval, so we escape them
 

data/lib/safemode/blankslate.rb

@@ -1,7 +1,13 @@
 module Safemode
   class Blankslate
     @@allow_instance_methods = ['class', 'methods', 'respond_to?', 'respond_to_missing?', 'to_s', 'instance_variable_get']
-    @@allow_class_methods    = ['methods', 'new', 'name', '<', 'ancestors', '=='] # < needed in Rails Object#subclasses_of
+    @@allow_class_methods    = ['methods', 'new', 'name', '<', 'ancestors', '==']  # < needed in Rails Object#subclasses_of
+    if defined?(JRUBY_VERSION)
+      # JRuby seems to silently fail to remove method_missing
+      # (also see https://github.com/jruby/jruby/blob/9.1.7.0/core/src/main/java/org/jruby/RubyModule.java#L1109)
+      @@allow_class_methods << 'method_missing'
+      (@@allow_class_methods << ['singleton_method_undefined', 'singleton_method_added']).flatten! # needed for JRuby support
+    end
 
     silently { undef_methods(*instance_methods.map(&:to_s) - @@allow_instance_methods) }
     class << self

data/lib/safemode/core_jails.rb

@@ -41,7 +41,7 @@ module Safemode
   # these methods are allowed in all classes if they are present
   @@default_methods = %w( % & * ** + +@ - -@ / < << <= <=> ! != == === > >= >> ^ | ~
                           eql? equal? new methods is_a? kind_of? nil?
-                          [] []= to_a to_jail to_s inspect to_param not)
+                          [] []= to_a to_jail to_s inspect to_param not freeze)
 
   # whitelisted methods for core classes ... kind of arbitrary selection
   @@methods_whitelist = {
@@ -51,8 +51,8 @@ module Safemode
                     indexes indices inject insert join last length map map!
                     nitems pop push present? rassoc reject reject! reverse
                     reverse! reverse_each rindex select shift size slice
-                    slice! sort sort! transpose uniq uniq! unshift values_at
-                    zip),
+                    slice! sort sort! transpose to_sentence uniq uniq! unshift
+                    values_at zip),
 
     'Bignum'     => %w(abs blank? ceil chr coerce div divmod downto floor hash
                     integer? modulo next nonzero? present? quo remainder round

data/lib/safemode/jail.rb

@@ -1,17 +1,17 @@
-module Safemode    
-  class Jail < Blankslate 
+module Safemode
+  class Jail < Blankslate
     def initialize(source = nil)
       @source = source
     end
-  
+
     def to_jail
       self
     end
-  
+
     def to_s
       @source.to_s
     end
-  
+
     def method_missing(method, *args, &block)
       if @source.is_a?(Class)
         unless self.class.allowed_class_method?(method)
@@ -22,7 +22,7 @@ module Safemode
           raise Safemode::NoMethodError.new("##{method}", self.class.name, @source.class.name)
         end
       end
-      
+
       # As every call to an object in the eval'ed string will be jailed by the
       # parser we don't need to "proactively" jail arrays and hashes. Likewise we
       # don't need to jail objects returned from a jail. Doing so would provide
@@ -31,11 +31,6 @@ module Safemode
       @source.send(method, *args, &block)
     end
 
-    # needed for compatibility with 1.8.7; remove this method once 1.8.7 support has been dropped
-    def respond_to?(method, *)
-      respond_to_missing?(method)
-    end
-
     def respond_to_missing?(method_name, include_private = false)
       self.class.allowed_instance_method?(method_name)
     end

data/lib/safemode/parser.rb

@@ -2,14 +2,14 @@ module Safemode
   class Parser < Ruby2Ruby
     # @@parser = defined?(RubyParser) ? 'RubyParser' : 'ParseTree'
     @@parser = 'RubyParser'
-    
+
     class << self
       def jail(code, allowed_fcalls = [])
         @@allowed_fcalls = allowed_fcalls
         tree = parse code
         self.new.process(tree)
       end
-      
+
       def parse(code)
         case @@parser
         # when 'ParseTree'
@@ -20,12 +20,12 @@ module Safemode
           raise "unknown parser #{@@parser}"
         end
       end
-      
+
       def parser=(parser)
         @@parser = parser
       end
     end
-    
+
     def jail(str, parentheses = false)
       str = parentheses ? "(#{str})." : "#{str}." if str
       "#{str}to_jail"
@@ -33,13 +33,14 @@ module Safemode
 
     # split up #process_call. see below ...
     def process_call(exp)
+      exp.shift # remove ":call" symbol
       receiver = jail process_call_receiver(exp)
       name = exp.shift
       args = process_call_args(exp)
 
       process_call_code(receiver, name, args)
     end
-    
+
     def process_fcall(exp)
       # using haml we probably never arrive here because :lasgn'ed :fcalls
       # somehow seem to change to :calls somewhere during processing
@@ -85,7 +86,7 @@ module Safemode
                    # :colon2 is used for module constants
                    :colon2,
                    # unnecessarily advanced?
-                   :argscat, :argspush, :splat, :block_pass,
+                   :argscat, :argspush, :splat,
                    :op_asgn1, :op_asgn2, :op_asgn_and, :op_asgn_or,
                    # needed for haml
                    :block ]
@@ -101,13 +102,17 @@ module Safemode
                    :attrasgn, :cdecl, :cvasgn, :cvdecl, :cvar, :gvar, :gasgn,
                    :xstr, :dxstr,
                    # not sure how secure ruby regexp is, so leave it out for now
-                   :dregx, :dregx_once, :match2, :match3, :nth_ref, :back_ref ]
+                   :dregx, :dregx_once, :match2, :match3, :nth_ref, :back_ref,
+                   # block_pass represents &:method, which would bypass the whitelist e.g. by array.each(&:destroy)
+                   # at this point we don't know the receiver so we rather disable it completely,
+                   # use array.each { |item| item.destroy } instead
+                   :block_pass ]
 
-    # SexpProcessor bails when we overwrite these ... but they are listed as 
+    # SexpProcessor bails when we overwrite these ... but they are listed as
     # "internal nodes that you can't get to" in sexp_processor.rb
     # :ifunc, :method, :last, :opt_n, :cfunc, :newline, :alloca, :memo, :cref
-                   
-    disallowed.each do |name| 
+
+    disallowed.each do |name|
       define_method "process_#{name}" do |arg|
         code = super(arg)
         raise_security_error(name, code)
@@ -115,30 +120,31 @@ module Safemode
     end
 
     def process_const(arg)
-      if RUBY_VERSION >= "1.9" && arg.sexp_type == :Encoding
-        # handling of Encoding constants in ruby 1.9.
+      sexp_type = arg.sexp_body.sexp_type # constants are encoded as: "s(:const, :Encoding)"
+      if sexp_type == :Encoding
+        # handling of Encoding constants.
         # Note: ruby_parser evaluates __ENCODING__ to s(:colon2, s(:const, :Encoding), :UTF_8)
         "#{super(arg).gsub('-', '_')}"
-      elsif arg.sexp_type == :String
+      elsif sexp_type == :String
         # Allow String.new as used in ERB in Ruby 2.4+ to create a string buffer
         super(arg).to_s
       else
         raise_security_error("constant", super(arg))
       end
     end
-    
+
     def raise_security_error(type, info)
       raise Safemode::SecurityError.new(type, info)
     end
-    
+
     # split up Ruby2Ruby#process_call monster method so we can hook into it
     # in a more readable manner
 
     def process_call_receiver(exp)
       receiver_node_type = exp.first.nil? ? nil : exp.first.first
-      receiver = process exp.shift        
+      receiver = process exp.shift
       receiver = "(#{receiver})" if
-        Ruby2Ruby::ASSIGN_NODES.include? receiver_node_type            
+        Ruby2Ruby::ASSIGN_NODES.include? receiver_node_type
       receiver
     end
 
@@ -174,15 +180,16 @@ module Safemode
         end
       end
     end
-    
+
     # Ruby2Ruby process_if rewrites if and unless statements in a way that
     # makes the result unusable for evaluation in, e.g. ERB which appends a
-    # call to to_s when using <%= %> tags. We'd need to either enclose the 
+    # call to to_s when using <%= %> tags. We'd need to either enclose the
     # result from process_if into parentheses like (1 if true) and
     # (true ? (1) : (2)) or just use the plain if-then-else-end syntax (so
     # that ERB can safely append to_s to the resulting block).
 
     def process_if(exp)
+      exp.shift # remove ":if" symbol from exp
       expand = Ruby2Ruby::ASSIGN_NODES.include? exp.first.first
       c = process exp.shift
       t = process exp.shift
@@ -212,6 +219,6 @@ module Safemode
         # end
         "unless #{c} then\n#{indent(f)}\nend"
       end
-    end    
-  end                        
+    end
+  end
 end

data/safemode.gemspec

@@ -2,22 +2,23 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: safemode 1.3.1 ruby lib
+# stub: safemode 1.3.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "safemode".freeze
-  s.version = "1.3.1"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sven Fuchs".freeze, "Peter Cooper".freeze, "Matthias Viehweger".freeze, "Kingsley Hendrickse".freeze, "Ohad Levy".freeze, "Dmitri Dolguikh".freeze]
-  s.date = "2017-02-13"
+  s.date = "2020-08-31"
   s.description = "A library for safe evaluation of Ruby code based on RubyParser and Ruby2Ruby. Provides Rails ActionView template handlers for ERB and Haml.".freeze
   s.email = "ohadlevy@gmail.com".freeze
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
+    ".travis.yml",
     "Gemfile",
     "LICENCSE",
     "README.markdown",
@@ -48,49 +49,40 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/svenfuchs/safemode".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.10".freeze
+  s.rubygems_version = "2.7.6".freeze
   s.summary = "A library for safe evaluation of Ruby code based on ParseTree/RubyParser and Ruby2Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sexp_processor>.freeze, [">= 4.3.0"])
-      s.add_runtime_dependency(%q<ruby2ruby>.freeze, [">= 2.0.6"])
-      s.add_runtime_dependency(%q<ruby_parser>.freeze, [">= 3.2.0"])
-      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_runtime_dependency(%q<ruby2ruby>.freeze, [">= 2.4.0"])
+      s.add_runtime_dependency(%q<ruby_parser>.freeze, [">= 3.10.1"])
+      s.add_runtime_dependency(%q<sexp_processor>.freeze, [">= 4.10.0"])
       s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rcov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<sexp_processor>.freeze, [">= 4.3.0"])
-      s.add_dependency(%q<ruby2ruby>.freeze, [">= 2.0.6"])
-      s.add_dependency(%q<ruby_parser>.freeze, [">= 3.2.0"])
-      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<ruby2ruby>.freeze, [">= 2.4.0"])
+      s.add_dependency(%q<ruby_parser>.freeze, [">= 3.10.1"])
+      s.add_dependency(%q<sexp_processor>.freeze, [">= 4.10.0"])
       s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_dependency(%q<rcov>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<sexp_processor>.freeze, [">= 4.3.0"])
-    s.add_dependency(%q<ruby2ruby>.freeze, [">= 2.0.6"])
-    s.add_dependency(%q<ruby_parser>.freeze, [">= 3.2.0"])
-    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<ruby2ruby>.freeze, [">= 2.4.0"])
+    s.add_dependency(%q<ruby_parser>.freeze, [">= 3.10.1"])
+    s.add_dependency(%q<sexp_processor>.freeze, [">= 4.10.0"])
     s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-    s.add_dependency(%q<rcov>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
   end
 end
 

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-if RUBY_VERSION >= '1.9'and ENV['COVERAGE']
+if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start {add_filter 'test_'}
 end
@@ -22,7 +22,7 @@ module TestHelper
         '@article.comment_class.new',
         'String.instance_variable_set :@a, :a' ]
     end
-    
+
     def security_error_raising_calls
       [ "class A\n end",
         'File.open("/etc/passwd")',
@@ -42,10 +42,10 @@ module TestHelper
         "attr_reader :a",
         'URI("http://google.com")',
         "`ls -a`", "exec('echo *')", "syscall 4, 1, 'hello', 5", "system('touch /tmp/helloworld')",
-        "abort", 
+        "abort",
         "exit(0)", "exit!(0)", "at_exit{'goodbye'}",
         "autoload(::MyModule, 'my_module.rb')",
-        "binding",                                    
+        "binding",
         "callcc{|cont| cont.call}",
         'eval %Q(send(:system, "ls -a"))',
         "fork",
@@ -58,12 +58,12 @@ module TestHelper
         "open('/etc/passwd'){|f| f.read}",
         "p 'text'", "pretty_inspect",
         # "print 'text'", "puts 'text'", allowed and buffered these (see ScopeObject)
-        "printf 'text'", "putc 'a'", 
+        "printf 'text'", "putc 'a'",
         "raise RuntimeError, 'should not happen'",
-        "rand(0)", "srand(0)",                           
+        "rand(0)", "srand(0)",
         "set_trace_func proc{|event| puts event}", "trace_var :$_, proc {|v| puts v }", "untrace_var :$_",
-        "sleep", "sleep(0)",                           
-        "test(1, a, b)",                           
+        "sleep", "sleep(0)",
+        "test(1, a, b)",
         "Signal.trap(0, proc { puts 'Terminating: #{$$}' })",
         "warn 'warning'",
         'Array.new' ]
@@ -77,31 +77,31 @@ module TestHelper
   def assert_raise_security(code = nil, assigns = {}, locals = {}, &block)
     assert_raise_safemode_error(Safemode::SecurityError, code, assigns, locals, &block)
   end
-  
+
   def assert_raise_safemode_error(error, code, assigns = {}, locals = {})
     code = yield(code) if block_given?
     assert_raise(error, code) { safebox_eval(code, assigns, locals) }
   end
-  
+
   def safebox_eval(code, assigns = {}, locals = {})
     # puts Safemode::Parser.jail(code)
     Safemode::Box.new.eval code, assigns, locals
-  end  
+  end
 end
 
 class Article
   def is_article?
     true
   end
-  
+
   def title
     'an article title'
   end
-  
+
   def to_jail
     Article::Jail.new self
   end
-  
+
   def comments
     [Comment.new(self), Comment.new(self)]
   end
@@ -117,15 +117,15 @@ end
 
 class Comment
   attr_reader :article
-  
+
   def initialize(article)
     @article = article
   end
-  
+
   def text
     "comment #{object_id}"
   end
-  
+
   def to_jail
     Comment::Jail.new self
   end
@@ -145,7 +145,7 @@ end
 
 class Article::Jail < Safemode::Jail
   allow :title, :comments, :is_article?, :comment_class
-  
+
   def author_name
     "this article's author name"
   end

data/test/test_jail.rb

@@ -24,8 +24,7 @@ class TestJail < Test::Unit::TestCase
   end
 
   def test_jail_instances_should_have_limited_methods
-    expected = ["class", "method_missing", "methods", "respond_to?", "respond_to_missing?", "to_jail", "to_s", "instance_variable_get"]
-    expected.delete('respond_to_missing?') if RUBY_VERSION > '1.9.3' # respond_to_missing? is private in rubies above 1.9.3
+    expected = ["class", "method_missing", "methods", "respond_to?", "to_jail", "to_s", "instance_variable_get"]
     objects.each do |object|
       assert_equal expected.sort, reject_pretty_methods(object.to_jail.methods.map(&:to_s).sort)
     end
@@ -37,8 +36,12 @@ class TestJail < Test::Unit::TestCase
                 "allow_instance_method", "allow_class_method", "allowed_instance_method?",
                 "allowed_class_method?", "allowed_instance_methods", "allowed_class_methods",
                 "<", # < needed in Rails Object#subclasses_of
-                "ancestors", "==" # ancestors and == needed in Rails::Generator::Spec#lookup_class
-               ]
+                "ancestors", "=="] # ancestors and == needed in Rails::Generator::Spec#lookup_class
+
+    if defined?(JRUBY_VERSION)
+      (expected << ['method_missing', 'singleton_method_undefined', 'singleton_method_added']).flatten!  # needed for running under jruby
+    end
+
     objects.each do |object|
       assert_equal expected.sort, reject_pretty_methods(object.to_jail.class.methods.map(&:to_s).sort)
     end

data/test/test_safemode_eval.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class TestSafemodeEval < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
     @box = Safemode::Box.new
     @locals = { :article => Article.new }
@@ -18,14 +18,10 @@ class TestSafemodeEval < Test::Unit::TestCase
   end
 
   def test_unary_operators_on_instances_of_boolean_vars
-    if RUBY_VERSION != "1.8.7"
-      assert @box.eval('not false')
-      assert @box.eval('!false')
-      assert !@box.eval('not true')
-      assert !@box.eval('!true')
-    else
-      p "no unary ops under 1.8.7!"
-    end
+    assert @box.eval('not false')
+    assert @box.eval('!false')
+    assert !@box.eval('not true')
+    assert !@box.eval('!true')
   end
 
   def test_false_class_ops
@@ -55,35 +51,35 @@ class TestSafemodeEval < Test::Unit::TestCase
   def test_should_turn_assigns_to_jails
     assert_raise_no_method "@article.system", @assigns
   end
-  
+
   def test_should_turn_locals_to_jails
     assert_raise(Safemode::NoMethodError){ @box.eval "article.system", {}, @locals }
   end
-  
+
   def test_should_allow_method_access_on_assigns
     assert_nothing_raised{ @box.eval "@article.title", @assigns }
   end
-  
+
   def test_should_allow_method_access_on_locals
     assert_nothing_raised{ @box.eval("article.title", {}, @locals) }
   end
-  
+
   def test_should_not_raise_on_if_using_return_values
     assert_nothing_raised{ @box.eval "if @article.is_article? then 1 end", @assigns }
   end
-  
+
   def test_should_work_with_if_using_return_values
     assert_equal @box.eval("if @article.is_article? then 1 end", @assigns), 1
   end
-  
+
   def test__FILE__should_not_render_filename
     assert_equal '(string)', @box.eval("__FILE__")
   end
-  
+
   def test_interpolated_xstr_should_raise_security
     assert_raise_security '"#{`ls -a`}"'
-  end  
-        
+  end
+
   TestHelper.no_method_error_raising_calls.each do |call|
     call.gsub!('"', '\\\\"')
     class_eval %Q(
@@ -100,6 +96,6 @@ class TestSafemodeEval < Test::Unit::TestCase
         assert_raise_security "#{call}", @assigns, @locals
       end
     )
-  end  
+  end
 
 end

data/test/test_safemode_parser.rb

@@ -31,6 +31,12 @@ class TestSafemodeParser < Test::Unit::TestCase
     end
   end
 
+  def test_block_pass_is_disabled
+    assert_raise Safemode::SecurityError do
+      jail('[].each(&:delete)')
+    end
+  end
+
 private
   
   def assert_jailed(expected, code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safemode
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.6
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,92 +13,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 4.10.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,21 +86,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -156,7 +114,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,6 +135,7 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
+- ".travis.yml"
 - Gemfile
 - LICENCSE
 - README.markdown
@@ -224,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A library for safe evaluation of Ruby code based on ParseTree/RubyParser