el_finder 1.0.0 → 1.0.2

data/.gitignore

@@ -0,0 +1,2 @@
+*.swp
+pkg

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cyp_mail_processor.gemspec
+gemspec

data/{README.txt → README.rdoc}

@@ -21,10 +21,14 @@ open-source file manager for web, written in JavaScript using jQuery UI.
 
 == Requirements:
 
-The gem, by default, relies upon the 'imagesize' ruby gem and ImageMagick's 'mogrify' command.
+The gem, by default, relies upon the 'image_size' ruby gem and ImageMagick's 'mogrify' command.
 These requirements can be changed by implementing custom methods for determining image size
 and resizing of an image.
 
+NOTE: There is another ruby gem 'imagesize' that also defines the class ImageSize and requires 'image_size'
+If you have that one installed, elfinder will fail.  Make sure you only have 'image_size' installed if you use
+the defaults.
+
 == Install:
 
 * Install elFinder (http://elrte.org/redmine/projects/elfinder/wiki/Install_EN)

data/Rakefile

@@ -1,13 +1,11 @@
 # -*- ruby -*-
 
-require 'rubygems'
-require 'hoe'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-Hoe.spec 'el_finder' do
-  developer('Philip Hallstrom', 'philip@pjkh.com')
-  self.extra_deps = [
-    ["imagesize",">=0.1.1"]
-  ]
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
-
-# vim: syntax=ruby

data/el_finder.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "el_finder/version"
+
+Gem::Specification.new do |s|
+  s.name        = "el_finder"
+  s.version     = ElFinder::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Philip Hallstrom"]
+  s.email       = ["philip@pjkh.com"]
+  s.homepage    = "http://github.com/phallstrom/el_finder"
+  s.summary     = %q{elFinder server side connector for Ruby.}
+  s.description = %q{Ruby library to provide server side functionality for elFinder.  elFinder is an open-source file manager for web, written in JavaScript using jQuery UI.}
+
+  s.rubyforge_project = "el_finder"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency('image_size', '>= 1.0.0')
+
+end

data/lib/el_finder.rb

@@ -1,9 +1,5 @@
 require 'fileutils'
 
-module ElFinder
-  VERSION = '1.0.0'
-end # of module ElFinder
-
 require 'el_finder/pathname'
 require 'el_finder/mime_type'
 require 'el_finder/image_size'

data/lib/el_finder/connector.rb

@@ -16,6 +16,8 @@ module ElFinder
       :archivers => [],
       :extractors => [],
       :home => 'Home',
+      :default_perms => {:read => true, :write => true, :rm => true},
+      :perms => []
     }
 
     #
@@ -24,15 +26,9 @@ module ElFinder
 
       raise(RuntimeError, "Missing required :url option") unless @options.key?(:url) 
       raise(RuntimeError, "Missing required :root option") unless @options.key?(:root) 
-
-      @mime_handler = @options.delete(:mime_handler)
-      raise(RuntimeError, "Mime Handler is invalid") unless @mime_handler.respond_to?(:for)
-
-      @image_size_handler = @options.delete(:image_size_handler)
-      raise(RuntimeError, "Image Size Handler is invalid") unless @image_size_handler.nil? || @image_size_handler.respond_to?(:for)
-
-      @image_resize_handler = @options.delete(:image_resize_handler)
-      raise(RuntimeError, "Image Resize Handler is invalid") unless @image_resize_handler.nil? || @image_resize_handler.respond_to?(:resize)
+      raise(RuntimeError, "Mime Handler is invalid") unless mime_handler.respond_to?(:for)
+      raise(RuntimeError, "Image Size Handler is invalid") unless image_size_handler.nil? || image_size_handler.respond_to?(:for)
+      raise(RuntimeError, "Image Resize Handler is invalid") unless image_resize_handler.nil? || image_resize_handler.respond_to?(:resize)
 
       @root = ElFinder::Pathname.new(options[:root])
 
@@ -43,6 +39,7 @@ module ElFinder
     #
     def run(params = {})
       @params = params.dup
+      @response[:errorData] = {}
 
       if VALID_COMMANDS.include?(@params[:cmd])
 
@@ -52,11 +49,15 @@ module ElFinder
           @targets = @params[:targets].map{|t| from_hash(t)}
         end
 
+
+
         send("_#{@params[:cmd]}")
       else
         invalid_request
       end
 
