kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: attachments with the same name at the same time overwrite (#3691). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3511 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-02-28 11:12:40 +00:00
parent 82310d3162
commit 241f79ac06
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/attachment.rb
View File

@ -147,14 +147,18 @@ private
# Returns an ASCII or hashed filename # Returns an ASCII or hashed filename
def self.disk_filename(filename) def self.disk_filename(filename)
df = DateTime.now.strftime("%y%m%d%H%M%S") + "_" timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
ascii = ''
if filename =~ %r{^[a-zA-Z0-9_\.\-]*$} if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
df << filename ascii = filename
else else
df << Digest::MD5.hexdigest(filename) ascii = Digest::MD5.hexdigest(filename)
# keep the extension if any # keep the extension if any
df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$} ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
end end
df while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
timestamp.succ!
end
"#{timestamp}_#{ascii}"
end end
end end

10
test/unit/attachment_test.rb
View File

@ -46,6 +46,16 @@ class AttachmentTest < ActiveSupport::TestCase
assert_equal 'text/plain', a.content_type assert_equal 'text/plain', a.content_type
end end
def test_identical_attachments_at_the_same_time_should_not_overwrite
a1 = Attachment.create!(:container => Issue.find(1),
:file => uploaded_test_file("testfile.txt", ""),
:author => User.find(1))
a2 = Attachment.create!(:container => Issue.find(1),
:file => uploaded_test_file("testfile.txt", ""),
:author => User.find(1))
assert a1.disk_filename != a2.disk_filename
end
def test_diskfilename def test_diskfilename
assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/ assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1] assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]