rack-webdav 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43db150f50bda6ebc40e2fcac2684ab96c1a90ac
-  data.tar.gz: fe75dfa791f91c6d4489b268c47315ab509b10ff
+  metadata.gz: 9025207ede1c1f829fa216898d173661ac29aa2d
+  data.tar.gz: e6c001a417788e6a4134493ecb82031467c3ebaa
 SHA512:
-  metadata.gz: 296a499b062662184e7da39840918ce7b1892be2a27e5ef8867ef0c068c2f4f7f1522a93332e8478af18b89c1ca457b76a89a6fa3130285134321f0bb3c575a5
-  data.tar.gz: 238656df1091b804a97b9f2cb398dc4e322c6013266002461d8e382fc5b676f9f794603f43888790b32fc0742c6b48522c7d74086b11c482d27f9dc1a8c92afc
+  metadata.gz: 1be317ee0340db32fa1ebf40f663810b58fc50b29a3d08f7c9c745a2912d67849639ac9a4dde236e065119e7f83e90e8fb5b3f69160f90a61e07dd5bb226ac71
+  data.tar.gz: e01078ed80e0a6fb2ec0dd99c4c89fa4765a6c1a43d001083935031ac6a9191bd0bc179ec101ab320e8d39d67b5d0526e0b7660098c8b3b12807c47bae140e38

data/lib/rack-webdav/controller.rb

@@ -1,11 +1,11 @@
 require 'uri'
 
 module RackWebDAV
-  
+
   class Controller
     include RackWebDAV::HTTPStatus
     include RackWebDAV::Utils
-    
+
     attr_reader :request, :response, :resource
 
     # request:: Rack::Request
@@ -18,17 +18,17 @@ module RackWebDAV
       @request = request
       @response = response
       @options = options
-      
+
       @dav_extensions = options.delete(:dav_extensions) || []
       @always_include_dav_header = options.delete(:always_include_dav_header)
-      
+
       @resource = resource_class.new(actual_path, implied_path, @request, @response, @options)
-      
+
       if(@always_include_dav_header)
         add_dav_header
       end
     end
-    
+
     # s:: string
     # Escape URL string
     def url_format(resource)
@@ -38,20 +38,20 @@ module RackWebDAV
       end
       ret
     end
-    
+
     # s:: string
     # Unescape URL string
-    def url_unescape(s)
-      URI.unescape(s)
+    def url_unescape(s, encoding = Encoding::UTF_8)
+      URI.decode_www_form_component(s, encoding)
     end
-    
+
     def add_dav_header
       unless(response['Dav'])
         dav_support = %w(1 2) + @dav_extensions
         response['Dav'] = dav_support.join(', ')
       end
     end
-    
+
     # Return response to OPTIONS
     def options
       add_dav_header
@@ -59,7 +59,7 @@ module RackWebDAV
       response['Ms-Author-Via'] = 'DAV'
       OK
     end
-    
+
     # Return response to HEAD
     def head
       if(resource.exist?)
@@ -71,7 +71,7 @@ module RackWebDAV
         NotFound
       end
     end
-    
+
     # Return response to GET
     def get
       if(resource.exist?)
@@ -117,7 +117,7 @@ module RackWebDAV
         NotFound
       end
     end
-    
+
     # Return response to MKCOL
     def mkcol
       resource.lock_check if resource.supports_locking?
@@ -135,7 +135,7 @@ module RackWebDAV
         status
       end
     end
-    
+
     # Return response to COPY
     def copy
       move(:copy)
@@ -180,7 +180,7 @@ module RackWebDAV
         end
       end
     end
-    
+
     # Return response to PROPFIND
     def propfind
       unless(resource.exist?)
@@ -189,25 +189,28 @@ module RackWebDAV
         unless(request_document.xpath("//#{ns}propfind/#{ns}allprop").empty?)
           properties = resource.properties
         else
