el_finder 1.0.18 → 1.0.19

data/.gitignore

@@ -1,2 +1,3 @@
 *.swp
 pkg
+Gemfile.lock

data/Gemfile

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

data/lib/el_finder/base64.rb

@@ -0,0 +1,17 @@
+if RUBY_VERSION < '1.9'
+  begin
+    require 'base64'
+  rescue LoadError
+  end
+
+  if defined? ::Base64
+    module ::Base64
+      def self.urlsafe_encode64(bin)
+        [bin].pack("m0").tr("+/", "-_")
+      end
+      def self.urlsafe_decode64(str)
+        str.tr("-_", "+/").unpack("m0").first
+      end
+    end
+  end
+end

data/lib/el_finder/connector.rb

@@ -59,7 +59,7 @@ module ElFinder
         end
 
         @current = @params[:current] ? from_hash(@params[:current]) : nil
-        @target = @params[:target] ? from_hash(@params[:target]) : nil
+        @target = (@params[:target] and !@params[:target].empty?) ? from_hash(@params[:target]) : nil
         if params[:targets]
           @targets = @params[:targets].map{|t| from_hash(t)}
         end
@@ -76,12 +76,24 @@ module ElFinder
 
     #
     def to_hash(pathname)
-      Base64.encode64(pathname.path.to_s).chomp.tr("\n", "_")
+      # note that '=' are removed
+      Base64.urlsafe_encode64(pathname.path.to_s).chomp.tr("=\n", "")
     end # of to_hash
 
     #
     def from_hash(hash)
-      pathname = @root + Base64.decode64(hash.tr("_", "\n"))
+      # restore missing '='
+      len = hash.length % 4
+      hash += '==' if len == 1 or len == 2
+      hash += '='  if len == 3
+
+      pathname = @root + Base64.urlsafe_decode64(hash)
+    rescue ArgumentError => e
+      if e.message == 'invalid base64'
+        nil
+      else
+        raise
+      end
     end # of from_hash
 
     #
@@ -315,7 +327,7 @@ module ElFinder
 
     #
     def _extract
-      @response[:error] = 'Invalid Parameters' and return unless @target.file? && @current.directory?
+      @response[:error] = 'Invalid Parameters' and return if @target.nil? || @current.nil? || !(@target.file? && @current.directory?)
       @response[:error] = 'Access Denied' and return unless perms_for(@target)[:read] == true && perms_for(@current)[:write] == true
       @response[:error] = 'No extractor available for this file type' and return if (extractor = @options[:extractors][mime_handler.for(@target)]).nil?
       cmd = ['cd', @current.to_s.shellescape, '&&', extractor.map(&:shellescape), @target.basename.to_s.shellescape].flatten.join(' ')

data/lib/el_finder/version.rb

@@ -1,3 +1,3 @@
 module ElFinder
-  VERSION = '1.0.18'
+  VERSION = '1.0.19'
 end 

data/lib/el_finder.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 
+require 'el_finder/base64'
 require 'el_finder/pathname'
 require 'el_finder/mime_type'
 require 'el_finder/image'

data/test/test_el_finder_hash.rb

@@ -7,13 +7,13 @@ class TestElFinder < Test::Unit::TestCase
   ################################################################################
 
   def test_to_hash_method
-    assert_equal Base64.encode64('foo/bar').chomp, @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'foo/bar'))
-    assert_equal Base64.encode64('.').chomp, @elfinder.to_hash(ElFinder::Pathname.new(@vroot))
+    assert_equal Base64.urlsafe_encode64('foo/bar').chomp.tr("=\n", ""), @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'foo/bar'))
+    assert_equal Base64.urlsafe_encode64('.').chomp.tr("=\n", ""), @elfinder.to_hash(ElFinder::Pathname.new(@vroot))
   end
 
   def test_from_hash_method
-    assert_equal File.join(@vroot, 'foo/bar'), @elfinder.from_hash(Base64.encode64('foo/bar').chomp).to_s
-    assert_equal @vroot, @elfinder.from_hash(Base64.encode64('.').chomp).to_s
+    assert_equal File.join(@vroot, 'foo/bar'), @elfinder.from_hash(Base64.urlsafe_encode64('foo/bar').chomp).to_s
+    assert_equal @vroot, @elfinder.from_hash(Base64.urlsafe_encode64('.').chomp).to_s
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  version: 1.0.19
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-11-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: image_size
@@ -52,6 +52,7 @@ files:
 - el_finder.gemspec
 - lib/el_finder.rb
 - lib/el_finder/action.rb
+- lib/el_finder/base64.rb
 - lib/el_finder/connector.rb
 - lib/el_finder/image.rb
 - lib/el_finder/mime_type.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: el_finder
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: elFinder server side connector for Ruby.