jro_apps/redmine Commit - r15539:f94711ea8c99

Option to specify allowed extensions for a file custom field (#6719)....

Jean-Philippe Lang -

r15539:f94711ea8c99

parent child

Context file:

r15539:f94711ea8c99

Collapse all files

app/models/attachment.rb +21 -6

                 end
               end
-              # Returns true if the extension is allowed, otherwise false
+              # Returns true if the extension is allowed regarding allowed/denied
+              # extensions defined in application settings, otherwise false
               def self.valid_extension?(extension)
-                extension = extension.downcase.sub(/\A\.+/, '')
                 denied, allowed = [:attachment_extensions_denied, :attachment_extensions_allowed].map do |setting|
-                  Setting.send(setting).to_s.split(",").map {|s| s.strip.downcase.sub(/\A\.+/, '')}.reject(&:blank?)
+                  Setting.send(setting)
                 end
-                if denied.present? && denied.include?(extension)
+                if denied.present? && extension_in?(extension, denied)
                   return false
                 end
-                unless allowed.blank? || allowed.include?(extension)
+                if allowed.present? && !extension_in?(extension, allowed)
                   return false
                 end
                 true
               end
+              # Returns true if extension belongs to extensions list.
+              def self.extension_in?(extension, extensions)
+                extension = extension.downcase.sub(/\A\.+/, '')
+                unless extensions.is_a?(Array)
+                  extensions = extensions.to_s.split(",").map(&:strip)
+                end
+                extensions = extensions.map {|s| s.downcase.sub(/\A\.+/, '')}.reject(&:blank?)
+                extensions.include?(extension)
+              end
+              # Returns true if attachment's extension belongs to extensions list.
+              def extension_in?(extensions)
+                self.class.extension_in?(File.extname(filename), extensions)
+              end
               private
               # Physically deletes the file from the file system

app/models/custom_field.rb +2 -1

                 'text_formatting',
                 'edit_tag_style',
                 'user_role',
-                'version_status'
+                'version_status',
+                'extensions_allowed'
               def format
                 @format ||= Redmine::FieldFormat.find(field_format)

app/views/custom_fields/formats/_attachment.html.erb +4 0

@@ -0,0 +1,4
	1	<p>
	2	<%= f.text_field :extensions_allowed, :size => 50, :label => :setting_attachment_extensions_allowed %>
	3	<em class="info"><%= l(:text_comma_separated) %> <%= l(:label_example) %>: txt, png</em>
	4	</p>

lib/redmine/field_format.rb +12 -1

                   self.form_partial = 'custom_fields/formats/attachment'
                   self.is_filter_supported = false
                   self.change_no_details = true
+                  field_attributes :extensions_allowed
                   def set_custom_field_value(custom_field, custom_field_value, value)
                     attachment_present = false
                   def validate_custom_value(custom_value)
                     errors = []
-                    if custom_value.instance_variable_get("@attachment_present") && custom_value.value.blank?
+                    if custom_value.value.blank?
+                      if custom_value.instance_variable_get("@attachment_present")
                         errors << ::I18n.t('activerecord.errors.messages.invalid')
                       end
+                    else
+                      if custom_value.value.present?
+                        attachment = Attachment.where(:id => custom_value.value.to_s).first
+                        extensions = custom_value.custom_field.extensions_allowed
+                        if attachment && extensions.present? && !attachment.extension_in?(extensions)
+                          errors << "#{::I18n.t('activerecord.errors.messages.invalid')} (#{l(:setting_attachment_extensions_allowed)}: #{extensions})"
+                        end
+                      end
+                    end
                     errors.uniq
                   end

test/integration/lib/redmine/field_format/attachment_format_test.rb +38 0

@@ -153,4 +153,42 class AttachmentFieldFormatTest < Redmine::IntegrationTest
153	assert_equal attachment.id.to_s, custom_value.value	153	assert_equal attachment.id.to_s, custom_value.value
154	assert_equal custom_value, attachment.reload.container	154	assert_equal custom_value, attachment.reload.container
155	end	155	end
		156
		157	def test_create_with_valid_extension
		158	@field.extensions_allowed = "txt, log"
		159	@field.save!
		160
		161	attachment = new_record(Attachment) do
		162	assert_difference 'Issue.count' do
		163	post '/projects/ecookbook/issues', {
		164	:issue => {
		165	:subject => "Blank",
		166	:custom_field_values => {
		167	@field.id => {:file => uploaded_test_file("testfile.txt", "text/plain")}
		168	}
		169	}
		170	}
		171	assert_response 302
		172	end
		173	end
		174	end
		175
		176	def test_create_with_invalid_extension_should_fail
		177	@field.extensions_allowed = "png, jpeg"
		178	@field.save!
		179
		180	attachment = new_record(Attachment) do
		181	assert_no_difference 'Issue.count' do
		182	post '/projects/ecookbook/issues', {
		183	:issue => {
		184	:subject => "Blank",
		185	:custom_field_values => {
		186	@field.id => {:file => uploaded_test_file("testfile.txt", "text/plain")}
		187	}
		188	}
		189	}
		190	assert_response :success
		191	end
		192	end
		193	end
156	end	194	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages