sandboxed_erb 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/sandboxed_erb/sandbox_methods.rb

@@ -69,24 +69,50 @@ class Module
   #     "this is NOT ok to call"
   #   end
   # end
-  def not_sandboxed_methods(include_superclasses = false, *disallowed_methods)
+  def not_sandboxed_methods(include_superclasses = false, allowed_mixins=[], *disallowed_methods)
 
     __the_methods_to_check = public_instance_methods(false)
     if include_superclasses
       clz = self.superclass
       while !clz.nil?
         unless clz == Object
+          puts "#{self.name}: #{clz.name}: #{clz.public_instance_methods(false).inspect}"
           __the_methods_to_check += clz.public_instance_methods(false)
         end
         clz = clz.superclass
       end
+      
+      if allowed_mixins.length > 0
+        #we include any mixins
+        for m in self.included_modules
+          if allowed_mixins.include?(m)
+            puts "#{self.name}: #{m.name}: #{m.public_instance_methods(false).inspect}"
+            __the_methods_to_check += m.public_instance_methods(false)
+          end
+        end
+      end
     end
     
     
     __the_methods_to_check.uniq!
     
+    unless disallowed_methods.nil? || disallowed_methods.length == 0
+      not_bang = false
+      if disallowed_methods.include?(:bang_methods) #just remove all xxx! methods that modify in place
+        __the_methods_to_check.reject! { |meth| meth.to_s[-1, 1] == "!"}
+        not_bang = true
+      end
+      unless not_bang || disallowed_methods.length > 1
+        __the_methods_to_check.reject! { |meth| disallowed_methods.include?(meth)}
+      end
+    end
+    
+    puts "#{self.name}: #{__the_methods_to_check.inspect}"
+     
     sandboxed_methods(*__the_methods_to_check)
     
+    
+    
   end
 
 end

data/lib/sandboxed_erb/system_mixins.rb

@@ -21,17 +21,32 @@ along with shikashi.  if not, see <http://www.gnu.org/licenses/>.
 
 
 #add sandboxed method to basic inbuilt objects
-
-String.not_sandboxed_methods true
-Fixnum.not_sandboxed_methods true
-Float.not_sandboxed_methods true
-Range.not_sandboxed_methods true
-Symbol.not_sandboxed_methods true
-Time.not_sandboxed_methods true
-Date.not_sandboxed_methods true
-DateTime.not_sandboxed_methods true
-NilClass.not_sandboxed_methods true
-Array.not_sandboxed_methods true
-Hash.not_sandboxed_methods true
-FalseClass.not_sandboxed_methods true
-TrueClass.not_sandboxed_methods true
+if defined? ActiveSupport
+  String.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::String::Iterators,ActiveSupport::CoreExtensions::String::StartsEndsWith, ActiveSupport::CoreExtensions::String::Inflections, ActiveSupport::CoreExtensions::String::Conversions, Comparable, Enumerable], :bang_methods
+  Fixnum.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Integer::Inflections, ActiveSupport::CoreExtensions::Integer::EvenOdd,ActiveSupport::CoreExtensions::Numeric::Bytes, ActiveSupport::CoreExtensions::Numeric::Time, Comparable], :bang_methods
+  Float.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Numeric::Bytes, ActiveSupport::CoreExtensions::Numeric::Time, Comparable], :bang_methods
+  Range.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Range::Conversions, Enumerable], :bang_methods
+  Symbol.not_sandboxed_methods true
+  Time.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Time::Conversions, ActiveSupport::CoreExtensions::Time::Calculations, Comparable], :bang_methods
+  Date.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Date::Conversions, Comparable], :bang_methods
+  DateTime.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Date::Conversions, Comparable], :bang_methods
+  NilClass.not_sandboxed_methods true
+  Array.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Array::Grouping, ActiveSupport::CoreExtensions::Array::Conversions, Enumerable], :bang_methods
+  Hash.not_sandboxed_methods true, [ActiveSupport::CoreExtensions::Hash::Diff, ActiveSupport::CoreExtensions::Hash::Conversions, ActiveSupport::CoreExtensions::Hash::ReverseMerge, ActiveSupport::CoreExtensions::Hash::IndifferentAccess, ActiveSupport::CoreExtensions::Hash::Keys, Enumerable], :bang_methods
+  FalseClass.not_sandboxed_methods true
+  TrueClass.not_sandboxed_methods true
+else
+  String.not_sandboxed_methods true, [Comparable, Enumerable], :bang_methods
+  Fixnum.not_sandboxed_methods true, [Comparable], :bang_methods
+  Float.not_sandboxed_methods true, [Comparable], :bang_methods
+  Range.not_sandboxed_methods true, [Enumerable], :bang_methods
+  Symbol.not_sandboxed_methods true
+  Time.not_sandboxed_methods true, [Comparable], :bang_methods
+  Date.not_sandboxed_methods true, [Comparable], :bang_methods
+  DateTime.not_sandboxed_methods true, [Comparable], :bang_methods
+  NilClass.not_sandboxed_methods true
+  Array.not_sandboxed_methods true, [Enumerable], :bang_methods
+  Hash.not_sandboxed_methods true, [Enumerable], :bang_methods
+  FalseClass.not_sandboxed_methods true
+  TrueClass.not_sandboxed_methods true
+end

