From 2cc82b5a8bbe4b2674717eb2a39e32dd5c0e3975 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 27 Oct 2016 17:17:08 +0200 Subject: [PATCH] Shorten long attachment disk filenames --- app/models/attachment.rb | 2 +- test/unit/attachment_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 19f30a6..d038437 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -413,7 +413,7 @@ class Attachment < ActiveRecord::Base def self.disk_filename(filename, directory=nil) timestamp = DateTime.now.strftime("%y%m%d%H%M%S") ascii = '' - if filename =~ %r{^[a-zA-Z0-9_\.\-]*$} + if filename =~ %r{^[a-zA-Z0-9_\.\-]*$} && filename.length <= 50 ascii = filename else ascii = Digest::MD5.hexdigest(filename) diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index c2f6124..2df639c 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -81,6 +81,19 @@ class AttachmentTest < ActiveSupport::TestCase assert_nil a.content_type end + def test_shorted_filename_if_too_long + file = uploaded_test_file("testfile.txt", "text/plain") + file.instance_variable_set('@original_filename', "#{'a'*251}.txt") + assert 255, file.original_filename.length + + a = Attachment.new(:container => Issue.find(1), + :file => file, + :author => User.find(1)) + assert a.save + a.reload + assert_equal 12 + 1 + 32 + 4, a.disk_filename.length + end + def test_copy_should_preserve_attributes a = Attachment.find(1) copy = a.copy -- 2.10.1