jro_apps/redmine Commit - r2575:1c03b98e5dac

Fixes that custom values length and attachment size validation error raises an error....

Jean-Philippe Lang -

r2575:1c03b98e5dac

parent child

Context file:

r2575:1c03b98e5dac

Collapse all files

app/models/attachment.rb +3 -1

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require "digest/md5"
              class Attachment < ActiveRecord::Base
                belongs_to :container, :polymorphic => true
                belongs_to :author, :class_name => "User", :foreign_key => "author_id"
                validates_presence_of :container, :filename, :author
                validates_length_of :filename, :maximum => 255
                validates_length_of :disk_filename, :maximum => 255
                acts_as_event :title => :filename,
                              :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
                acts_as_activity_provider :type => 'files',
                                          :permission => :view_files,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "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 )"}
                acts_as_activity_provider :type => 'documents',
                                          :permission => :view_documents,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
                cattr_accessor :storage_path
                @@storage_path = "#{RAILS_ROOT}/files"
                def validate
-                 errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
+                 if self.filesize > Setting.attachment_max_size.to_i.kilobytes
+                   errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes)
+                 end
                end
                def file=(incoming_file)
                  unless incoming_file.nil?
                    @temp_file = incoming_file
                    if @temp_file.size > 0
                      self.filename = sanitize_filename(@temp_file.original_filename)
                      self.disk_filename = Attachment.disk_filename(filename)
                      self.content_type = @temp_file.content_type.to_s.chomp
                      self.filesize = @temp_file.size
                    end
                  end
                end
                def file
                  nil
                end
                # Copy temp file to its final location
                def before_save
                  if @temp_file && (@temp_file.size > 0)
                    logger.debug("saving '#{self.diskfile}'")
                    File.open(diskfile, "wb") do |f|
                      f.write(@temp_file.read)
                    end
                    self.digest = self.class.digest(diskfile)
                  end
                  # Don't save the content type if it's longer than the authorized length
                  if self.content_type && self.content_type.length > 255
                    self.content_type = nil
                  end
                end
                # Deletes file on the disk
                def after_destroy
                  File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
                end
                # Returns file's location on disk
                def diskfile
                  "#{@@storage_path}/#{self.disk_filename}"
                end
                def increment_download
                  increment!(:downloads)
                end
                def project
                  container.project
                end
                def visible?(user=User.current)
                  container.attachments_visible?(user)
                end
                def deletable?(user=User.current)
                  container.attachments_deletable?(user)
                end
                def image?
                  self.filename =~ /\.(jpe?g|gif|png)$/i
                end
                def is_text?
                  Redmine::MimeType.is_type?('text', filename)
                end
                def is_diff?
                  self.filename =~ /\.(patch|diff)$/i
                end
              private
                def sanitize_filename(value)
                  # get only the filename, not the whole path
                  just_filename = value.gsub(/^.*(\\|\/)/, '')
                  # NOTE: File.basename doesn't work right with Windows paths on Unix
                  # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
                  # Finally, replace all non alphanumeric, hyphens or periods with underscore
                  @filename = just_filename.gsub(/[^\w\.\-]/,'_')
                end
                # Returns an ASCII or hashed filename
                def self.disk_filename(filename)
                  df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
                  if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
                    df << filename
                  else
                    df << Digest::MD5.hexdigest(filename)
                    # keep the extension if any
                    df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
                  end
                  df
                end
                # Returns the MD5 digest of the file at given path
                def self.digest(filename)
                  File.open(filename, 'rb') do |f|
                    Digest::MD5.hexdigest(f.read)
                  end
                end
              end

app/models/custom_value.rb +2 -2

              # redMine - project management software
              # Copyright (C) 2006  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class CustomValue < ActiveRecord::Base
                belongs_to :custom_field
                belongs_to :customized, :polymorphic => true
                def after_initialize
                  if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
                    self.value ||= custom_field.default_value
                  end
                end
                # Returns true if the boolean custom value is true
                def true?
                  self.value == '1'
                end
                def editable?
                  custom_field.editable?
                end
                def required?
                  custom_field.is_required?
                end
                def to_s
                  value.to_s
                end
              protected
                def validate
                  if value.blank?
                    errors.add(:value, :blank) if custom_field.is_required? and value.blank?
                  else
                    errors.add(:value, :invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
-                   errors.add(:value, :too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
-                   errors.add(:value, :too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+                   errors.add(:value, :too_short, :count => custom_field.min_length) if custom_field.min_length > 0 and value.length < custom_field.min_length
+                   errors.add(:value, :too_long, :count => custom_field.max_length) if custom_field.max_length > 0 and value.length > custom_field.max_length
                    # Format specific validations
                    case custom_field.field_format
                    when 'int'
                      errors.add(:value, :not_a_number) unless value =~ /^[+-]?\d+$/
                    when 'float'
                      begin; Kernel.Float(value); rescue; errors.add(:value, :invalid) end
                    when 'date'
                      errors.add(:value, :not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
                    when 'list'
                      errors.add(:value, :inclusion) unless custom_field.possible_values.include?(value)
                    end
                  end
                end
              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