jro_apps/redmine Commit - r4484:488285e12321

Strip non utf8 content when displaying diff (ruby1.9 compatibility)....

Jean-Philippe Lang -

r4484:488285e12321

parent child

Context file:

r4484:488285e12321

Collapse all files

test/fixtures/files/060719210727_changeset_utf8.diff created 644 +13 0

@@ -0,0 +1,13
	1	Index: trunk/app/controllers/issues_controller.rb
	2	===================================================================
	3	--- trunk/app/controllers/issues_controller.rb (révision 1483)
	4	+++ trunk/app/controllers/issues_controller.rb (révision 1484)
	5	@@ -149,7 +149,7 @@
	6	attach_files(@issue, params[:attachments])
	7	flash[:notice] = 'Demande créée avec succès'
	8	Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
	9	- redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project
	10	+ redirect_to :controller => 'issues', :action => 'show', :id => @issue
	11	return
	12	end
	13	end

app/helpers/attachments_helper.rb +7 -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.
             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)
-                str
+                return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+                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
             end

app/views/common/_diff.rhtml +2 -2

             <% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
             <% diff.each do |table_file| -%>
             <div class="autoscroll">
             <% if diff_type == 'sbs' -%>
             <table class="filecontent">
             <thead>
-            <tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
+            <tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
             </thead>
             <tbody>
             <% prev_line_left, prev_line_right = nil, nil -%>
             <% table_file.keys.sort.each do |key| -%>
             <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
             <tr class="spacing">
             <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
             <% end -%>
             <tr>
               <th class="line-num"><%= table_file[key].nb_line_left %></th>
               <td class="line-code <%= table_file[key].type_diff_left %>">
                 <pre><%=to_utf8 table_file[key].line_left %></pre>
               </td>
               <th class="line-num"><%= table_file[key].nb_line_right %></th>
               <td class="line-code <%= table_file[key].type_diff_right %>">
                 <pre><%=to_utf8 table_file[key].line_right %></pre>
               </td>
             </tr>
             <% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
             <% end -%>
             </tbody>
             </table>
             <% else -%>
             <table class="filecontent syntaxhl">
             <thead>
-            <tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
+            <tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
             </thead>
             <tbody>
             <% prev_line_left, prev_line_right = nil, nil -%>
             <% table_file.keys.sort.each do |key, line| %>
             <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
             <tr class="spacing">
             <th class="line-num">...</th><th class="line-num">...</th><td></td>
             </tr>
             <% end -%>
             <tr>
               <th class="line-num"><%= table_file[key].nb_line_left %></th>
               <th class="line-num"><%= table_file[key].nb_line_right %></th>
               <% if table_file[key].line_left.empty? -%>
               <td class="line-code <%= table_file[key].type_diff_right %>">
                 <pre><%=to_utf8 table_file[key].line_right %></pre>
               </td>
               <% else -%>
               <td class="line-code <%= table_file[key].type_diff_left %>">
                 <pre><%=to_utf8 table_file[key].line_left %></pre>
               </td>
               <% end -%>
             </tr>
             <% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
             <% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
             <% end -%>
             </tbody>
             </table>
             <% end -%>
             </div>
             <% end -%>
             <%= l(:text_diff_truncated) if diff.truncated? %>

test/fixtures/attachments.yml +14 -2

             ---
             attachments_001:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_error281.txt
               container_id: 3
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 1
               container_type: Issue
               filesize: 28
               filename: error281.txt
               author_id: 2
             attachments_002:
               created_on: 2007-01-27 15:08:27 +01:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_document.txt
               container_id: 1
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 2
               container_type: Document
               filesize: 28
               filename: document.txt
               author_id: 2
             attachments_003:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: image/gif
               disk_filename: 060719210727_logo.gif
               container_id: 4
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 3
               container_type: WikiPage
               filesize: 280
               filename: logo.gif
               description: This is a logo
               author_id: 2
             attachments_004:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
               disk_filename: 060719210727_source.rb
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 4
               filesize: 153
               filename: source.rb
               author_id: 2
               description: This is a Ruby source file
               content_type: application/x-ruby
             attachments_005:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
-              disk_filename: 060719210727_changeset.diff
+              disk_filename: 060719210727_changeset_iso8859-1.diff
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 5
               filesize: 687
-              filename: changeset.diff
+              filename: changeset_iso8859-1.diff
               author_id: 2
               content_type: text/x-diff
             attachments_006:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
               disk_filename: 060719210727_archive.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 6
               filesize: 157
               filename: archive.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_007:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 4
               downloads: 0
               disk_filename: 060719210727_archive.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 7
               filesize: 157
               filename: archive.zip
               author_id: 1
               content_type: application/octet-stream
             attachments_008:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Project
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_project_file.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 8
               filesize: 320
               filename: project_file.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_009:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Version
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_version_file.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 9
               filesize: 452
               filename: version_file.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_010:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 2
               downloads: 0
               disk_filename: 060719210727_picture.jpg
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 10
               filesize: 452
               filename: picture.jpg
               author_id: 2
               content_type: image/jpeg
             attachments_011:
               created_on: 2007-02-12 15:08:27 +01:00
               container_type: Document
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_picture.jpg
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 11
               filesize: 452
               filename: picture.jpg
               author_id: 2
               content_type: image/jpeg
             attachments_012:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Version
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_version_file.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 12
               filesize: 452
               filename: version_file.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_013:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Message
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_foo.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 13
               filesize: 452
               filename: foo.zip
               author_id: 2
               content_type: application/octet-stream
+            attachments_014:
+              created_on: 2006-07-19 21:07:27 +02:00
+              container_type: Issue
+              container_id: 3
+              downloads: 0
+              disk_filename: 060719210727_changeset_utf8.diff
+              digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+              id: 14
+              filesize: 687
+              filename: changeset_utf8.diff
+              author_id: 2
+              content_type: text/x-diff

test/fixtures/files/060719210727_changeset_iso8859-1.diff ~~test/fixtures/files/060719210727_changeset.diff~~ renamed +3 -3

             Index: trunk/app/controllers/issues_controller.rb
             ===================================================================
             --- trunk/app/controllers/issues_controller.rb	(r�vision 1483)
             +++ trunk/app/controllers/issues_controller.rb	(r�vision 1484)
             @@ -149,7 +149,7 @@
                      attach_files(@issue, params[:attachments])
-                     flash[:notice] = l(:notice_successful_create)
+                     flash[:notice] = 'Demande cr��e avec succ�s'
                      Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
             -        redirect_to :controller => 'issues', :action => 'show', :id => @issue,  :project_id => @project
             +        redirect_to :controller => 'issues', :action => 'show', :id => @issue
                      return
                    end
                  end

test/functional/attachments_controller_test.rb +26 -3

-            # redMine - project management software
+            # encoding: utf-8
-            # Copyright (C) 2006-2008  Jean-Philippe Lang
+            # 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
-                get :show, :id => 5
+                get :show, :id => 14 # 060719210727_changeset_utf8.diff
+                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
+              def test_show_diff_should_strip_non_utf8_content
+                get :show, :id => 5 # 060719210727_changeset_iso8859-1.diff
                 assert_response :success
                 assert_template 'diff'
                 assert_equal 'text/html', @response.content_type
+                assert_tag 'th',
+                  :attributes => {:class => /filename/},
+                  :content => /issues_controller.rb\t\(rvision 1484\)/
+                assert_tag 'td',
+                  :attributes => {:class => /line-code/},
+                  :content => /Demande cre avec succs/
               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_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_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