svn: Move path computation from themplate to python.

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

@@ -1,64 +1,65 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.
 #
 # 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 *:8080>
 #         ServerAdmin webmaster@localhost
 #         DocumentRoot /var/www/html
 #         ErrorLog ${'${APACHE_LOG_DIR}'}/error.log
 #         CustomLog ${'${APACHE_LOG_DIR}'}/access.log combined
 #         Include /path/to/generated/mod_dav_svn.conf
 #     </VirtualHost>
 
 
 <Location ${location_root}>
     # 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 "Subversion proxy"
     AuthBasicProvider anon
     Anonymous *
     Require valid-user
 
     DAV svn
     SVNParentPath ${parent_path_root}
     SVNListParentPath ${'On' if svn_list_parent_path else 'Off'}
 
     Allow from all
     Order allow,deny
 </Location>
 
-% for repo_group in repo_groups:
-<Location ${location_root_stripped}${repo_group.full_path}>
+% for location, parent_path in repo_group_paths:
+
+<Location ${location}>
     AuthType Basic
     AuthName "Subversion proxy"
     AuthBasicProvider anon
     Anonymous *
     Require valid-user
 
     DAV svn
-    SVNParentPath ${parent_path_root_stripped}${repo_group.full_path}
+    SVNParentPath ${parent_path}
     SVNListParentPath ${'On' if svn_list_parent_path else 'Off'}
 
     Allow from all
     Order allow,deny
 </Location>
 % endfor

rhodecode/svn_support/utils.py

@@ -1,55 +1,62 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2016  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 os
 
 from pyramid.renderers import render
 
 from rhodecode.model.db import RepoGroup
 from . import config_keys
 
 
 def generate_mod_dav_svn_config(settings):
     """
     Generate the configuration file for use with subversion's mod_dav_svn
     module. The configuration has to contain a <Location> block for each
     available repository group because the mod_dav_svn module does not support
     repositories organized in sub folders.
     """
     filepath = settings[config_keys.config_file_path]
     parent_path_root = settings[config_keys.parent_path_root]
     list_parent_path = settings[config_keys.list_parent_path]
     location_root = settings[config_keys.location_root]
 
-    # Render the configuration to string.
-    template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
+    # Prepare render context.
+    repo_group_paths = []
+    for repo_group in RepoGroup.get_all_repo_groups():
+        group_path = repo_group.full_path_splitted
+        location = os.path.join(location_root, *group_path)
+        parent_path = os.path.join(parent_path_root, *group_path)
+        repo_group_paths.append((location, parent_path))
+
     context = {
         'location_root': location_root,
-        'location_root_stripped': location_root.rstrip(os.path.sep),
         'parent_path_root': parent_path_root,
-        'parent_path_root_stripped': parent_path_root.rstrip(os.path.sep),
-        'repo_groups': RepoGroup.get_all_repo_groups(),
+        'repo_group_paths': repo_group_paths,
         'svn_list_parent_path': list_parent_path,
     }
+
+    # Render the configuration template to string.
+    template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
     mod_dav_svn_config = render(template, context)
 
     # Write configuration to file.
     with open(filepath, 'w') as file_:
         file_.write(mod_dav_svn_config)