-          check = request_document.xpath("//#{ns}propfind")
-          if(check && !check.empty?)
-            properties = request_document.xpath(
-              "//#{ns}propfind/#{ns}prop"
-            ).children.find_all{ |item|
-              item.element?
-            }.map{ |item|
-              # We should do this, but Nokogiri transforms prefix w/ null href into
-              # something valid.  Oops.
-              # TODO: Hacky grep fix that's horrible
-              hsh = to_element_hash(item)
-              if(hsh.namespace.nil? && !ns.empty?)
-                raise BadRequest if request_document.to_s.scan(%r{<#{item.name}[^>]+xmlns=""}).empty?
-              end
-              hsh
-            }.compact
+          if request.body.read.bytesize > 0
+            request.body.rewind
+            check = request_document.xpath("//#{ns}propfind")
+            if(check && !check.empty?)
+              properties = request_document.xpath(
+                "//#{ns}propfind/#{ns}prop"
+              ).children.find_all{ |item|
+                item.element?
+              }.map{ |item|
+                # We should do this, but Nokogiri transforms prefix w/ null href into
+                # something valid.  Oops.
+                # TODO: Hacky grep fix that's horrible
+                hsh = to_element_hash(item)
+                if(hsh.namespace.nil? && !ns.empty?)
+                  raise BadRequest if request_document.to_s.scan(%r{<#{item.name}[^>]+xmlns=""}).empty?
+                end
+                hsh
+              }.compact
+            else
+              raise BadRequest
+            end
           else
-            # XXX: Compatibility for Windows.
-            # raise BadRequest
             properties = []
           end
         end
@@ -225,7 +228,7 @@ module RackWebDAV
         end
       end
     end
-    
+
     # Return response to PROPPATCH
     def proppatch
       unless(resource.exist?)
@@ -266,7 +269,7 @@ module RackWebDAV
 
     # Lock current resource
     # NOTE: This will pass an argument hash to Resource#lock and
-    # wait for a success/failure response. 
+    # wait for a success/failure response.
     def lock
       lockinfo = request_document.xpath("//#{ns}lockinfo")
       asked = {}
@@ -344,29 +347,29 @@ module RackWebDAV
       end
       raise Unauthorized unless authed
     end
-    
+
     private
 
     # Request environment variables
     def env
       @request.env
     end
-    
+
     # Current request scheme (http/https)
     def scheme
       request.scheme
     end
-    
+
     # Request host
     def host
       request.host
     end
-    
+
     # Request port
     def port
       request.port
     end
-    
+
     # Class of the resource in use
     def resource_class
       @options[:resource_class]
@@ -376,12 +379,12 @@ module RackWebDAV
     def root_uri_path
       @options[:root_uri_path]
     end
-    
+
     # Returns Resource path with root URI removed
     def implied_path
       clean_path(@request.path.dup)
     end
-    
+
     # x:: request path
     # Unescapes path and removes root URI if applicable
     def clean_path(x)
@@ -389,7 +392,7 @@ module RackWebDAV
       ip.gsub!(/^#{Regexp.escape(root_uri_path)}/, '') if root_uri_path
       ip
     end
-    
+
     # Unescaped request path
     def actual_path
       url_unescape(@request.path.dup)
@@ -399,7 +402,7 @@ module RackWebDAV
     def lock_token
       env['HTTP_LOCK_TOKEN'] || nil
     end
-    
+
     # Requested depth
     def depth
       d = env['HTTP_DEPTH']
@@ -415,7 +418,7 @@ module RackWebDAV
     def http_version
       env['HTTP_VERSION'] || env['SERVER_PROTOCOL'] || 'HTTP/1.0'
     end
-    
+
     # Overwrite is allowed
     def overwrite
       env['HTTP_OVERWRITE'].to_s.upcase != 'F'
@@ -434,9 +437,10 @@ module RackWebDAV
       end
       with_current_resource ? [resource] + ary : ary
     end
-    
+
     # XML parsed request
     def request_document
+      request.body.rewind
       @request_document ||= Nokogiri.XML(request.body.read)
     rescue
       raise BadRequest
@@ -458,7 +462,7 @@ module RackWebDAV
       end
       _ns
     end
-    
+
     # root_type:: Root tag name
     # Render XML and set Rack::Response#body= to final XML
     def render_xml(root_type)
@@ -470,7 +474,7 @@ module RackWebDAV
           yield xml
         end
       end
-     
+
       if(@options[:pretty_xml])
         response.body = doc.to_xml
       else
@@ -481,7 +485,7 @@ module RackWebDAV
       response["Content-Type"] = 'text/xml; charset="utf-8"'
       response["Content-Length"] = response.body.size.to_s
     end
-      
+
     # block:: block
     # Creates a multistatus response using #render_xml and
     # returns the correct status
@@ -489,7 +493,7 @@ module RackWebDAV
       render_xml(:multistatus, &block)
       MultiStatus
     end
-    
+
     # xml:: Nokogiri::XML::Builder
     # errors:: Array of errors
     # Crafts responses for errors
@@ -545,7 +549,7 @@ module RackWebDAV
       end
       stats
     end
-    
+
     # xml:: Nokogiri::XML::Builder
     # stats:: Array of stats
     # Build propstats response
@@ -590,14 +594,12 @@ module RackWebDAV
         end
       end
     end
-    
+
     # xml:: Nokogiri::XML::Builder
     # element:: Nokogiri::XML::Element
     # Converts element into proper text
     def xml_convert(xml, element)
       xml.doc.root.add_child(element)
     end
-
   end
-
-end 
+end

data/lib/rack-webdav/handler.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'rack-webdav/logger'
 
 module RackWebDAV

data/lib/rack-webdav/resources/file_resource.rb

@@ -181,7 +181,7 @@ module RackWebDAV
         if(::File.directory?(file_path))
           MethodNotAllowed
         else
-          if(::File.directory?(::File.dirname(file_path)) && !::File.exists?(file_path))
+          if(::File.directory?(::File.dirname(file_path)) && !::File.exists?(file_path) && !::File.exists?(file_path.gsub(/\/$/, '')))
             Dir.mkdir(file_path)
             Created
           else
@@ -299,7 +299,12 @@ module RackWebDAV
           end
           raise failure
         else
-          locks = FileResourceLock.implict_locks(@path).find(:all, :conditions => ["scope = 'exclusive' AND user_id != ?", @user.id])
+          if @user.respond_to?(:id)
+            locks = FileResourceLock.implict_locks(@path).find(:all, :conditions => ["scope = 'exclusive' AND user_id != ?", @user.id])
+          else
+            locks = []
+          end
+
           if(locks.size > 0)
             failure = LockFailure.new("Failed to lock: #{@path}")
             locks.each do |lock|

data/lib/rack-webdav/version.rb

@@ -13,5 +13,5 @@ module RackWebDAV
     end
   end
 
-  VERSION = Version.new('0.4.2')
+  VERSION = Version.new('0.4.3')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-webdav
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Koki Oyatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -176,7 +176,6 @@ files:
 - lib/rack-webdav/remote_file.rb
 - lib/rack-webdav/resource.rb
 - lib/rack-webdav/resources/file_resource.rb
-- lib/rack-webdav/resources/mongo_resource.rb
 - lib/rack-webdav/utils.rb
 - lib/rack-webdav/version.rb
 - rack-webdav.gemspec

data/lib/rack-webdav/resources/mongo_resource.rb

@@ -1,341 +0,0 @@
-# coding: utf-8
-require 'mime/types'
-
-module RackWebDAV
-
-  class MongoResource < RackWebDAV::Resource
-
-#    @@logger = Rails.logger
-
-    def initialize(public_path, path, request, response, options)
-      # 'ASCII-8BIT'で渡される場合があるので'UTF-8'を指定しておく
-      _force_encoding!(public_path)
-      _force_encoding!(path)
-      super(public_path, path, request, response, options)
-      @filesystem = Mongo::GridFileSystem.new(Mongoid.database)
-      @collection = Mongoid.database.collection('fs.files')
-      if options[:bson]
-        @bson = options[:bson]
-      elsif path.length <= 1
-        # ルートの場合 (''の場合と'/'の場合がある)
-        @bson = {'filename' => root + '/'}
-      else
-        # ファイルかディレクトリが、パラメータだけでは判断できない。ので \/? が必要。
-        # だから、ディレクトリと同名のファイルは、作成できない。
-        @bson = @collection.find_one({:filename => /^#{Regexp.escape(file_path)}\/?$/}) rescue nil
-      end
-    end
-
-    def child(bson)
-      path = remove(bson['filename'], root)
-      public_path = @options[:root_uri_path] + path
-      @options[:bson] = bson
-      self.class.new(public_path, path, @request, @response, @options)
-    end
-
-    # If this is a collection, return the child resources.
-    def children
-#     Dir[file_path + '/*'].map do |path|
-#       child File.basename(path)
-#     end
-      @collection.find({:filename => /^#{Regexp.escape(@bson['filename'])}[^\/]+\/?$/}).map do |bson|
-        child bson
-      end
-    end
-
-    # Is this resource a collection?
-    def collection?
-#     File.directory?(file_path)
-      @bson && _collection?(@bson['filename'])
-    end
-
-    # Does this recource exist?
-    def exist?
-#     File.exist?(file_path)
-      @bson
-    end
-
-    # Return the creation time.
-    def creation_date
-#     stat.ctime
-      @bson['uploadDate'] || Date.new
-    end
-
-    # Return the time of last modification.
-    def last_modified
-#     stat.mtime
-      @bson['uploadDate'] || Date.new
-    end
-
-    # Set the time of last modification.
-    def last_modified=(time)
-#      File.utime(Time.now, time, file_path)
-    end
-
-    # Return an Etag, an unique hash value for this resource.
-    def etag
-#     sprintf('%x-%x-%x', stat.ino, stat.size, stat.mtime.to_i)
-      @bson['_id'].to_s
-    end
-
-    # Return the mime type of this resource.
-    def content_type
-#     if stat.directory?
-#       "text/html"
-#     else
-#       mime_type(file_path, DefaultMimeTypes)
-#     end
-      @bson['contentType'] || "text/html"
-    end
-
-    # Return the size in bytes for this resource.
-    def content_length
-#     stat.size
-      @bson['length'] || 0
-    end
-
-    # HTTP GET request.
-    #
-    # Write the content of the resource to the response.body.
-    def get(request, response)
-      raise NotFound unless exist?
-#     if stat.directory?
-#       response.body = ""
-#       Rack::Directory.new(root).call(request.env)[2].each do |line|
-#         response.body << line
-#       end
-#       response['Content-Length'] = response.body.size.to_s
-#     else
-#       file = Rack::File.new(root)
-#       response.body = file
-#     end
-      if collection?
-        response.body = "<html>"
-        response.body << "<h2>" + file_path.html_safe + "</h2>"
-        children.each do |child|
-          name = child.file_path.html_safe
-          path = child.public_path
-          response.body << "<a href='" + path + "'>" + name + "</a>"
-          response.body << "</br>"
-        end
-        response.body << "</html>"
-        response['Content-Length'] = response.body.size.to_s
-        response['Content-Type'] = 'text/html'
-      else
-        @filesystem.open(file_path, 'r') do |f|
-          response.body = f
-          response['Content-Type'] = @bson['contentType']
-        end
-      end
-
-    end
-
-    # HTTP PUT request.
-    #
-    # Save the content of the request.body.
-    def put(request, response)
-      write(request.body)
-      Created
-    end
-
-    # HTTP POST request.
-    #
-    # Usually forbidden.
-    def post(request, response)
-      raise HTTPStatus::Forbidden
-    end
-
-    # HTTP DELETE request.
-    #
-    # Delete this resource.
-    def delete
-#     if stat.directory?
-#       FileUtils.rm_rf(file_path)
-#     else
-#       File.unlink(file_path)
-#     end
-      if collection?
-        @collection.find({:filename => /^#{Regexp.escape(@bson['filename'])}/}).each do |bson|
-          @collection.remove(bson)
-        end
-      else
-        @collection.remove(@bson)
-      end
-      NoContent
-    end
-
-    # HTTP COPY request.
-    #
-    # Copy this resource to given destination resource.
-    def copy(dest, overwrite = false)
-#     if(dest.path == path)
-#       Conflict
-#     elsif(stat.directory?)
-#       dest.make_collection
-#       FileUtils.cp_r("#{file_path}/.", "#{dest.send(:file_path)}/")
-#       OK
-#     else
-#       exists = File.exists?(file_path)
-#       if(exists && !overwrite)
-#         PreconditionFailed
-#       else
-#         open(file_path, "rb") do |file|
-#           dest.write(file)
-#         end
-#         exists ? NoContent : Created
-#       end
-#     end
-
-      # ディレクトリなら末尾に「/」をつける。
-      # (dstにもともと「/」が付いているかどうか、クライアントに依存している)
-      # CarotDAV : 「/」が付いていない
-      # TeamFile : 「/」が付いている
-      dest.collection! if collection?
-
-      src = @bson['filename']
-      dst = dest.file_path
-      exists = nil
-
-      @collection.find({:filename => /^#{Regexp.escape(src)}/}).each do |bson|
-        src_name = bson['filename']
-        dst_name = dst + src_name.slice(src.length, src_name.length)
-
-        exists = @collection.find_one({:filename => dst_name}) rescue nil
-
-        return PreconditionFailed if (exists && !overwrite && !collection?)
-
-        @filesystem.open(src_name, "r") do |src|
-        @filesystem.open(dst_name, "w") do |dst|
-          dst.write(src) if src.file_length > 0
-        end
-        end
-
-        @collection.remove(exists) if exists
-      end
-
-      collection? ? Created : (exists ? NoContent : Created)
-    end
-
-    # HTTP MOVE request.
-    #
-    # Move this resource to given destination resource.
-    def move(dest, overwrite = false)
-
-      # ディレクトリなら末尾に「/」をつける。
-      # (dstにもともと「/」が付いているかどうか、クライアントに依存している)
-      # CarotDAV : 「/」が付いていない
-      # TeamFile : 「/」が付いている
-      dest.collection! if collection?
-
-      src = @bson['filename']
-      dst = dest.file_path
-      exists = nil
-
-      @collection.find({:filename => /^#{Regexp.escape(src)}/}).each do |bson|
-        src_name = bson['filename']
-        dst_name = dst + src_name.slice(src.length, src_name.length)
-
-        exists = @collection.find_one({:filename => dst_name}) rescue nil
-
-        # http://mongoid.org/docs/persistence/atomic.html
-        # http://rubydoc.info/github/mongoid/mongoid/master/Mongoid/Collection#update-instance_method
-        @collection.update({'_id' => bson['_id']}, {'$set' => {'filename' => dst_name}}, :safe => true)
-
-        @collection.remove(exists) if exists
-      end
-
-      collection? ? Created : (exists ? NoContent : Created)
-    end
-
-    # HTTP MKCOL request.
-    #
-    # Create this resource as collection.
-    def make_collection
-#     Dir.mkdir(file_path)
-#     Created
-
-      # ディレクトリなら末尾に「/」をつける。
-      # (dstにもともと「/」が付いているかどうか、クライアントに依存している)
-      # CarotDAV : 「/」が付いていない
-      # TeamFile : 「/」が付いている
-      collection!
-
-      bson = @collection.find_one({:filename => file_path}) rescue nil
-
-      # 0バイトのファイルを作成しディレクトリの代わりとする
-      @filesystem.open(file_path, "w") { |f| } if !bson
-
-#      @@logger.error('make_collection : ' + file_path)
-
-      Created
-    end
-
-    # Write to this resource from given IO.
-    def write(io)
-#     tempfile = "#{file_path}.#{Process.pid}.#{object_id}"
-#     open(tempfile, "wb") do |file|
-#       while part = io.read(8192)
-#         file << part
-#       end
-#     end
-#     File.rename(tempfile, file_path)
-#     ensure
-#       File.unlink(tempfile) rescue nil
-
-      # 同名のファイルができないように
-      bson = @collection.find_one({:filename => file_path}) rescue nil
-
-      @filesystem.open(file_path, "w", :content_type => _content_type(file_path)) { |f| f.write(io) }
-
-      # 同名のファイルができないように
-      @collection.remove(bson) if bson
-
-    end
-
-    protected
-
-    def file_path
-      root + path
-    end
-
-    # ファイル名の末尾に「/」を付加してディレクトリ（コレクション）とする
-    def collection!
-      path << '/' if !_collection?(path)
-    end
-
-    private
-
-    def _content_type(filename)
-      MIME::Types.type_for(filename).first.to_s || 'text/html'
-    end
-
-    def authenticate(user, pass)
-      if(options[:username])
-        options[:username] == user && options[:password] == pass
-      else
-        true
-      end
-    end
-
-    # path1の先頭からpath2を取り除く
-    def remove(path1, path2)
-      path1.slice(path2.length, path1.length)
-    end
-
-    def root
-      @options[:root]
-    end
-
-    # ファイル名の末尾が「/」のファイルをディレクトリ（コレクション）とする
-    def _collection?(path)
-      path && path[-1].chr == '/'
-    end
-
-    # 'ASCII-8BIT'で渡される場合があるので'UTF-8'を指定しておく
-    def _force_encoding!(str)
-      str.force_encoding('UTF-8')
-    end
-
-  end
-
-end