jro_apps/redmine Commit - r7608:4ae7f82f3ae1

do not annotate text files which exceed the size limit for viewing (#9484)...

Toshi MARUYAMA -

r7608:4ae7f82f3ae1

parent child

Context file:

r7608:4ae7f82f3ae1

app/controllers/repositories_controller.rb +10 -1

@@ -172,7 +172,16 class RepositoriesController < ApplicationController
172	(show_error_not_found; return) unless @entry	172	(show_error_not_found; return) unless @entry
173		173
174	@annotate = @repository.scm.annotate(@path, @rev)	174	@annotate = @repository.scm.annotate(@path, @rev)
175	(~~render_error~~ l(~~:error_scm_annotate~~); ~~return~~) if @annotate.nil? \|\| @annotate.empty?	175	if @annotate.nil? \|\| @annotate.empty?
		176	(render_error l(:error_scm_annotate); return)
		177	end
		178	ann_buf_size = 0
		179	@annotate.lines.each do \|buf\|
		180	ann_buf_size += buf.size
		181	end
		182	if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte
		183	(render_error l(:error_scm_annotate_big_text_file); return)
		184	end
176	@changeset = @repository.find_changeset_by_name(@rev)	185	@changeset = @repository.find_changeset_by_name(@rev)
177	end	186	end
178		187

config/locales/en-GB.yml +1 0

               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: %{value}"
               error_scm_annotate: "The entry does not exist or cannot be annotated."
+              error_scm_annotate_big_text_file: "The entry cannot be annotated, as it exceeds the maximum text file size."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'

config/locales/en.yml +1 0

               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: %{value}"
               error_scm_annotate: "The entry does not exist or cannot be annotated."
+              error_scm_annotate_big_text_file: "The entry cannot be annotated, as it exceeds the maximum text file size."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'

config/locales/es.yml +1 0

               error_can_t_load_default_data: "No se ha podido cargar la configuración por defecto: %{value}"
               error_issue_not_found_in_project: 'La petición no se encuentra o no está asociada a este proyecto'
               error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
+              error_scm_annotate_big_text_file: "La entrada no puede anotarse, al superar el tamaño máximo para ficheros de texto."
               error_scm_command_failed: "Se produjo un error al acceder al repositorio: %{value}"
               error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
               field_account: Cuenta

test/functional/repositories_git_controller_test.rb +13 0

@@ -354,6 +354,19 class RepositoriesGitControllerTest < ActionController::TestCase
354	:content => /cannot be annotated/	354	:content => /cannot be annotated/
355	end	355	end
356		356
		357	def test_annotate_error_when_too_big
		358	with_settings :file_max_size_displayed => 1 do
		359	get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb'], :rev => 'deff712f'
		360	assert_response 500
		361	assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
		362	:content => /exceeds the maximum text file size/
		363
		364	get :annotate, :id => PRJ_ID, :path => ['README'], :rev => '7234cb2'
		365	assert_response :success
		366	assert_template 'annotate'
		367	end
		368	end
		369
357	def test_annotate_latin_1	370	def test_annotate_latin_1
358	if @ruby19_non_utf8_pass	371	if @ruby19_non_utf8_pass
359	puts_ruby19_non_utf8_pass()	372	puts_ruby19_non_utf8_pass()

General Comments 0

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

No TODOs yet

	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