rack-webdav 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebc645c51bce135644ae41d8a5e81e07a33b2dc
-  data.tar.gz: aedfa7f5b1128e2a48c518e9009f0e18cb01a945
+  metadata.gz: fe9bcf71471ed56fbeacc1c97d854223086c8a68
+  data.tar.gz: 17aa7559b9644e228f85713aae147797e54fd07b
 SHA512:
-  metadata.gz: 87014d0f17fab49c5d1b6b738a192e3bf43a9727ff3174aaf9b1df0b0c898bc1c1a7b768f21173bf5b569bd0f781c175a905b9dbcb061e0d5a6b260f55fcd461
-  data.tar.gz: 39d1a57fe8d17fae9494c68a09f45b192a929e67a49b0f5eb58510fedfe2cf831e33297ed3f2555dd55077f5872f492487ee34f4185eb4bccbbfda04b8aea867
+  metadata.gz: 1b6f548f567c363801d2a6fbd47aae372007e0df77acb2acfb32146b61b5fb77242d1a093826f3b0306b076b3120723b2e25da97e28072c39f995cdcda6caca1
+  data.tar.gz: d5d891c2aa56554f2ffc52e9522bc75e9cbd5f0aed227918e0739755b9f0fbd390a4746b95c7fcdc7d415aa294c66c22be523f50bcd7f64d57a8eb2f594a2edc

data/lib/rack-webdav/controller.rb

@@ -58,6 +58,12 @@ module RackWebDAV
 
     def put
       raise Forbidden if resource.collection?
+      locktoken = request_locktoken('LOCK_TOKEN')
+      locktoken ||= request_locktoken('IF')
+      locketag = request_locketag('IF')
+      raise PreconditionFailed if locketag && locketag != resource.etag
+      raise Locked if resource.locked?(locktoken, locketag)
+
       map_exceptions do
         resource.put
       end
@@ -73,6 +79,7 @@ module RackWebDAV
 
     def delete
       raise NotFound if not resource.exist?
+      raise Locked if resource.locked?(request_locktoken('LOCK_TOKEN'))
 
       delete_recursive(resource, errors = [])
 
@@ -98,6 +105,10 @@ module RackWebDAV
 
     def copy
       raise NotFound if not resource.exist?
+      # Source Lock Check
+      locktoken = request_locktoken('LOCK_TOKEN')
+      locktoken ||= request_locktoken('IF')
+      raise Locked if resource.locked?(locktoken) && !overwrite
 
       dest_uri = URI.parse(env['HTTP_DESTINATION'])
       destination = parse_destination(dest_uri)
@@ -107,6 +118,10 @@ module RackWebDAV
 
       dest = resource_class.new(destination, @request, @response, @options)
       raise PreconditionFailed if dest.exist? && !overwrite
+      # Destination Lock Check
+      locktoken = request_locktoken('LOCK_TOKEN')
+      locktoken ||= request_locktoken('IF')
+      raise Locked if dest.locked?(locktoken)
 
       dest = dest.child(resource.name) if dest.collection?
 
@@ -127,6 +142,7 @@ module RackWebDAV
 
     def move
       raise NotFound if not resource.exist?
+      raise Locked if resource.locked?(request_locktoken('LOCK_TOKEN'))
 
       dest_uri = URI.parse(env['HTTP_DESTINATION'])
       destination = parse_destination(dest_uri)
@@ -195,6 +211,9 @@ module RackWebDAV
 
     def proppatch
       raise NotFound if not resource.exist?
+      locktoken = request_locktoken('LOCK_TOKEN')
+      locktoken ||= request_locktoken('IF')
+      raise Locked if resource.locked?(locktoken)
 
       nodes = request_match("/d:propertyupdate[d:remove/d:prop/* or d:set/d:prop/*]//d:prop/*")
 
@@ -380,7 +399,14 @@ module RackWebDAV
       def request_locktoken(header)
         token = request.env["HTTP_#{header}"]
         return if token.nil? || token.empty?
-        token.scan /^\(?<?(.+?)>?\)?$/
+        token.scan /<(opaquelocktoken:.+?)>/
+        return $1
+      end
+
+      def request_locketag(header)
+        etag = request.env["HTTP_#{header}"]
+        return if etag.nil? || etag.empty?
+        etag.scan /\[(.+?)\]/
         return $1
       end
 
@@ -485,9 +511,12 @@ module RackWebDAV
         locktype = request_match("/d:lockinfo/d:locktype/d:*").first
         locktype = locktype.name if locktype
         owner = request_match("/d:lockinfo/d:owner/d:href").first
+        owner ||= request_match("/d:lockinfo/d:owner").first
         owner = owner.text if owner
         locktoken = "opaquelocktoken:" + sprintf('%x-%x-%s', Time.now.to_i, Time.now.sec, resource.etag)
 
+        raise Locked if resource.other_owner_locked?(locktoken, owner)
+
         # Quick & Dirty - FIXME: Lock should become a new Class
         # and this dirty parameter passing refactored.
         unless resource.lock(locktoken, timeout, lockscope, locktype, owner)

data/lib/rack-webdav/file_resource.rb

@@ -185,13 +185,14 @@ module RackWebDAV
     @@locks = {}
 
     def lock(token, timeout, scope = nil, type = nil, owner = nil)
-      if scope && type && owner
+      if scope && type
         # Create lock
         @@locks[token] = {
           :timeout => timeout,
           :scope   => scope,
           :type    => type,
-          :owner   => owner
+          :owner   => owner,
+          :path    => self.path
         }
         return true
       else
@@ -206,6 +207,38 @@ module RackWebDAV
       !!@@locks.delete(token)
     end
 
+    def locked?(token, etag = nil)
+      if token.nil?
+        # check parent directory match
+        already_locks = @@locks.select { |lock_token, lock|
+          found = false
+          Pathname.new(self.path).ascend { |v|
+            found = lock[:path].gsub(/\/$/, '') == v.to_s
+            break if found
+          }
+          lock if found
+        }
+        return !already_locks.empty?
+      else
+        lock_paths = @@locks.select { |lock_token, lock| lock[:path] == self.path }
+        self.exist? && @@locks.key?(token) == false && !lock_paths.empty?
+      end
+    end
+
+    def other_owner_locked?(token, owner)
+      return false if token.nil?
+      return false if @@locks.key?(token) && owner.nil?
+      other_owner = @@locks.select { |lock_token, lock|
+        lock[:path] == self.path
+      }.select { |lock_token, lock|
+        !lock[:owner].nil? && lock[:owner] != owner
+      }
+      !other_owner.empty?
+    end
+
+    def locks
+      @@locks
+    end
 
     private
 

data/lib/rack-webdav/version.rb

@@ -4,7 +4,7 @@ module RackWebDAV
   module Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 4
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-webdav
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Koki Oyatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri