rufus-treechecker 1.0.4 → 1.0.5

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-treechecker CHANGELOG.txt
 
 
+== rufus-treechecker - 1.0.5   released 2011/05/10
+
+- clone then add_rules issue fix
+
+
 == rufus-treechecker - 1.0.4   released 2010/12/22
 
 - require rufus/tree_checker and rufus-tree_checker

data/lib/rufus/treechecker.rb

@@ -122,11 +122,12 @@ module Rufus
   #
   class TreeChecker
 
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
 
     # pretty-prints the sexp tree of the given rubycode
     #
     def ptree(rubycode)
+
       puts stree(rubycode)
     end
 
@@ -134,6 +135,7 @@ module Rufus
     # (thanks ruby_parser).
     #
     def stree(rubycode)
+
       "#{rubycode.inspect}\n =>\n#{parse(rubycode).inspect}"
     end
 
@@ -149,6 +151,7 @@ module Rufus
     end
 
     def to_s
+
       s = "#{self.class} (#{self.object_id})\n"
       s << "root_set :\n"
       s << @root_set.to_s
@@ -176,9 +179,11 @@ module Rufus
     #
     def clone
 
-      tc = TreeChecker.new
+      tc = TreeChecker.allocate
       tc.instance_variable_set(:@root_set, @root_set.clone)
       tc.instance_variable_set(:@set, @set.clone)
+      tc.instance_variable_set(:@current_set, tc.instance_variable_get(:@set))
+
       tc
     end
 
@@ -194,6 +199,7 @@ module Rufus
     # Freezes the treechecker instance "in depth"
     #
     def freeze
+
       super
       @root_set.freeze
       @set.freeze
@@ -203,6 +209,10 @@ module Rufus
 
     class RuleSet
 
+      # Mostly for easier specs
+      #
+      attr_accessor :excluded_symbols, :accepted_patterns, :excluded_patterns
+
       def initialize
 
         @excluded_symbols = {} # symbol => exclusion_message
@@ -211,10 +221,12 @@ module Rufus
       end
 
       def clone
+
         rs = RuleSet.new
-        rs.instance_variable_set(:@excluded_symbols, @excluded_symbols.dup)
-        rs.instance_variable_set(:@accepted_patterns, @accepted_patterns.dup)
-        rs.instance_variable_set(:@excluded_patterns, @excluded_patterns.dup)
+        rs.excluded_symbols = @excluded_symbols.dup
+        rs.accepted_patterns = @accepted_patterns.dup
+        rs.excluded_patterns = @excluded_patterns.dup
+
         rs
       end
 
@@ -236,10 +248,9 @@ module Rufus
 
       def check(sexp)
 
-        if sexp.is_a?(Symbol)
+        if sexp.is_a?(Symbol) and m = @excluded_symbols[sexp]
 
-          m = @excluded_symbols[sexp]
-          raise SecurityError.new(m) if m
+          raise SecurityError.new(m)
 
         elsif sexp.is_a?(Array)
 
@@ -292,6 +303,15 @@ module Rufus
         s
       end
 
+      # Mostly a spec method
+      #
+      def ==(oth)
+
+        @excluded_symbols == oth.instance_variable_get(:@excluded_symbols) &&
+        @accepted_patterns == oth.instance_variable_get(:@accepted_patterns) &&
+        @excluded_patterns == oth.instance_variable_get(:@excluded_patterns)
+      end
+
       protected
 
       def check_pattern(sexp, pat)
@@ -352,33 +372,40 @@ module Rufus
     end
 
     def exclude_symbol(*args)
+
       args, message = extract_message(args)
       args.each { |a| @current_set.exclude_symbol(a, message) }
     end
 
     def exclude_fcall(*args)
+
       do_exclude_pair(:fcall, args)
     end
 
     def exclude_vcall(*args)
+
       do_exclude_pair(:vcall, args)
     end
 
     def exclude_fvcall(*args)
+
       do_exclude_pair(:fcall, args)
       do_exclude_pair(:vcall, args)
     end
 
     def exclude_call_on(*args)
+
       do_exclude_pair(:call, args)
     end
 
     def exclude_call_to(*args)
+
       args, message = extract_message(args)
       args.each { |a| @current_set.exclude_pattern([ :call, :any, a], message) }
     end
 
     def exclude_fvccall(*args)
+
       exclude_fvcall(*args)
       exclude_call_to(*args)
     end
@@ -393,7 +420,9 @@ module Rufus
     #     k = ::Kernel
     #
     def exclude_rebinding(*args)
+
       args, message = extract_message(args)
+
       args.each do |a|
         expand_class(a).each do |c|
           @current_set.exclude_pattern([ :lasgn, :any, c], message)
@@ -406,6 +435,7 @@ module Rufus
     # of classes
     #
     def exclude_access_to(*args)
+
       exclude_call_on *args
       exclude_rebinding *args
     end
@@ -507,7 +537,7 @@ module Rufus
 
       # check children
 
-      sexp.each { |c| do_check c }
+      sexp.each { |c| do_check(c) }
     end
 
     # A simple parse (relies on ruby_parser currently)

data/spec/low_spec.rb

@@ -89,11 +89,18 @@ describe Rufus::TreeChecker do
     [
 
       'def drink; "water"; end',
-      'class Toto; def drink; "water"; end; end'
+      'class Toto; def drink; "water"; end; end',
+      %{
+class Whatever
+  def eat
+    "food"
+  end
+end
+      }
 
     ].each do |code|
 
-      it "blocks '#{code}'" do
+      it "blocks #{code.inspect}" do
         lambda { tc.check(code) }.should raise_error(Rufus::SecurityError)
       end
     end

data/spec/misc_spec.rb

@@ -38,6 +38,30 @@ describe Rufus::TreeChecker do
 
       tc1.set.object_id.should_not == tc0.set.object_id
       tc1.root_set.object_id.should_not == tc0.root_set.object_id
+
+      tc1.set.should == tc0.set
+      tc1.root_set.should == tc0.root_set
+    end
+
+    it "sets @current_set correclty when cloning" do
+
+      tc0 = Rufus::TreeChecker.new
+
+      tc1 = tc0.clone
+
+      tc1.add_rules do
+        exclude_def
+      end
+
+      class << tc0
+        attr_reader :set, :root_set
+      end
+      class << tc1
+        attr_reader :set, :root_set
+      end
+
+      tc0.set.excluded_symbols.keys.should_not include(:defn)
+      tc1.set.excluded_symbols.keys.should include(:defn)
     end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-treechecker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  prerelease: 
+  version: 1.0.5
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +09:00
+date: 2011-05-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 5
         version: 2.0.5
   type: :runtime
   version_requirements: *id001
@@ -35,11 +28,10 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -47,12 +39,10 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id003
@@ -92,23 +82,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: tests strings of Ruby code for unauthorized patterns (exit, eval, ...)