##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: file uploads broken by r6312 (#8912)....
Jean-Philippe Lang -
r6200:6db66f718368
parent child
Show More
Side by Side Unified
Context file:
r6200:6db66f718368 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,192 +1,193
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 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 OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_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 = Redmine::Configuration['attachments_storage_path'] || "#{Rails.root}/files"
47 47
48 48 def validate
49 49 if self.filesize > Setting.attachment_max_size.to_i.kilobytes
50 50 errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes)
51 51 end
52 52 end
53 53
54 54 def file=(incoming_file)
55 55 unless incoming_file.nil?
56 56 @temp_file = incoming_file
57 57 if @temp_file.size > 0
58 58 self.filename = sanitize_filename(@temp_file.original_filename)
59 59 self.disk_filename = Attachment.disk_filename(filename)
60 60 self.content_type = @temp_file.content_type.to_s.chomp
61 61 if content_type.blank?
62 62 self.content_type = Redmine::MimeType.of(filename)
63 63 end
64 64 self.filesize = @temp_file.size
65 65 end
66 66 end
67 67 end
68 68
69 69 def file
70 70 nil
71 71 end
72 72
73 73 # Copies the temporary file to its final location
74 74 # and computes its MD5 hash
75 75 def before_save
76 76 if @temp_file && (@temp_file.size > 0)
77 logger.debug("saving '#{self.diskfile}'")
77 logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")
78 78 md5 = Digest::MD5.new
79 79 File.open(diskfile, "wb") do |f|
80 80 buffer = ""
81 81 while (buffer = @temp_file.read(8192))
82 82 f.write(buffer)
83 83 md5.update(buffer)
84 84 end
85 85 end
86 86 self.digest = md5.hexdigest
87 87 end
88 @temp_file = nil
88 89 # Don't save the content type if it's longer than the authorized length
89 90 if self.content_type && self.content_type.length > 255
90 91 self.content_type = nil
91 92 end
92 93 end
93 94
94 95 # Deletes file on the disk
95 96 def after_destroy
96 97 File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
97 98 end
98 99
99 100 # Returns file's location on disk
100 101 def diskfile
101 102 "#{@@storage_path}/#{self.disk_filename}"
102 103 end
103 104
104 105 def increment_download
105 106 increment!(:downloads)
106 107 end
107 108
108 109 def project
109 110 container.project
110 111 end
111 112
112 113 def visible?(user=User.current)
113 114 container.attachments_visible?(user)
114 115 end
115 116
116 117 def deletable?(user=User.current)
117 118 container.attachments_deletable?(user)
118 119 end
119 120
120 121 def image?
121 122 self.filename =~ /\.(jpe?g|gif|png)$/i
122 123 end
123 124
124 125 def is_text?
125 126 Redmine::MimeType.is_type?('text', filename)
126 127 end
127 128
128 129 def is_diff?
129 130 self.filename =~ /\.(patch|diff)$/i
130 131 end
131 132
132 133 # Returns true if the file is readable
133 134 def readable?
134 135 File.readable?(diskfile)
135 136 end
136 137
137 138 # Bulk attaches a set of files to an object
138 139 #
139 140 # Returns a Hash of the results:
140 141 # :files => array of the attached files
141 142 # :unsaved => array of the files that could not be attached
142 143 def self.attach_files(obj, attachments)
143 144 attached = []
144 145 if attachments && attachments.is_a?(Hash)
145 146 attachments.each_value do |attachment|
146 147 file = attachment['file']
147 148 next unless file && file.size > 0
148 149 a = Attachment.create(:container => obj,
149 150 :file => file,
150 151 :description => attachment['description'].to_s.strip,
151 152 :author => User.current)
152 153 obj.attachments << a
153 154
154 155 if a.new_record?
155 156 obj.unsaved_attachments ||= []
156 157 obj.unsaved_attachments << a
157 158 else
158 159 attached << a
159 160 end
160 161 end
161 162 end
162 163 {:files => attached, :unsaved => obj.unsaved_attachments}
163 164 end
164 165
165 166 private
166 167 def sanitize_filename(value)
167 168 # get only the filename, not the whole path
168 169 just_filename = value.gsub(/^.*(\\|\/)/, '')
169 170 # NOTE: File.basename doesn't work right with Windows paths on Unix
170 171 # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
171 172
172 173 # Finally, replace all non alphanumeric, hyphens or periods with underscore
173 174 @filename = just_filename.gsub(/[^\w\.\-]/,'_')
174 175 end
175 176
176 177 # Returns an ASCII or hashed filename
177 178 def self.disk_filename(filename)
178 179 timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
179 180 ascii = ''
180 181 if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
181 182 ascii = filename
182 183 else
183 184 ascii = Digest::MD5.hexdigest(filename)
184 185 # keep the extension if any
185 186 ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
186 187 end
187 188 while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
188 189 timestamp.succ!
189 190 end
190 191 "#{timestamp}_#{ascii}"
191 192 end
192 193 end
Show file before | Show file after | Hide comments
@@ -1,85 +1,106
1 1 # encoding: utf-8
2 2 #
3 3 # Redmine - project management software
4 4 # Copyright (C) 2006-2011 Jean-Philippe Lang
5 5 #
6 6 # This program is free software; you can redistribute it and/or
7 7 # modify it under the terms of the GNU General Public License
8 8 # as published by the Free Software Foundation; either version 2
9 9 # of the License, or (at your option) any later version.
10 10 #
11 11 # This program is distributed in the hope that it will be useful,
12 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13 13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14 # GNU General Public License for more details.
15 15 #
16 16 # You should have received a copy of the GNU General Public License
17 17 # along with this program; if not, write to the Free Software
18 18 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
20 20 require File.expand_path('../../test_helper', __FILE__)
21 21
22 22 class AttachmentTest < ActiveSupport::TestCase
23 23 fixtures :issues, :users
24 24
25 25 def setup
26 26 end
27 27
28 28 def test_create
29 29 a = Attachment.new(:container => Issue.find(1),
30 30 :file => uploaded_test_file("testfile.txt", "text/plain"),
31 31 :author => User.find(1))
32 32 assert a.save
33 33 assert_equal 'testfile.txt', a.filename
34 34 assert_equal 59, a.filesize
35 35 assert_equal 'text/plain', a.content_type
36 36 assert_equal 0, a.downloads
37 37 assert_equal '1478adae0d4eb06d35897518540e25d6', a.digest
38 38 assert File.exist?(a.diskfile)
39 assert_equal 59, File.size(a.diskfile)
39 40 end
40 41
41 42 def test_create_should_auto_assign_content_type
42 43 a = Attachment.new(:container => Issue.find(1),
43 44 :file => uploaded_test_file("testfile.txt", ""),
44 45 :author => User.find(1))
45 46 assert a.save
46 47 assert_equal 'text/plain', a.content_type
47 48 end
48 49
49 50 def test_identical_attachments_at_the_same_time_should_not_overwrite
50 51 a1 = Attachment.create!(:container => Issue.find(1),
51 52 :file => uploaded_test_file("testfile.txt", ""),
52 53 :author => User.find(1))
53 54 a2 = Attachment.create!(:container => Issue.find(1),
54 55 :file => uploaded_test_file("testfile.txt", ""),
55 56 :author => User.find(1))
56 57 assert a1.disk_filename != a2.disk_filename
57 58 end
58 59
59 60 def test_diskfilename
60 61 assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
61 62 assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]
62 63 assert_equal '770c509475505f37c2b8fb6030434d6b.txt', Attachment.disk_filename("test_accentué.txt")[13..-1]
63 64 assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
64 65 assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
65 66 end
66 67
67 context "Attachmnet#attach_files" do
68 context "Attachmnet.attach_files" do
69 should "attach the file" do
70 issue = Issue.first
71 assert_difference 'Attachment.count' do
72 Attachment.attach_files(issue,
73 '1' => {
74 'file' => uploaded_test_file('testfile.txt', 'text/plain'),
75 'description' => 'test'
76 })
77 end
78
79 attachment = Attachment.first(:order => 'id DESC')
80 assert_equal issue, attachment.container
81 assert_equal 'testfile.txt', attachment.filename
82 assert_equal 59, attachment.filesize
83 assert_equal 'test', attachment.description
84 assert_equal 'text/plain', attachment.content_type
85 assert File.exists?(attachment.diskfile)
86 assert_equal 59, File.size(attachment.diskfile)
87 end
88
68 89 should "add unsaved files to the object as unsaved attachments" do
69 90 # Max size of 0 to force Attachment creation failures
70 91 with_settings(:attachment_max_size => 0) do
71 92 @project = Project.generate!
72 93 response = Attachment.attach_files(@project, {
73 94 '1' => {'file' => mock_file, 'description' => 'test'},
74 95 '2' => {'file' => mock_file, 'description' => 'test'}
75 96 })
76 97
77 98 assert response[:unsaved].present?
78 99 assert_equal 2, response[:unsaved].length
79 100 assert response[:unsaved].first.new_record?
80 101 assert response[:unsaved].second.new_record?
81 102 assert_equal response[:unsaved], @project.unsaved_attachments
82 103 end
83 104 end
84 105 end
85 106 end
General Comments 0
You need to be logged in to leave comments. Login now