Merge stable

kallithea/lib/paster_commands/setup_db.py

@@ -102,3 +102,5 b' class Command(BasePasterCommand):'
         dbmanage.create_permissions()
         dbmanage.populate_default_permissions()
         Session().commit()
+
+        print 'Database set up successfully.'

kallithea/lib/vcs/backends/git/repository.py

@@ -587,8 +587,30 b' class GitRepository(BaseRepository):'
         :param ignore_whitespace: If set to ``True``, would not show whitespace
           changes. Defaults to ``False``.
         :param context: How many lines before/after changed lines should be
-          shown. Defaults to ``3``.
+          shown. Defaults to ``3``. Due to limitations in Git, if
+          value passed-in is greater than ``2**31-1``
+          (``2147483647``), it will be set to ``2147483647``
+          instead. If negative value is passed-in, it will be set to
+          ``0`` instead.
         """
+
+        # Git internally uses a signed long int for storing context
+        # size (number of lines to show before and after the
+        # differences). This can result in integer overflow, so we
+        # ensure the requested context is smaller by one than the
+        # number that would cause the overflow. It is highly unlikely
+        # that a single file will contain that many lines, so this
+        # kind of change should not cause any realistic consequences.
+        overflowed_long_int = 2**31
+
+        if context >= overflowed_long_int:
+            context = overflowed_long_int - 1
+
+        # Negative context values make no sense, and will result in
+        # errors. Ensure this does not happen.
+        if context < 0:
+            context = 0
+
         flags = ['-U%s' % context, '--full-index', '--binary', '-p', '-M', '--abbrev=40']
         if ignore_whitespace:
             flags.append('-w')

kallithea/lib/vcs/backends/hg/repository.py

@@ -243,8 +243,15 b' class MercurialRepository(BaseRepository'
         :param ignore_whitespace: If set to ``True``, would not show whitespace
           changes. Defaults to ``False``.
         :param context: How many lines before/after changed lines should be
-          shown. Defaults to ``3``.
+          shown. Defaults to ``3``. If negative value is passed-in, it will be
+          set to ``0`` instead.
         """
+
+        # Negative context values make no sense, and will result in
+        # errors. Ensure this does not happen.
+        if context < 0:
+            context = 0
+
         if hasattr(rev1, 'raw_id'):
             rev1 = getattr(rev1, 'raw_id')
 

kallithea/public/images/manifest.json

@@ -15,4 +15,4 b''
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
     "display": "standalone"
-}
  No newline at end of file
+}

kallithea/tests/functional/test_login.py

@@ -144,6 +144,13 b' class TestLoginController(TestController'
 
         response.mustcontain('Invalid username or password')
 
+    def test_login_non_ascii(self):
+        response = self.app.post(url(controller='login', action='index'),
+                                 {'username': TEST_USER_REGULAR_LOGIN,
+                                  'password': 'blåbærgrød'})
+
+        response.mustcontain('>Invalid username or password<')
+
     # verify that get arguments are correctly passed along login redirection
 
     @parametrize('args,args_encoded', [

kallithea/tests/vcs/test_git.py

@@ -709,6 +709,46 b' class TestGitSpecificWithRepo(_BackendTe'
             ['diff', '-U3', '--full-index', '--binary', '-p', '-M', '--abbrev=40',
              self.repo._get_revision(0), self.repo._get_revision(1), '--', 'foo'])
 
+    def test_get_diff_does_not_sanitize_valid_context(self):
+        almost_overflowed_long_int = 2**31-1
+
+        self.repo.run_git_command = mock.Mock(return_value=['', ''])
+        self.repo.get_diff(0, 1, 'foo', context=almost_overflowed_long_int)
+        self.repo.run_git_command.assert_called_once_with(
+            ['diff', '-U' + str(almost_overflowed_long_int), '--full-index', '--binary', '-p', '-M', '--abbrev=40',
+             self.repo._get_revision(0), self.repo._get_revision(1), '--', 'foo'])
+
+    def test_get_diff_sanitizes_overflowing_context(self):
+        overflowed_long_int = 2**31
+        sanitized_overflowed_long_int = overflowed_long_int-1
+
+        self.repo.run_git_command = mock.Mock(return_value=['', ''])
+        self.repo.get_diff(0, 1, 'foo', context=overflowed_long_int)
+
+        self.repo.run_git_command.assert_called_once_with(
+            ['diff', '-U' + str(sanitized_overflowed_long_int), '--full-index', '--binary', '-p', '-M', '--abbrev=40',
+             self.repo._get_revision(0), self.repo._get_revision(1), '--', 'foo'])
+
+    def test_get_diff_does_not_sanitize_zero_context(self):
+        zero_context = 0
+
+        self.repo.run_git_command = mock.Mock(return_value=['', ''])
+        self.repo.get_diff(0, 1, 'foo', context=zero_context)
+
+        self.repo.run_git_command.assert_called_once_with(
+            ['diff', '-U' + str(zero_context), '--full-index', '--binary', '-p', '-M', '--abbrev=40',
+             self.repo._get_revision(0), self.repo._get_revision(1), '--', 'foo'])
+
+    def test_get_diff_sanitizes_negative_context(self):
+        negative_context = -10
+
+        self.repo.run_git_command = mock.Mock(return_value=['', ''])
+        self.repo.get_diff(0, 1, 'foo', context=negative_context)
+
+        self.repo.run_git_command.assert_called_once_with(
+            ['diff', '-U0', '--full-index', '--binary', '-p', '-M', '--abbrev=40',
+             self.repo._get_revision(0), self.repo._get_revision(1), '--', 'foo'])
+
 
 class TestGitRegression(_BackendTestMixin):
     backend_alias = 'git'

kallithea/tests/vcs/test_hg.py

@@ -1,6 +1,7 b''
 import os
 
 import pytest
+import mock
 
 from kallithea.lib.utils2 import safe_str
 from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset
@@ -236,6 +237,23 b' TODO: To be written...'
         assert node.kind == NodeKind.FILE
         assert node.content == readme
 
+    @mock.patch('kallithea.lib.vcs.backends.hg.repository.diffopts')
+    def test_get_diff_does_not_sanitize_zero_context(self, mock_diffopts):
+        zero_context = 0
+
+        self.repo.get_diff(0, 1, 'foo', context=zero_context)
+
+        mock_diffopts.assert_called_once_with(git=True, showfunc=True, ignorews=False, context=zero_context)
+
+    @mock.patch('kallithea.lib.vcs.backends.hg.repository.diffopts')
+    def test_get_diff_sanitizes_negative_context(self, mock_diffopts):
+        negative_context = -10
+        zero_context = 0
+
+        self.repo.get_diff(0, 1, 'foo', context=negative_context)
+
+        mock_diffopts.assert_called_once_with(git=True, showfunc=True, ignorews=False, context=zero_context)
+
 
 class TestMercurialChangeset(object):