redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Webdav: Filter Mac OS X 'resource forks' Files #54

Browse Source
This commit is contained in:
Karel Pičman 2015-09-16 12:01:18 +02:00
parent ee7d3ecb1e
commit 067d158b97
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/dmsf_file.rb
View File

@ -406,9 +406,5 @@ class DmsfFile < ActiveRecord::Base
def image? def image?
self.last_revision && !!(self.last_revision.disk_filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i) self.last_revision && !!(self.last_revision.disk_filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i)
end end
def exist?
return self.last_revision && File.exist?(self.last_revision.disk_file)
end
end end

11
lib/redmine_dmsf/webdav/dmsf_resource.rb
View File

@ -179,7 +179,7 @@ module RedmineDmsf
def etag def etag
filesize = file ? file.size : 4096; filesize = file ? file.size : 4096;
fileino = (file && file.last_revision) ? File.stat(file.last_revision.disk_file).ino : 2; fileino = (file && file.last_revision && File.exist?(file.last_revision.disk_file)) ? File.stat(file.last_revision.disk_file).ino : 2;
sprintf('%x-%x-%x', fileino, filesize, last_modified.to_i) sprintf('%x-%x-%x', fileino, filesize, last_modified.to_i)
end end
@ -488,7 +488,7 @@ module RedmineDmsf
raise Forbidden unless User.current.admin? || User.current.allowed_to?(:file_manipulation, project) raise Forbidden unless User.current.admin? || User.current.allowed_to?(:file_manipulation, project)
# Ignore Mac OS X resource forks and special Windows files. # Ignore Mac OS X resource forks and special Windows files.
if basename.match(/^\._/i) || basename.match(/^ThumbsT.db$/i) if basename.match(/^\._/i) || basename.match(/^Thumbs.db$/i)
Rails.logger.info "#{basename} ignored" Rails.logger.info "#{basename} ignored"
return NoContent return NoContent
end end
@ -538,7 +538,7 @@ module RedmineDmsf
# Ignore Mac OS X resource forks and special Windows files. # Ignore Mac OS X resource forks and special Windows files.
unless request.body.length > 0 unless request.body.length > 0
Rails.logger.info "#{basename} #{request.body.length}b ignored" Rails.logger.info "#{basename} #{request.body.length}b ignored"
return NoContent return Created
end end
raise InternalServerError unless new_revision.valid? && f.save raise InternalServerError unless new_revision.valid? && f.save
@ -560,6 +560,9 @@ module RedmineDmsf
# for lock information to be presented # for lock information to be presented
def get_property(element) def get_property(element)
raise NotImplemented if (element[:ns_href] != 'DAV:') raise NotImplemented if (element[:ns_href] != 'DAV:')
unless folder?
return NotFound unless (file && file.last_revision && File.exist?(file.last_revision.disk_file))
end
case element[:name] case element[:name]
when 'supportedlock' then supported_lock when 'supportedlock' then supported_lock
when 'lockdiscovery' then discover_lock when 'lockdiscovery' then discover_lock
@ -580,7 +583,7 @@ module RedmineDmsf
# implementation of service for request, which allows for us to pipe a single file through # implementation of service for request, which allows for us to pipe a single file through
# also best-utilising DAV4Rack's implementation. # also best-utilising DAV4Rack's implementation.
def download def download
raise NotFound unless file && file.last_revision raise NotFound unless (file && file.last_revision && file.last_revision.disk_file)
# If there is no range (start of ranged download, or direct download) then we log the # If there is no range (start of ranged download, or direct download) then we log the
# file access, so we can properly keep logged information # file access, so we can properly keep logged information