+      @response.delete(:errorData) if @response[:errorData].empty?
+
       return @headers, @response
     end # of run
 
@@ -70,6 +71,13 @@ module ElFinder
       pathname = ElFinder::Pathname.new_with_root(@root, Base64.decode64(hash))
     end # of from_hash
 
+    #
+    def options=(opts = {})
+      opts.each_pair do |k,v|
+        @options[k.to_sym] = v
+      end
+    end
+
     ################################################################################
     protected
 
@@ -79,7 +87,15 @@ module ElFinder
 
       if target.nil?
         _open(@root)
-      elsif target.file?
+        return
+      end
+
+      if perms_for(target)[:read] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
+      if target.file?
         command_not_implemented
       elsif target.directory?
         @response[:cwd] = cwd_for(target)
@@ -89,10 +105,8 @@ module ElFinder
           @response[:tree] = {
             :name => @options[:home],
             :hash => to_hash(@root),
-            :read => @root.readable?,              
-            :write => @root.writable?,            
-            :dirs => tree_for(@root)
-          }
+            :dirs => tree_for(@root),
+          }.merge(perms_for(@root))
         end
 
         if @params[:init]
@@ -117,6 +131,11 @@ module ElFinder
 
     #
     def _mkdir
+      if perms_for(@current)[:write] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
       dir = @current + @params[:name]
       if !dir.exist? && dir.mkdir
         @params[:tree] = true
@@ -129,6 +148,11 @@ module ElFinder
 
     #
     def _mkfile
+      if perms_for(@current)[:write] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
       file = @current + @params[:name]
       if !file.exist? && FileUtils.touch(file)
         @response[:select] = [to_hash(file)]
@@ -141,6 +165,19 @@ module ElFinder
     #
     def _rename
       to = @current + @params[:name]
+
+      perms_for_target = perms_for(@target)
+      if perms_for_target[:rm] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
+      perms_for_current = perms_for(@current)
+      if perms_for_current[:write] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
       if to.exist?
         @response[:error] = "Unable to rename #{@target.ftype}. '#{to.basename}' already exists"
       elsif @target.rename(to)
@@ -154,10 +191,15 @@ module ElFinder
 
     #
     def _upload
+      if perms_for(@current)[:write] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
       select = []
       @params[:upload].to_a.each do |file|
         dst = @current + @options[:original_filename_method].call(file)
-        File.rename(file.path, dst)
+        FileUtils.mv(file.path, dst)
         select << to_hash(dst)
       end
       @response[:select] = select
@@ -171,20 +213,30 @@ module ElFinder
 
     #
     def _paste
+      if perms_for(from_hash(@params[:dst]))[:write] == false
+        @response[:error] = 'Access Denied'
+        return
+      end
+
       @targets.to_a.each do |src|
-        dst = from_hash(@params[:dst]) + src.basename
-        if dst.exist?
-          @response[:error] = 'Some files were unable to be copied'
-          @response[:errorData] ||= {}
-          @response[:errorData][src.basename] = "already exists in '#{dst.dirname.relative_path_from(@root)}'"
+        if perms_for(src)[:read] == false || (@params[:cut].to_i > 0 && perms_for(src)[:rm] == false)
+          @response[:error] ||= 'Some files were not copied.'
+          @response[:errorData][src.basename.to_s] = "Access Denied"
+          return
         else
-          if @params[:cut].to_i > 0
-            File.rename(src, dst)
+          dst = from_hash(@params[:dst]) + src.basename
+          if dst.exist?
+            @response[:error] ||= 'Some files were unable to be copied'
+            @response[:errorData][src.basename.to_s] = "already exists in '#{dst.dirname.relative_path_from(@root)}'"
           else
-            if src.directory?
-              FileUtils.cp_r(src, dst)
+            if @params[:cut].to_i > 0
+              src.rename(dst)
             else
-              FileUtils.copy(src, dst)
+              if src.directory?
+                FileUtils.cp_r(src, dst)
+              else
+                FileUtils.copy(src, dst)
+              end
             end
           end
         end
@@ -198,7 +250,9 @@ module ElFinder
       if @targets.empty?
         @response[:error] = "No files were selected for removal"
       else
-        FileUtils.rm_rf(@targets)
+        @targets.to_a.each do |target|
+          remove_target(target)
+        end
         @params[:tree] = true
         _open(@current)
       end
@@ -206,6 +260,17 @@ module ElFinder
 
     #
     def _duplicate
+      if perms_for(@target)[:read] == false 
+        @response[:error] = 'Access Denied'
+        @response[:errorData][@target.basename.to_s] = 'Unable to read'
+        return
+      end
+      if perms_for(@target.dirname)[:write] == false 
+        @response[:error] = 'Access Denied'
+        @response[:errorData][@target.dirname.to_s] = 'Unable to write'
+        return
+      end
+
       duplicate = @target.duplicate
       if @target.directory?
         FileUtils.cp_r(@target, duplicate)
@@ -218,13 +283,21 @@ module ElFinder
 
     # 
     def _read
-      @response[:content] = @target.read
+      if perms_for(@target)[:read] == true
+        @response[:content] = @target.read
+      else
+        @response[:error] = 'Access Denied'
+      end
     end # of read
 
     #
     def _edit
-      @target.open('w') { |f| f.write @params[:content] }
-      @response[:file] = cdc_for(@target)
+      if perms_for(@target)[:write] == true
+        @target.open('w') { |f| f.write @params[:content] }
+        @response[:file] = cdc_for(@target)
+      else
+        @response[:error] = 'Access Denied'
+      end
     end # of edit
 
     #
@@ -244,13 +317,17 @@ module ElFinder
 
     #
     def _resize
-      if @image_resize_handler.nil?
+      if image_resize_handler.nil?
         command_not_implemented
       else
         if @target.file?
-          @image_resize_handler.resize(@target, :width => @params[:width].to_i, :height => @params[:height].to_i)
-          @response[:select] = [to_hash(@target)]
-          _open(@current)
+          if perms_for(@target)[:write] == true
+            image_resize_handler.resize(@target, :width => @params[:width].to_i, :height => @params[:height].to_i)
+            @response[:select] = [to_hash(@target)]
+            _open(@current)
+          else
+            @response[:error] = 'Access Denied'
+          end
         else
           @response[:error] = "Unable to resize file. It does not exist"
         end
@@ -260,19 +337,51 @@ module ElFinder
     ################################################################################
     private
 
+    #
+    def remove_target(target)
+      if target.directory?
+        target.children.each do |child|
+          remove_target(child)
+        end
+      end
+      if perms_for(target)[:rm] == false
+        @response[:error] ||= 'Some files/directories were unable to be removed'
+        @response[:errorData][target.basename.to_s] = "Access Denied"
+      else
+        begin
+          target.unlink
+        rescue
+          @response[:error] ||= 'Some files/directories were unable to be removed'
+          @response[:errorData][target.basename.to_s] = "Remove failed"
+        end
+      end
+    end
+
+    #
+    def mime_handler
+      @options[:mime_handler]
+    end
+
+    #
+    def image_size_handler
+      @options[:image_size_handler]
+    end
+
+    #
+    def image_resize_handler
+      @options[:image_resize_handler]
+    end
+
     # 
     def cwd_for(pathname)
       {
         :name => pathname.basename.to_s,
         :hash => to_hash(pathname),
         :mime => 'directory',
-        :rel => (@options[:home] + '/' + pathname.relative_path_from(@root)),
+        :rel => (@options[:home] + '/' + pathname.relative_path_from(@root).to_s),
         :size => 0,
         :date => pathname.mtime.to_s,
-        :read => pathname.readable?,
-        :write => pathname.writable?,
-        :rm => (pathname != @root && pathname.writable?),
-      }
+      }.merge(perms_for(pathname))
     end
 
     # TODO - Implement link, linkTo, and parent
@@ -281,10 +390,8 @@ module ElFinder
         :name => pathname.basename.to_s,
         :hash => to_hash(pathname),
         :date => pathname.mtime.to_s,
-        :read => pathname.readable?,
-        :write => pathname.writable?,
-        :rm => pathname.writable?,
       }
+      response.merge! perms_for(pathname)
 
       if pathname.directory?
         response.merge!(
@@ -300,14 +407,14 @@ module ElFinder
       elsif pathname.file?
         response.merge!(
           :size => pathname.size, 
-          :mime => @mime_handler.for(pathname),
-          :url => (@options[:url] + '/' + pathname.relative_path_from(@root))
+          :mime => mime_handler.for(pathname),
+          :url => (@options[:url] + '/' + pathname.relative_path_from(@root).to_s)
         )
 
-        if response[:mime] =~ /image/ && !@image_size_handler.nil? && !@image_resize_handler.nil?
+        if pathname.readable? && response[:mime] =~ /image/ && !image_size_handler.nil? && !image_resize_handler.nil?
           response.merge!(
             :resize => true,
-            :dim => @image_size_handler.for(pathname)
+            :dim => image_size_handler.for(pathname)
           )
         end
 
@@ -321,12 +428,35 @@ module ElFinder
       root.children.select{ |child| child.directory? }.sort_by{|e| e.basename.to_s.downcase}.map { |child|
         {:name => child.basename.to_s,
          :hash => to_hash(child),
-         :read => child.readable?,
-         :write => child.writable?,
          :dirs => tree_for(child),
-        }
+        }.merge(perms_for(child))
       }
     end # of tree_for
+
+    #
+    def perms_for(pathname, options = {})
+      skip = [options[:skip]].flatten
+      response = {}
+
+      response[:read] = pathname.readable? if pathname.exist?
+      response[:read] &&= specific_perm_for(pathname, :read)
+      response[:read] &&= @options[:default_perms][:read] 
+
+      response[:write] = pathname.writable? if pathname.exist?
+      response[:write] &&= specific_perm_for(pathname, :write) 
+      response[:write] &&= @options[:default_perms][:write]
+
+      response[:rm] = pathname != @root 
+      response[:rm] &&= specific_perm_for(pathname, :rm)
+      response[:rm] &&= @options[:default_perms][:rm]
+
+      response
+    end # of perms_for
+
+    #
+    def specific_perm_for(pathname, perm)
+      @options[:perms].select{ |k,v| pathname.relative_path_from(@root).to_s.send((k.is_a?(String) ? :== : :match), k) }.none?{|e| e.last[perm] == false}
+    end # of specific_perm_for
     
     #
     def invalid_request

data/lib/el_finder/image_size.rb

@@ -7,8 +7,8 @@ module ElFinder
 
     def self.for(pathname)
       return nil unless File.exist?(pathname)
-      s = new(File.open(pathname)).get_size.join('x').to_s
-      s = nil if s == 'x'
+      s = new(File.open(pathname)).size.to_s
+      s = nil if s.empty?
       return s
     end
 

data/lib/el_finder/pathname.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'pathname'
 
 module ElFinder
@@ -14,6 +15,14 @@ module ElFinder
       self.class.new(super(*args).to_s)
     end
 
+    #
+    def rename(to)
+      super(to)
+    rescue Errno::EXDEV
+      FileUtils.move(self.to_s, to.to_s)
+      @path = to.to_s
+    end
+
     #
     def self.new_with_root(root, path = '')
       new(superclass.new(File.join(root, path)).cleanpath.to_s)

data/lib/el_finder/version.rb

@@ -0,0 +1,3 @@
+module ElFinder
+  VERSION = '1.0.2'
+end 

data/test/test_el_finder.rb

@@ -1,5 +1,6 @@
-require "test/unit"
-require "el_finder"
+require 'test/unit'
+require 'el_finder'
+require 'pp'
 
 class TestElFinder < Test::Unit::TestCase
 
@@ -251,6 +252,332 @@ class TestElFinder < Test::Unit::TestCase
     assert_equal '50x25', ElFinder::ImageSize.for(File.join(@vroot, 'pjkh.png')).to_s
   end
 