data/lib/sandboxed_erb/tree_processor.rb

@@ -152,7 +152,7 @@ module SandboxedErb
     
     #allowed
     
-    [[:block, true],[:lasgn, true],[:arglist, true],[:str, true],[:dstr, true],[:evstr, true],[:lit, true],[:lvar, true],[:for, true], [:while, true], [:do, true], [:if, true], [:case, true], [:when, true], [:array, true], [:hash, true]].each { |action, add_line_number|
+    [[:block, true],[:lasgn, true],[:arglist, true],[:str, true],[:dstr, true],[:evstr, true],[:lit, true],[:lvar, true],[:for, true], [:while, true], [:do, true], [:if, true], [:case, true], [:when, true], [:array, true], [:hash, true],[:iter, true]].each { |action, add_line_number|
       if add_line_number
         define_method "process_#{action}".intern do |tree|
           puts tree.inspect if $DEBUG

data/sandboxed_erb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandboxed_erb}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["MarkPent"]
-  s.date = %q{2011-06-05}
+  s.date = %q{2012-03-19}
   s.description = %q{Run erb templates safely within a sandbox.}
   s.email = %q{mark.pent@gmail.com}
   s.extra_rdoc_files = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markpent/SandboxedERB}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Run an erb template in a sandbox.}
 
   if s.respond_to? :specification_version then

data/test/test_sandboxed_erb.rb

@@ -49,11 +49,11 @@ class TestSandboxedErb < Test::Unit::TestCase
     end
     
     tc = TestClass.new
-    assert_equal "A", tc._sbm(:ok_to_call)
+    assert_equal "A", tc._sbm(:ok_to_call, {})
     
     
     assert_raise(SandboxedErb::MissingMethodError) {
-      tc._sbm(:not_ok_to_call).to_s
+      tc._sbm(:not_ok_to_call, {}).to_s
     } 
     
   end
@@ -130,6 +130,23 @@ class TestSandboxedErb < Test::Unit::TestCase
     assert_equal "Error on line 1: Unknown method '__send__' on object 'TestSandboxedErb::TestObject'", template.get_error
   end
   
+  should "not be able to call bang methods on system classes" do
+    str_template = "test=<%=[1,2,3].reject!{ |i| i==2} %>"
+    
+    class TestObject
+      sandboxed_methods :valid_method
+      def valid_method
+        "ABC"  
+      end
+    end
+    
+    template = SandboxedErb::Template.new
+    assert_equal true, template.compile(str_template), template.get_error
+    assert_equal nil, template.run(nil, {:test_object=>TestObject.new})
+    
+    assert_equal "Error on line 1: Unknown method 'reject!' on object 'Array'", template.get_error
+  end
+  
   
   should "not be able to call Object methods on literal values" do
     str_template = "test=<%=2.__send__(:object_id)%>"
@@ -158,7 +175,6 @@ class TestSandboxedErb < Test::Unit::TestCase
     assert_equal "Error on line 1: Unknown method 'valid_method=' on object 'TestSandboxedErb::TestObject'", template.get_error
   end
   
-  
   should "allow mixins" do
     
     module MixinTest

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sandboxed_erb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - MarkPent
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2012-03-19 00:00:00 +10:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  version_requirements: *id001
   name: partialruby
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +47,11 @@ dependencies:
         - 0
         - 6
         version: 2.0.6
-  version_requirements: *id002
   name: ruby_parser
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +61,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: shoulda
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +77,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id004
   name: bundler
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,11 +93,11 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  version_requirements: *id005
   name: jeweler
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,10 +107,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: rcov
-  prerelease: false
   type: :development
+  version_requirements: *id006
 description: Run erb templates safely within a sandbox.
 email: mark.pent@gmail.com
 executables: []
@@ -144,6 +145,7 @@ files:
 - test/test_error_handling.rb
 - test/test_sandboxed_erb.rb
 - test/test_valid_templates.rb
+has_rdoc: true
 homepage: http://github.com/markpent/SandboxedERB
 licenses: 
 - MIT
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Run an erb template in a sandbox.