Fix ScmData.binary? method not to consider UTF-8 text as binary (#40020).

Patch by Go MAEDA (@maeda).

git-svn-id: https://svn.redmine.org/redmine/trunk@22664 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 23477046d8889a5e551c2042dbc2dc22573d1b59..c1464172d7820bcfa64fd0e88971559869558797 100644 (file)
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -441,7 +441,7 @@ module Redmine
       module ScmData
         def self.binary?(data)
           unless data.empty?
-            data.count("^ -~", "^\r\n").fdiv(data.size) > 0.3 || data.index("\x00")
+            data.index("\x00") || data.count("\x00-\x1f\x7f", "^\t\r\n").fdiv(data.size) > 0.1
           end
         end
       end

diff --git a/test/unit/lib/redmine/scm/adapters/scm_data_test.rb b/test/unit/lib/redmine/scm/adapters/scm_data_test.rb
new file mode 100644 (file)
index 0000000..743e66e
--- /dev/null
+++ b/test/unit/lib/redmine/scm/adapters/scm_data_test.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Redmine - project management software
+# Copyright (C) 2006-2023  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_relative '../../../../../test_helper'
+require 'redmine/scm/adapters/abstract_adapter'
+
+class ScmDataTest < ActiveSupport::TestCase
+  include Redmine::Scm::Adapters
+
+  def test_binary_with_binary_data
+    data = +"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10"
+    data.force_encoding('ASCII-8BIT')
+    assert ScmData.binary?(data)
+  end
+
+  def test_binary_with_text_data
+    data = "Flexible\nProject\tManagement\nSoftware\r\n"
+    assert_not ScmData.binary?(data)
+  end
+
+  def test_binary_with_utf8_text_should_not_be_binary
+    # full-width Latin letters ("\uFF32\uFF45\uFF44\uFF4D\uFF49\uFF4E\uFF45")
+    data = "Ｒｅｄｍｉｎｅ"
+    assert_not ScmData.binary?(data)
+  end
+
+  def test_binary_with_ascii_text_containing_0x00_should_be_binary
+    data = +"null\0"
+    assert ScmData.binary?(data)
+  end
+end