+  ################################################################################
+
+  def test_default_permissions
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+
+    assert_equal true, r[:cwd][:read]
+    assert_equal true, r[:cwd][:write]
+    assert_equal false, r[:cwd][:rm]
+
+    r[:cdc].each do |e|
+      assert_equal true, e[:read]
+      assert_equal true, e[:write]
+      assert_equal true, e[:rm]
+    end
+  end
+
+  def test_custom_permissions_on_root
+    @elfinder.options = {
+      :perms => {
+        '.' => {:read => false},
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_custom_permissions
+    @elfinder.options = {
+      :perms => {
+        'foo' => {:rm => false},
+        /.*.png$/ => {:rm => false},
+        /^pjkh/ => {:read => false},
+        'README.txt' => {:write => false},
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+
+    r[:cdc].each do |e|
+      case e[:name]
+      when 'elfinder.png'
+        assert_equal true, e[:read]
+        assert_equal true, e[:write]
+        assert_equal false, e[:rm]
+      when 'foo'
+        assert_equal true, e[:read]
+        assert_equal true, e[:write]
+        assert_equal false, e[:rm]
+      when 'pjkh.png'
+        assert_equal false, e[:read]
+        assert_equal true, e[:write]
+        assert_equal false, e[:rm]
+      when 'README.txt'
+        assert_equal true, e[:read]
+        assert_equal false, e[:write]
+        assert_equal true, e[:rm]
+      end
+    end
+  end
+
+  def test_custom_permissions_multiple_matches_prefers_false
+    @elfinder.options = {
+      :perms => {
+        'pjkh.png' => {:read => false},
+        /pjkh/ => {:read => true},
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+
+    r[:cdc].each do |e|
+      case e[:name]
+      when 'pjkh.png'
+        assert_equal false, e[:read]
+        assert_equal true, e[:write]
+        assert_equal true, e[:rm]
+      else 
+        assert_equal true, e[:read]
+        assert_equal true, e[:write]
+        assert_equal true, e[:rm]
+      end
+    end
+  end
+
+  def test_custom_permissions_in_subdirectories
+    @elfinder.options = {
+      :perms => {
+        %r{foo/s.*} => {:read => false}
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    h, r = @elfinder.run(:cmd => 'open', :target => r[:cdc].find{|e| e[:name] == 'foo'}[:hash])
+
+    r[:cdc].each do |e|
+      case e[:name]
+      when 'sandy.txt', 'sam.txt'
+        assert_equal false, e[:read]
+      else 
+        assert_equal true, e[:read]
+      end
+    end
+  end
+
+  def test_open_permissions
+    @elfinder.options = {
+      :perms => {
+        'foo' => {:read => false}
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'foo'}
+    h1, r = @elfinder.run(:cmd => 'open', :target => target[:hash])
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_mkdir_permissions
+    @elfinder.options = {
+      :perms => {
+        'foo' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'foo'}
+    h1, r = @elfinder.run(:cmd => 'open', :target => target[:hash])
+
+    h, r = @elfinder.run(:cmd => 'mkdir', :current => r[:cwd][:hash], :name => 'dir1')
+    assert !File.directory?(File.join(@vroot, 'foo', 'dir1'))
+    assert_nil r[:select]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_mkfile_permissions
+    @elfinder.options = {
+      :perms => {
+        'foo' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'foo'}
+    h1, r = @elfinder.run(:cmd => 'open', :target => target[:hash])
+
+    h, r = @elfinder.run(:cmd => 'mkfile', :current => r[:cwd][:hash], :name => 'file1')
+    assert !File.file?(File.join(@vroot, 'foo', 'file1'))
+    assert_nil r[:select]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_rename_permissions_file_rm_false
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => {:rm => false}
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h1, r = @elfinder.run(:cmd => 'rename', :target => target[:hash], :current => r[:cwd][:hash], :name => 'file1')
+    assert File.file?(File.join(@vroot, 'README.txt'))
+    assert !File.file?(File.join(@vroot, 'file1'))
+    assert_nil r[:select]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_rename_permissions_dir_write_false
+    @elfinder.options = {
+      :perms => {
+        '.' => {:write => false}
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h1, r = @elfinder.run(:cmd => 'rename', :target => target[:hash], :current => r[:cwd][:hash], :name => 'file1')
+    assert File.file?(File.join(@vroot, 'README.txt'))
+    assert !File.file?(File.join(@vroot, 'file1'))
+    assert_nil r[:select]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_upload_permissions
+    @elfinder.options = {
+      :perms => {
+        '.' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    uploads = []
+    uploads << File.open(File.join(@vroot, 'foo/philip.txt'))
+    h, r = @elfinder.run(:cmd => 'upload', :upload => uploads, :current => r[:cwd][:hash])
+    assert !File.exist?(File.join(@vroot, 'philip.txt'))
+    assert_nil r[:select]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_paste_permissions_on_dst
+    @elfinder.options = {
+      :perms => {
+        'foo' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    targets = r[:cdc].select{|e| e[:mime] != 'directory'}
+    dst = r[:cdc].find{|e| e[:name] == 'foo'}
+
+    h, r = @elfinder.run(:cmd => 'paste', :targets => targets.map{|e| e[:hash]}, :dst => dst[:hash])
+    assert_match(/access denied/i, r[:error])
+    assert !File.exist?(File.join(@vroot, 'foo', 'README.txt'))
+    assert !File.exist?(File.join(@vroot, 'foo', 'pjkh.png'))
+    assert !File.exist?(File.join(@vroot, 'foo', 'elfinder.png'))
+  end
+
+  def test_paste_permissions_on_target
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => {:read => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    targets = r[:cdc].select{|e| e[:mime] != 'directory'}
+    dst = r[:cdc].find{|e| e[:name] == 'foo'}
+
+    h, r = @elfinder.run(:cmd => 'paste', :targets => targets.map{|e| e[:hash]}, :dst => dst[:hash])
+    assert !File.exist?(File.join(@vroot, 'foo', 'README.txt'))
+    assert File.exist?(File.join(@vroot, 'foo', 'pjkh.png'))
+    assert File.exist?(File.join(@vroot, 'foo', 'elfinder.png'))
+  end
+
+  def test_rm_permissions_file_rm_false
+    @elfinder.options = {
+      :perms => {
+        /.*\.png/ => {:rm => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    h, r = @elfinder.run(:cmd => 'rm', :targets => r[:cdc].map{|e| e[:hash]})
+
+    assert !File.exist?(File.join(@vroot, 'README.txt'))
+    assert File.exist?(File.join(@vroot, 'pjkh.png'))
+    assert File.exist?(File.join(@vroot, 'elfinder.png'))
+    assert !File.exist?(File.join(@vroot, 'foo'))
+
+    assert_match(/unable to be removed/i, r[:error])
+    assert_match(/access denied/i, r[:errorData].to_s)
+  end
+
+  def test_rm_permissions_chmod_perm_hack
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    File.unlink(File.join(@vroot, 'pjkh.png'))
+    h, r = @elfinder.run(:cmd => 'rm', :targets => r[:cdc].map{|e| e[:hash]})
+
+    assert_match(/unable to be removed/i, r[:error])
+    assert_match(/pjkh.png.*remove failed/i, r[:errorData].to_s)
+  end
+
+  def test_duplicate_permissions_file
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => {:read => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    duplicate = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h, r = @elfinder.run(:cmd => 'duplicate', :target => duplicate[:hash])
+    assert !File.exist?(File.join(@vroot, 'README copy 1.txt'))
+    assert_match(/access denied/i, r[:error])
+    assert_match(/unable to read/i, r[:errorData].to_s)
+  end
+
+  def test_duplicate_permissions_directory
+    @elfinder.options = {
+      :perms => {
+        '.' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    duplicate = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h, r = @elfinder.run(:cmd => 'duplicate', :target => duplicate[:hash])
+    assert !File.exist?(File.join(@vroot, 'README copy 1.txt'))
+    assert_match(/access denied/i, r[:error])
+    assert_match(/unable to write/i, r[:errorData].to_s)
+  end
+
+
+  def test_read_file_permissions
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => {:read => false}
+      }
+    }
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h, r = @elfinder.run(:cmd => 'read', :target => target[:hash])
+    
+    assert_nil r[:content]
+    assert_match(/access denied/i, r[:error])
+  end
+
+  def test_edit_permissions_write
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    file = r[:cdc].find{|e| e[:name] == 'README.txt'}
+    h, r = @elfinder.run(:cmd => 'edit', :target => file[:hash], :content => 'Hello')
+    assert_match(/access denied/i, r[:error])
+    assert_not_equal 'Hello', File.read(File.join(@vroot, 'README.txt'))
+  end
+
+  def test_resize_permissions_write
+    @elfinder.options = {
+      :perms => {
+        'pjkh.png' => {:write => false}
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    file = r[:cdc].find{|e| e[:name] == 'pjkh.png'}
+    h, r = @elfinder.run(:cmd => 'resize', :target => file[:hash], :current => r[:cwd][:hash], :width => '50', :height => '25')
+    assert File.exist?(File.join(@vroot, 'pjkh.png'))
+    assert_equal '100x100', ElFinder::ImageSize.for(File.join(@vroot, 'pjkh.png')).to_s
+  end
+
 end
 
 __END__

data/test/test_el_finder_pathname.rb

@@ -59,6 +59,30 @@ class TestElFinderPathname < Test::Unit::TestCase
 
   ################################################################################
 
+  def test_rename_on_same_filesystem
+    file = ElFinder::Pathname.new_with_root(@vroot, 'old.txt')
+    FileUtils.touch(file)
+    assert_equal true, File.exist?(File.join(@vroot, 'old.txt'))
+    file.rename(File.join(@vroot, 'new.txt'))
+    assert_equal false, File.exist?(File.join(@vroot, 'old.txt'))
+    assert_equal true, File.exist?(File.join(@vroot, 'new.txt'))
+  end
+
+  def test_rename_on_different_filesystem
+    if File.directory?('/Volumes/MyBook')
+      file = ElFinder::Pathname.new_with_root(@vroot, 'old.txt')
+      FileUtils.touch(file)
+      assert_equal true, File.exist?(File.join(@vroot, 'old.txt'))
+      file.rename('/Volumes/MyBook/elfinder.rename.test.safe.to.delete')
+      assert_equal false, File.exist?(File.join(@vroot, 'old.txt'))
+      assert_equal true, File.exist?('/Volumes/MyBook/elfinder.rename.test.safe.to.delete')
+      file.unlink
+      assert_equal false, File.exist?('/Volumes/MyBook/elfinder.rename.test.safe.to.delete')
+    end
+  end
+
+  ################################################################################
+
   def test_relative_to_method
     assert_equal "", ElFinder::Pathname.new_with_root(@vroot).relative_to(::Pathname.new(@vroot)).to_s
     assert_equal "foo.txt", ElFinder::Pathname.new_with_root(@vroot, 'foo.txt').relative_to(::Pathname.new(@vroot)).to_s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -15,82 +15,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: imagesize
+  name: image_size
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
-        - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id003
-description: |-
-  Ruby library to provide server side functionality for elFinder.  elFinder is an
-  open-source file manager for web, written in JavaScript using jQuery UI.
+description: Ruby library to provide server side functionality for elFinder.  elFinder is an open-source file manager for web, written in JavaScript using jQuery UI.
 email: 
 - philip@pjkh.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
 - .autotest
-- History.txt
-- Manifest.txt
-- README.txt
+- .gitignore
+- Gemfile
+- README.rdoc
 - Rakefile
+- el_finder.gemspec
 - lib/el_finder.rb
 - lib/el_finder/connector.rb
 - lib/el_finder/image_resize.rb
 - lib/el_finder/image_size.rb
 - lib/el_finder/mime_type.rb
 - lib/el_finder/pathname.rb
+- lib/el_finder/version.rb
 - test/files/README.txt
 - test/files/elfinder.png
 - test/files/foo/philip.txt
@@ -103,13 +69,12 @@ files:
 - test/test_el_finder_mime_type.rb
 - test/test_el_finder_pathname.rb
 has_rdoc: true
-homepage: http://elrte.org/redmine/projects/elfinder
+homepage: http://github.com/phallstrom/el_finder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -136,8 +101,15 @@ rubyforge_project: el_finder
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby library to provide server side functionality for elFinder
+summary: elFinder server side connector for Ruby.
 test_files: 
+- test/files/README.txt
+- test/files/elfinder.png
+- test/files/foo/philip.txt
+- test/files/foo/sam.txt
+- test/files/foo/sandy.txt
+- test/files/foo/tom.txt
+- test/files/pjkh.png
 - test/test_el_finder.rb
 - test/test_el_finder_image_size.rb
 - test/test_el_finder_mime_type.rb

data/History.txt

@@ -1,19 +0,0 @@
-CHANGELOG
-
-2010-10-15  Philip Hallstrom
-
-        * update manifest
-        * test each of the connector methods
-        * use base64 encode/decode for hash to get around javascript unfriendly characters
-        * add image size/resize handling
-        * almost functionally complete
-        * migrate over alpha code from past project
-
-2010-10-14  Philip Hallstrom
-
-        * begin work on connector
-        * enforce that all pathnames reside beneath the root
-        * initial library and tests for mime_type/pathname
-        * bin/elfinder not necessary
-        * Initial commit
-

data/Manifest.txt

@@ -1,22 +0,0 @@
-.autotest
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-lib/el_finder.rb
-lib/el_finder/connector.rb
-lib/el_finder/image_resize.rb
-lib/el_finder/image_size.rb
-lib/el_finder/mime_type.rb
-lib/el_finder/pathname.rb
-test/files/README.txt
-test/files/elfinder.png
-test/files/foo/philip.txt
-test/files/foo/sam.txt
-test/files/foo/sandy.txt
-test/files/foo/tom.txt
-test/files/pjkh.png
-test/test_el_finder.rb
-test/test_el_finder_image_size.rb
-test/test_el_finder_mime_type.rb
-test/test_el_finder_pathname.rb