jro_apps/redmine Commit - r7746:77710ece26d8

attachment: use repositories setting to convert contents character encoding (#2371)...

Toshi MARUYAMA -

r7746:77710ece26d8

parent child

Context file:

r7746:77710ece26d8

Collapse all files

app/helpers/attachments_helper.rb +1 -13

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             module AttachmentsHelper
               # Displays view/delete links to the attachments of the given object
               # Options:
               #   :author -- author names are not displayed if set to false
               def link_to_attachments(container, options = {})
                 options.assert_valid_keys(:author)
                 if container.attachments.any?
                   options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
                   render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options}
                 end
               end
               def to_utf8(str)
-                if str.respond_to?(:force_encoding)
+                Redmine::CodesetUtil.to_utf8_by_setting(str)
-                  str.force_encoding('UTF-8')
-                  return str if str.valid_encoding?
-                else
-                  return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
-                end
-                begin
-                  Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
-                rescue Iconv::InvalidEncoding
-                  # "UTF-8//IGNORE" is not supported on some OS
-                  str
-                end
               end
               def render_api_attachment(attachment, api)
                 api.attachment do
                   api.id attachment.id
                   api.filename attachment.filename
                   api.filesize attachment.filesize
                   api.content_type attachment.content_type
                   api.description attachment.description
                   api.content_url url_for(:controller => 'attachments', :action => 'download', :id => attachment, :filename => attachment.filename, :only_path => false)
                   api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
                   api.created_on attachment.created_on
                 end
               end
             end

test/functional/attachments_controller_test.rb +32 -28

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2011  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 File.expand_path('../../test_helper', __FILE__)
             require 'attachments_controller'
             # Re-raise errors caught by the controller.
             class AttachmentsController; def rescue_action(e) raise e end; end
             class AttachmentsControllerTest < ActionController::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles,
                        :enabled_modules, :issues, :trackers, :attachments,
                        :versions, :wiki_pages, :wikis, :documents
               def setup
                 @controller = AttachmentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
                 User.current = nil
               end
               def test_show_diff
                 ['inline', 'sbs'].each do |dt|
                   # 060719210727_changeset_utf8.diff
                   get :show, :id => 14, :type => dt
                   assert_response :success
                   assert_template 'diff'
                   assert_equal 'text/html', @response.content_type
                   assert_tag 'th',
                     :attributes => {:class => /filename/},
                     :content => /issues_controller.rb\t\(révision 1484\)/
                   assert_tag 'td',
                     :attributes => {:class => /line-code/},
                     :content => /Demande créée avec succès/
                 end
               end
-              def test_show_diff_should_strip_non_utf8_content
+              def test_show_diff_replcace_cannot_convert_content
-                ['inline', 'sbs'].each do |dt|
+                with_settings :repositories_encodings => 'UTF-8' do
-                  # 060719210727_changeset_iso8859-1.diff
+                  ['inline', 'sbs'].each do |dt|
-                  get :show, :id => 5, :type => dt
+                    # 060719210727_changeset_iso8859-1.diff
-                  assert_response :success
+                    get :show, :id => 5
-                  assert_template 'diff'
+                    assert_response :success
-                  assert_equal 'text/html', @response.content_type
+                    assert_template 'diff'
-                  assert_tag 'th',
+                    assert_equal 'text/html', @response.content_type
-                    :attributes => {:class => /filename/},
+                    assert_tag 'th',
-                    :content => /issues_controller.rb\t\(rvision 1484\)/
+                      :attributes => {:class => "filename"},
-                  assert_tag 'td',
+                      :content => /issues_controller.rb\t\(r\?vision 1484\)/
-                    :attributes => {:class => /line-code/},
+                    assert_tag 'td',
-                    :content => /Demande cre avec succs/
+                      :attributes => {:class => /line-code/},
+                      :content => /Demande cr\?\?e avec succ\?s/
+                  end
                 end
               end
               def test_show_text_file
                 get :show, :id => 4
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
               end
               def test_show_text_file_utf_8
                 set_tmp_attachments_directory
                 a = Attachment.new(:container => Issue.find(1),
                                    :file => uploaded_test_file("japanese-utf-8.txt", "text/plain"),
                                    :author => User.find(1))
                 assert a.save
                 assert_equal 'japanese-utf-8.txt', a.filename
                 str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
                 str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                 get :show, :id => a.id
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
                 assert_tag :tag => 'th',
                            :content => '1',
                            :attributes => { :class => 'line-num' },
                            :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
               end
-              def test_show_text_file_should_strip_non_utf8_content
+              def test_show_text_file_replcace_cannot_convert_content
                 set_tmp_attachments_directory
-                a = Attachment.new(:container => Issue.find(1),
+                with_settings :repositories_encodings => 'UTF-8' do
-                                   :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
+                  a = Attachment.new(:container => Issue.find(1),
-                                   :author => User.find(1))
+                                     :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
-                assert a.save
+                                     :author => User.find(1))
-                assert_equal 'iso8859-1.txt', a.filename
+                  assert a.save
+                  assert_equal 'iso8859-1.txt', a.filename
-                get :show, :id => a.id
-                assert_response :success
+                  get :show, :id => a.id
-                assert_template 'file'
+                  assert_response :success
-                assert_equal 'text/html', @response.content_type
+                  assert_template 'file'
-                assert_tag :tag => 'th',
+                  assert_equal 'text/html', @response.content_type
-                           :content => '7',
+                  assert_tag :tag => 'th',
-                           :attributes => { :class => 'line-num' },
+                             :content => '7',
-                           :sibling => { :tag => 'td', :content => /Demande cre avec succs/ }
+                             :attributes => { :class => 'line-num' },
+                             :sibling => { :tag => 'td', :content => /Demande cr\?\?e avec succ\?s/ }
+                  end
               end
               def test_show_text_file_should_send_if_too_big
                 Setting.file_max_size_displayed = 512
                 Attachment.find(4).update_attribute :filesize, 754.kilobyte
                 get :show, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
               end
               def test_show_other
                 get :show, :id => 6
                 assert_response :success
                 assert_equal 'application/octet-stream', @response.content_type
               end
               def test_show_file_from_private_issue_without_permission
                 get :show, :id => 15
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2F15'
               end
               def test_show_file_from_private_issue_with_permission
                 @request.session[:user_id] = 2
                 get :show, :id => 15
                 assert_response :success
                 assert_tag 'h2', :content => /private.diff/
               end
               def test_download_text_file
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
               end
               def test_download_should_assign_content_type_if_blank
                 Attachment.find(4).update_attribute(:content_type, '')
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'text/x-ruby', @response.content_type
               end
               def test_download_missing_file
                 get :download, :id => 2
                 assert_response 404
               end
               def test_anonymous_on_private_private
                 get :download, :id => 7
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdownload%2F7'
               end
               def test_destroy_issue_attachment
                 issue = Issue.find(3)
                 @request.session[:user_id] = 2
                 assert_difference 'issue.attachments.count', -1 do
                   post :destroy, :id => 1
                 end
                 # no referrer
                 assert_redirected_to '/projects/ecookbook'
                 assert_nil Attachment.find_by_id(1)
                 j = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal 'attachment', j.details.first.property
                 assert_equal '1', j.details.first.prop_key
                 assert_equal 'error281.txt', j.details.first.old_value
               end
               def test_destroy_wiki_page_attachment
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   post :destroy, :id => 3
                   assert_response 302
                 end
               end
               def test_destroy_project_attachment
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   post :destroy, :id => 8
                   assert_response 302
                 end
               end
               def test_destroy_version_attachment
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   post :destroy, :id => 9
                   assert_response 302
                 end
               end
               def test_destroy_without_permission
                 post :destroy, :id => 3
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdestroy%2F3'
                 assert Attachment.find_by_id(3)
               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