fix(svn): fixed svn ssl support compatability. Fixes #5711

the header downgrade can be eanbled by default as it works on ssl and non ssl.
Make configuration much easier

rhodecode/apps/svn_support/templates/mod-dav-svn.conf.mako

@@ -1,95 +1,95 b''
 # Auto generated configuration for use with the Apache mod_dav_svn module.
 #
 # WARNING: Make sure your Apache instance which runs the mod_dav_svn module is
 #          only accessible by RhodeCode. Otherwise everyone is able to browse
 #          the repositories or run subversion operations (checkout/commit/etc.).
 #
 # The mod_dav_svn module does not support subversion repositories which are
 # organized in subfolders. To support the repository groups of RhodeCode it is
 # required to provide a <Location> block for each group pointing to the
 # repository group sub folder. To ease the configuration RhodeCode auto
 # generates this file whenever a repository group is created/changed/deleted.
 # Auto generation can be configured in the ini file. Settings are prefixed with
 # ``svn.proxy``.
 #
 # To include this configuration into your apache config you can use the
 # `Include` directive. See the following example snippet of a virtual host how
 # to include this configuration file.
 #
 #     <VirtualHost *:8090>
 #         ServerAdmin webmaster@localhost
 #         DocumentRoot /var/www/html
 #         ErrorLog ${'${APACHE_LOG_DIR}'}/error.log
 #         CustomLog ${'${APACHE_LOG_DIR}'}/access.log combined
 #         LogLevel info
 #         # allows custom host names, prevents 400 errors on checkout
 #         HttpProtocolOptions Unsafe
 #         # Most likely this will be: /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
 #         Include /path/to/generated/mod_dav_svn.conf
 #     </VirtualHost>
 #
 # Depending on the apache configuration you may encounter the following error if
 # you are using special characters in your repository or repository group
 # names.
 #
 #    ``Error converting entry in directory '/path/to/repo' to UTF-8``
 #
 # In this case you have to change the LANG environment variable in the apache
 # configuration. This setting is typically located at ``/etc/apache2/envvars``.
 # You have to change it to an UTF-8 value like ``export LANG="en_US.UTF-8"``.
 # After changing this a stop and start of Apache is required (using restart
 # doesn't work).
 
 # fix https -> http downgrade with DAV. It requires an header downgrade for
 # https -> http reverse proxy to work properly
 % if use_https:
 RequestHeader edit Destination ^https: http: early
 % else:
-#RequestHeader edit Destination ^https: http: early
+RequestHeader edit Destination ^https: http: early
 % endif
 
 <Location "${location_root|n}">
     # The mod_dav_svn module takes the username from the apache request object.
     # Without authorization this will be empty and no username is logged for the
     # transactions. This will result in "(no author)" for each revision. The
     # following directives implement a fake authentication that allows every
     # username/password combination.
     AuthType Basic
     AuthName "${rhodecode_realm|n}"
     AuthBasicProvider anon
     Anonymous *
     Anonymous_LogEmail off
     Require valid-user
 
     DAV svn
     SVNParentPath "${parent_path_root|n}"
     SVNListParentPath ${"On" if svn_list_parent_path else "Off"|n}
 
     # use specific SVN conf/authz file for each repository
     #AuthzSVNReposRelativeAccessFile authz
 
     Allow from all
     Order allow,deny
 </Location>
 
 % for location, parent_path in repo_group_paths:
 
 <Location "${location|n}">
     AuthType Basic
     AuthName "${rhodecode_realm|n}"
     AuthBasicProvider anon
     Anonymous *
     Anonymous_LogEmail off
     Require valid-user
 
     DAV svn
     SVNParentPath "${parent_path|n}"
     SVNListParentPath ${"On" if svn_list_parent_path else "Off"|n}
 
     # use specific SVN conf/authz file for each repository
     #AuthzSVNReposRelativeAccessFile authz
 
     Allow from all
     Order allow,deny
 </Location>
 % endfor

rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py

@@ -1,119 +1,119 b''
 # Copyright (C) 2016-2023 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # 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 Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import re
 import os
 import mock
 import pytest
 
 from rhodecode.apps.svn_support import utils
 
 
 @pytest.mark.usefixtures('config_stub')
 class TestModDavSvnConfig(object):
 
     @classmethod
     def setup_class(cls):
         cls.location_root = '/location/root/çµäö'
         cls.parent_path_root = '/parent/path/çµäö'
         cls.realm = 'Dummy Realm (äöüçµ)'
 
     @classmethod
     def get_repo_group_mocks(cls, count=1):
         repo_groups = []
         for num in range(0, count):
             full_path = f'/path/to/RepöGröúp-°µ {num}'
             repo_group_mock = mock.MagicMock()
             repo_group_mock.full_path = full_path
             repo_group_mock.full_path_splitted = full_path.split('/')
             repo_groups.append(repo_group_mock)
         return repo_groups
 
     def assert_root_location_directive(self, config):
         pattern = '<Location "{location}">'.format(
             location=self.location_root)
         assert len(re.findall(pattern, config)) == 1
 
     def assert_group_location_directive(self, config, group_path):
         pattern = '<Location "{location}{group_path}">'.format(
             location=self.location_root, group_path=group_path)
         assert len(re.findall(pattern, config)) == 1
 
     def test_render_mod_dav_svn_config(self):
         repo_groups = self.get_repo_group_mocks(count=10)
         generated_config = utils._render_mod_dav_svn_config(
             parent_path_root=self.parent_path_root,
             list_parent_path=True,
             location_root=self.location_root,
             repo_groups=repo_groups,
             realm=self.realm,
             use_ssl=True,
             template=''
         )
         # Assert that one location directive exists for each repository group.
         for group in repo_groups:
             self.assert_group_location_directive(
                 generated_config, group.full_path)
 
         # Assert that the root location directive exists.
         self.assert_root_location_directive(generated_config)
 
     def test_render_mod_dav_svn_config_with_alternative_template(self, tmpdir):
         repo_groups = self.get_repo_group_mocks(count=10)
         test_file_path = os.path.join(str(tmpdir), 'example.mako')
         with open(test_file_path, 'w') as f:
             f.write('TEST_EXAMPLE\n')
 
         generated_config = utils._render_mod_dav_svn_config(
             parent_path_root=self.parent_path_root,
             list_parent_path=True,
             location_root=self.location_root,
             repo_groups=repo_groups,
             realm=self.realm,
             use_ssl=True,
             template=test_file_path
         )
         assert 'TEST_EXAMPLE' in generated_config
 
     @pytest.mark.parametrize('list_parent_path', [True, False])
     @pytest.mark.parametrize('use_ssl', [True, False])
     def test_list_parent_path(self, list_parent_path, use_ssl):
         generated_config = utils._render_mod_dav_svn_config(
             parent_path_root=self.parent_path_root,
             list_parent_path=list_parent_path,
             location_root=self.location_root,
             repo_groups=self.get_repo_group_mocks(count=10),
             realm=self.realm,
             use_ssl=use_ssl,
             template=''
         )
 
         # Assert that correct configuration directive is present.
         if list_parent_path:
             assert not re.search(r'SVNListParentPath\s+Off', generated_config)
             assert re.search(r'SVNListParentPath\s+On', generated_config)
         else:
             assert re.search(r'SVNListParentPath\s+Off', generated_config)
             assert not re.search(r'SVNListParentPath\s+On', generated_config)
 
         if use_ssl:
             assert 'RequestHeader edit Destination ^https: http: early' \
                    in generated_config
         else:
-            assert '#RequestHeader edit Destination ^https: http: early' \
+            assert 'RequestHeader edit Destination ^https: http: early' \
                    in generated_config