##// END OF EJS Templates
jro_apps » redmine
RSS
Fix a nil error when a Project cannot save attachments....
Eric Davis -
r3658:c56c0f411c57
parent child
Show More
Side by Side Unified
Context file:
r3658:c56c0f411c57 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,186 +1,192
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 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 = "#{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 77 logger.debug("saving '#{self.diskfile}'")
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 88 # Don't save the content type if it's longer than the authorized length
89 89 if self.content_type && self.content_type.length > 255
90 90 self.content_type = nil
91 91 end
92 92 end
93 93
94 94 # Deletes file on the disk
95 95 def after_destroy
96 96 File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
97 97 end
98 98
99 99 # Returns file's location on disk
100 100 def diskfile
101 101 "#{@@storage_path}/#{self.disk_filename}"
102 102 end
103 103
104 104 def increment_download
105 105 increment!(:downloads)
106 106 end
107 107
108 108 def project
109 109 container.project
110 110 end
111 111
112 112 def visible?(user=User.current)
113 113 container.attachments_visible?(user)
114 114 end
115 115
116 116 def deletable?(user=User.current)
117 117 container.attachments_deletable?(user)
118 118 end
119 119
120 120 def image?
121 121 self.filename =~ /\.(jpe?g|gif|png)$/i
122 122 end
123 123
124 124 def is_text?
125 125 Redmine::MimeType.is_type?('text', filename)
126 126 end
127 127
128 128 def is_diff?
129 129 self.filename =~ /\.(patch|diff)$/i
130 130 end
131 131
132 132 # Returns true if the file is readable
133 133 def readable?
134 134 File.readable?(diskfile)
135 135 end
136 136
137 137 # Bulk attaches a set of files to an object
138 138 #
139 139 # Returns a Hash of the results:
140 140 # :files => array of the attached files
141 141 # :unsaved => array of the files that could not be attached
142 142 def self.attach_files(obj, attachments)
143 143 attached = []
144 144 unsaved = []
145 145 if attachments && attachments.is_a?(Hash)
146 146 attachments.each_value do |attachment|
147 147 file = attachment['file']
148 148 next unless file && file.size > 0
149 149 a = Attachment.create(:container => obj,
150 150 :file => file,
151 151 :description => attachment['description'].to_s.strip,
152 152 :author => User.current)
153 a.new_record? ? (obj.unsaved_attachments << a) : (attached << a)
153
154 if a.new_record?
155 obj.unsaved_attachments ||= []
156 obj.unsaved_attachments << a
157 else
158 attached << a
159 end
154 160 end
155 161 end
156 162 {:files => attached, :unsaved => obj.unsaved_attachments}
157 163 end
158 164
159 165 private
160 166 def sanitize_filename(value)
161 167 # get only the filename, not the whole path
162 168 just_filename = value.gsub(/^.*(\\|\/)/, '')
163 169 # NOTE: File.basename doesn't work right with Windows paths on Unix
164 170 # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
165 171
166 172 # Finally, replace all non alphanumeric, hyphens or periods with underscore
167 173 @filename = just_filename.gsub(/[^\w\.\-]/,'_')
168 174 end
169 175
170 176 # Returns an ASCII or hashed filename
171 177 def self.disk_filename(filename)
172 178 timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
173 179 ascii = ''
174 180 if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
175 181 ascii = filename
176 182 else
177 183 ascii = Digest::MD5.hexdigest(filename)
178 184 # keep the extension if any
179 185 ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
180 186 end
181 187 while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
182 188 timestamp.succ!
183 189 end
184 190 "#{timestamp}_#{ascii}"
185 191 end
186 192 end
Show file before | Show file after | Hide comments
@@ -1,66 +1,92
1 1 # encoding: utf-8
2 2 #
3 3 # redMine - project management software
4 4 # Copyright (C) 2006-2007 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.dirname(__FILE__) + '/../test_helper'
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 Digest::MD5.hexdigest(uploaded_test_file("testfile.txt", "text/plain").read), a.digest
38 38 assert File.exist?(a.diskfile)
39 39 end
40 40
41 41 def test_create_should_auto_assign_content_type
42 42 a = Attachment.new(:container => Issue.find(1),
43 43 :file => uploaded_test_file("testfile.txt", ""),
44 44 :author => User.find(1))
45 45 assert a.save
46 46 assert_equal 'text/plain', a.content_type
47 47 end
48 48
49 49 def test_identical_attachments_at_the_same_time_should_not_overwrite
50 50 a1 = Attachment.create!(:container => Issue.find(1),
51 51 :file => uploaded_test_file("testfile.txt", ""),
52 52 :author => User.find(1))
53 53 a2 = Attachment.create!(:container => Issue.find(1),
54 54 :file => uploaded_test_file("testfile.txt", ""),
55 55 :author => User.find(1))
56 56 assert a1.disk_filename != a2.disk_filename
57 57 end
58 58
59 59 def test_diskfilename
60 60 assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
61 61 assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]
62 62 assert_equal '770c509475505f37c2b8fb6030434d6b.txt', Attachment.disk_filename("test_accentué.txt")[13..-1]
63 63 assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
64 64 assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
65 65 end
66
67 context "Attachmnet#attach_files" do
68 should "add unsaved files to the object as unsaved attachments" do
69 # Max size of 0 to force Attachment creation failures
70 with_settings(:attachment_max_size => 0) do
71 # Mock out a file
72 @file = 'a_file.png'
73 @file.stubs(:size).returns(32)
74 @file.stubs(:original_filename).returns('a_file.png')
75 @file.stubs(:content_type).returns('image/png')
76 @file.stubs(:read).returns(false)
77
78 @project = Project.generate!
79 response = Attachment.attach_files(@project, {
80 '1' => {'file' => @file, 'description' => 'test'},
81 '2' => {'file' => @file, 'description' => 'test'}
82 })
83
84 assert response[:unsaved].present?
85 assert_equal 2, response[:unsaved].length
86 assert response[:unsaved].first.new_record?
87 assert response[:unsaved].second.new_record?
88 assert_equal response[:unsaved], @project.unsaved_attachments
89 end
90 end
91 end
66 92 end
General Comments 0
You need to be logged in to leave comments. Login now