##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: wrong digest for text files under Windows (#2264)....
Jean-Philippe Lang -
r2083:93c04f2666b6
parent child
Show More
Side by Side Unified
Context file:
r2083:93c04f2666b6 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,136 +1,143
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require "digest/md5"
19 19
20 20 class Attachment < ActiveRecord::Base
21 21 belongs_to :container, :polymorphic => true
22 22 belongs_to :author, :class_name => "User", :foreign_key => "author_id"
23 23
24 24 validates_presence_of :container, :filename, :author
25 25 validates_length_of :filename, :maximum => 255
26 26 validates_length_of :disk_filename, :maximum => 255
27 27
28 28 acts_as_event :title => :filename,
29 29 :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
30 30
31 31 acts_as_activity_provider :type => 'files',
32 32 :permission => :view_files,
33 33 :author_key => :author_id,
34 34 :find_options => {:select => "#{Attachment.table_name}.*",
35 35 :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
36 36 "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
37 37
38 38 acts_as_activity_provider :type => 'documents',
39 39 :permission => :view_documents,
40 40 :author_key => :author_id,
41 41 :find_options => {:select => "#{Attachment.table_name}.*",
42 42 :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
43 43 "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
44 44
45 45 cattr_accessor :storage_path
46 46 @@storage_path = "#{RAILS_ROOT}/files"
47 47
48 48 def validate
49 49 errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
50 50 end
51 51
52 52 def file=(incoming_file)
53 53 unless incoming_file.nil?
54 54 @temp_file = incoming_file
55 55 if @temp_file.size > 0
56 56 self.filename = sanitize_filename(@temp_file.original_filename)
57 57 self.disk_filename = Attachment.disk_filename(filename)
58 58 self.content_type = @temp_file.content_type.to_s.chomp
59 59 self.filesize = @temp_file.size
60 60 end
61 61 end
62 62 end
63 63
64 64 def file
65 65 nil
66 66 end
67 67
68 68 # Copy temp file to its final location
69 69 def before_save
70 70 if @temp_file && (@temp_file.size > 0)
71 71 logger.debug("saving '#{self.diskfile}'")
72 72 File.open(diskfile, "wb") do |f|
73 73 f.write(@temp_file.read)
74 74 end
75 self.digest = Digest::MD5.hexdigest(File.read(diskfile))
75 self.digest = self.class.digest(diskfile)
76 76 end
77 77 # Don't save the content type if it's longer than the authorized length
78 78 if self.content_type && self.content_type.length > 255
79 79 self.content_type = nil
80 80 end
81 81 end
82 82
83 83 # Deletes file on the disk
84 84 def after_destroy
85 85 File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
86 86 end
87 87
88 88 # Returns file's location on disk
89 89 def diskfile
90 90 "#{@@storage_path}/#{self.disk_filename}"
91 91 end
92 92
93 93 def increment_download
94 94 increment!(:downloads)
95 95 end
96 96
97 97 def project
98 98 container.project
99 99 end
100 100
101 101 def image?
102 102 self.filename =~ /\.(jpe?g|gif|png)$/i
103 103 end
104 104
105 105 def is_text?
106 106 Redmine::MimeType.is_type?('text', filename)
107 107 end
108 108
109 109 def is_diff?
110 110 self.filename =~ /\.(patch|diff)$/i
111 111 end
112 112
113 113 private
114 114 def sanitize_filename(value)
115 115 # get only the filename, not the whole path
116 116 just_filename = value.gsub(/^.*(\\|\/)/, '')
117 117 # NOTE: File.basename doesn't work right with Windows paths on Unix
118 118 # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
119 119
120 120 # Finally, replace all non alphanumeric, hyphens or periods with underscore
121 121 @filename = just_filename.gsub(/[^\w\.\-]/,'_')
122 122 end
123 123
124 124 # Returns an ASCII or hashed filename
125 125 def self.disk_filename(filename)
126 126 df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
127 127 if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
128 128 df << filename
129 129 else
130 130 df << Digest::MD5.hexdigest(filename)
131 131 # keep the extension if any
132 132 df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
133 133 end
134 134 df
135 135 end
136
137 # Returns the MD5 digest of the file at given path
138 def self.digest(filename)
139 File.open(filename, 'rb') do |f|
140 Digest::MD5.hexdigest(f.read)
141 end
142 end
136 143 end
Show file before | Show file after | Hide comments
@@ -1,1 +1,2
1 this is a text file for upload tests No newline at end of file
1 this is a text file for upload tests
2 with multiple lines
Show file before | Show file after | Hide comments
@@ -1,32 +1,37
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.dirname(__FILE__) + '/../test_helper'
19 19
20 20 class AttachmentTest < Test::Unit::TestCase
21
21 fixtures :issues, :users
22
22 23 def setup
23 24 end
24 25
25 26 def test_diskfilename
26 27 assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
27 28 assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]
28 29 assert_equal '770c509475505f37c2b8fb6030434d6b.txt', Attachment.disk_filename("test_accentué.txt")[13..-1]
29 30 assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
30 31 assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
31 32 end
33
34 def test_digest
35 assert_equal '1478adae0d4eb06d35897518540e25d6', Attachment.digest(Test::Unit::TestCase.fixture_path + "/files/testfile.txt")
36 end
32 37 end
General Comments 0
You need to be logged in to leave comments. Login now