##// END OF EJS Templates
svn-support: Use utf-8 to encode mod_dav_svn configuration before writing to disk....
Martin Bornhold -
r830:7ca2d1db default
parent child Browse files
Show More
@@ -1,86 +1,88 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2016-2016 RhodeCode GmbH
3 # Copyright (C) 2016-2016 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21 import codecs
21 import logging
22 import logging
22 import os
23 import os
23
24
24 from pyramid.renderers import render
25 from pyramid.renderers import render
25
26
26 from rhodecode.lib.utils import get_rhodecode_realm
27 from rhodecode.lib.utils import get_rhodecode_realm
27 from rhodecode.model.db import RepoGroup
28 from rhodecode.model.db import RepoGroup
28 from rhodecode.model.settings import SettingsModel
29 from rhodecode.model.settings import SettingsModel
29 from . import config_keys
30 from . import config_keys
30
31
31
32
32 log = logging.getLogger(__name__)
33 log = logging.getLogger(__name__)
33
34
34
35
35 def generate_mod_dav_svn_config(settings):
36 def generate_mod_dav_svn_config(settings):
36 """
37 """
37 Generate the configuration file for use with subversion's mod_dav_svn
38 Generate the configuration file for use with subversion's mod_dav_svn
38 module. The configuration has to contain a <Location> block for each
39 module. The configuration has to contain a <Location> block for each
39 available repository group because the mod_dav_svn module does not support
40 available repository group because the mod_dav_svn module does not support
40 repositories organized in sub folders.
41 repositories organized in sub folders.
41 """
42 """
42 parent_path_root = SettingsModel().get_ui_by_section_and_key(
43 parent_path_root = SettingsModel().get_ui_by_section_and_key(
43 'paths', '/').ui_value
44 'paths', '/').ui_value
44 config = _render_mod_dav_svn_config(
45 config = _render_mod_dav_svn_config(
45 parent_path_root=parent_path_root,
46 parent_path_root=parent_path_root,
46 list_parent_path=settings[config_keys.list_parent_path],
47 list_parent_path=settings[config_keys.list_parent_path],
47 location_root=settings[config_keys.location_root],
48 location_root=settings[config_keys.location_root],
48 repo_groups=RepoGroup.get_all_repo_groups())
49 repo_groups=RepoGroup.get_all_repo_groups())
49 _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
50 _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
50
51
51
52
52 def _render_mod_dav_svn_config(
53 def _render_mod_dav_svn_config(
53 parent_path_root, list_parent_path, location_root, repo_groups):
54 parent_path_root, list_parent_path, location_root, repo_groups):
54 """
55 """
55 Render mod_dav_svn configuration to string.
56 Render mod_dav_svn configuration to string.
56 """
57 """
57 repo_group_paths = []
58 repo_group_paths = []
58 for repo_group in repo_groups:
59 for repo_group in repo_groups:
59 group_path = repo_group.full_path_splitted
60 group_path = repo_group.full_path_splitted
60 location = os.path.join(location_root, *group_path)
61 location = os.path.join(location_root, *group_path)
61 parent_path = os.path.join(parent_path_root, *group_path)
62 parent_path = os.path.join(parent_path_root, *group_path)
62 repo_group_paths.append((location, parent_path))
63 repo_group_paths.append((location, parent_path))
63
64
64 context = {
65 context = {
65 'location_root': location_root,
66 'location_root': location_root,
66 'parent_path_root': parent_path_root,
67 'parent_path_root': parent_path_root,
67 'repo_group_paths': repo_group_paths,
68 'repo_group_paths': repo_group_paths,
68 'svn_list_parent_path': list_parent_path,
69 'svn_list_parent_path': list_parent_path,
69 'rhodecode_realm': get_rhodecode_realm(),
70 'rhodecode_realm': get_rhodecode_realm(),
70 }
71 }
71
72
72 # Render the configuration template to string.
73 # Render the configuration template to string.
73 template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
74 template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
74 return render(template, context)
75 return render(template, context)
75
76
76
77
77 def _write_mod_dav_svn_config(config, filepath):
78 def _write_mod_dav_svn_config(config, filepath):
78 """
79 """
79 Write mod_dav_svn config to file. Log on exceptions but do not raise.
80 Write mod_dav_svn config to file. Log on exceptions but do not raise.
80 """
81 """
81 try:
82 try:
82 with open(filepath, 'w') as file_:
83 with codecs.open(filepath, 'w', encoding='utf-8') as f:
83 file_.write(config)
84 f.write(config)
84 except Exception:
85 except Exception:
85 log.exception(
86 log.exception(
86 'Can not write mod_dav_svn configuration to "%s"', filepath)
87 'Exception while writing mod_dav_svn configuration to '
88 '"%s"', filepath)
General Comments 0
You need to be logged in to leave comments. Login now