@@ -148,7 +147,7 @@
|
|
-
+
${wiki_to_oneliner(chgset_context, change.message, shorten=True)}
diff --git a/trac/versioncontrol/templates/revisionlog.txt b/trac/versioncontrol/templates/revisionlog.txt
--- a/trac/versioncontrol/templates/revisionlog.txt
+++ b/trac/versioncontrol/templates/revisionlog.txt
@@ -8,8 +8,10 @@
{% with change = changes[item.rev]; extra = extra_changes[item.rev] %}\
${http_date(change.date)} ${format_author(change.author)} [$item.rev]
{% for idx, file in enumerate(extra.files) %}\
+{% if 'FILE_VIEW' in perm(context('source', file, version=change.rev, parent=repos_resource).resource) %}\
* $file (${dict(edit='modified', add='added', delete='deleted',
copy='copied', move='moved')[extra.actions[idx]]})
+{% end %}\
{% end %}\
${verbose and extra.message or shorten_line(extra.message)}
diff --git a/trac/versioncontrol/tests/api.py b/trac/versioncontrol/tests/api.py
--- a/trac/versioncontrol/tests/api.py
+++ b/trac/versioncontrol/tests/api.py
@@ -22,7 +22,7 @@
def setUp(self):
self.repo_base = Repository('testrepo', {'name': 'testrepo', 'id': 1},
- None, None)
+ None)
def test_raise_NotImplementedError_close(self):
self.failUnlessRaises(NotImplementedError, self.repo_base.close)
diff --git a/trac/versioncontrol/tests/cache.py b/trac/versioncontrol/tests/cache.py
--- a/trac/versioncontrol/tests/cache.py
+++ b/trac/versioncontrol/tests/cache.py
@@ -44,13 +44,13 @@
raise NoSuchChangeset(rev)
repos = Mock(Repository, 'test-repos', {'name': 'test-repos', 'id': 1},
- None, self.log,
+ self.log,
get_changeset=no_changeset,
get_oldest_rev=lambda: 1,
get_youngest_rev=lambda: 0,
normalize_rev=no_changeset,
next_rev=lambda x: None)
- cache = CachedRepository(self.env, repos, None, self.log)
+ cache = CachedRepository(self.env, repos, self.log)
cache.sync()
cursor = self.db.cursor()
@@ -69,13 +69,13 @@
Mock(Changeset, 1, 'Import', 'joe', t2,
get_changes=lambda: iter(changes))]
repos = Mock(Repository, 'test-repos', {'name': 'test-repos', 'id': 1},
- None, self.log,
+ self.log,
get_changeset=lambda x: changesets[int(x)],
get_oldest_rev=lambda: 0,
get_youngest_rev=lambda: 1,
normalize_rev=lambda x: x,
next_rev=lambda x: int(x) == 0 and 1 or None)
- cache = CachedRepository(self.env, repos, None, self.log)
+ cache = CachedRepository(self.env, repos, self.log)
cache.sync()
cursor = self.db.cursor()
@@ -114,13 +114,13 @@
changeset = Mock(Changeset, 2, 'Update', 'joe', t3,
get_changes=lambda: iter(changes))
repos = Mock(Repository, 'test-repos', {'name': 'test-repos', 'id': 1},
- None, self.log,
+ self.log,
get_changeset=lambda x: changeset,
get_youngest_rev=lambda: 2,
get_oldest_rev=lambda: 0,
normalize_rev=lambda x: x,
next_rev=lambda x: x and int(x) == 1 and 2 or None)
- cache = CachedRepository(self.env, repos, None, self.log)
+ cache = CachedRepository(self.env, repos, self.log)
cache.sync()
cursor = self.db.cursor()
@@ -152,13 +152,13 @@
"WHERE id=1 AND name='youngest_rev'")
repos = Mock(Repository, 'test-repos', {'name': 'test-repos', 'id': 1},
- None, self.log,
+ self.log,
get_changeset=lambda x: None,
get_youngest_rev=lambda: 1,
get_oldest_rev=lambda: 0,
next_rev=lambda x: None,
normalize_rev=lambda rev: rev)
- cache = CachedRepository(self.env, repos, None, self.log)
+ cache = CachedRepository(self.env, repos, self.log)
self.assertEqual('1', cache.youngest_rev)
changeset = cache.get_changeset(1)
self.assertEqual('joe', changeset.author)
diff --git a/trac/versioncontrol/tests/svn_authz.py b/trac/versioncontrol/tests/svn_authz.py
--- a/trac/versioncontrol/tests/svn_authz.py
+++ b/trac/versioncontrol/tests/svn_authz.py
@@ -1,221 +1,268 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010 Edgewall Software
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.org/wiki/TracLicense.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://trac.edgewall.org/log/.
+
+import os.path
+import tempfile
import unittest
-import sys
-def tests():
- """
- Subversion Authz File Permissions
- =================================
-
- Setup code
- ----------
- We'll use the ``make_auth`` method to create Authorizer objects
- for testing the use of authz files. ``make_auth`` takes a module name
- and a string for the authz configuration contents.
-
- >>> from trac.versioncontrol.svn_authz import RealSubversionAuthorizer
- >>> from StringIO import StringIO
- >>> make_auth = lambda mod, cfg: RealSubversionAuthorizer(None,
- ... 'user', mod, None, StringIO(cfg))
-
-
- Simple operation
- ----------------
- Returns 1 if no path is given:
- >>> int(make_auth('', '').has_permission(None))
- 1
-
- By default read permission is not enabled:
- >>> int(make_auth('', '').has_permission('/'))
- 0
-
- Read and Write Permissions
- ----------------------
- Trac is only concerned about read permissions.
- >>> a = make_auth('', '''
- ... [/readonly]
- ... user = r
- ... [/writeonly]
- ... user = w
- ... [/readwrite]
- ... user = rw
- ... [/empty]
- ... user =
- ... ''')
-
- Permissions of 'r' or 'rw' will allow access:
- >>> int(a.has_permission('/readonly'))
- 1
- >>> int(a.has_permission('/readwrite'))
- 1
-
- If only 'w' permission is given, Trac does not allow access:
- >>> int(a.has_permission('/writeonly'))
- 0
-
- And an empty permission does not give access:
- >>> int(a.has_permission('/empty'))
- 0
-
- Trailing Slashes
- ----------------
- Checks all combinations of trailing slashes in the configuration
- or in the path parameter:
- >>> a = make_auth('', '''
- ... [/a]
- ... user = r
- ... [/b/]
- ... user = r
- ... ''')
- >>> int(a.has_permission('/a'))
- 1
- >>> int(a.has_permission('/a/'))
- 1
- >>> int(a.has_permission('/b'))
- 1
- >>> int(a.has_permission('/b/'))
- 1
-
-
- Module Usage
- ------------
- If a module name is specified, the rules used are specific to the module.
- >>> a = make_auth('module', '''
- ... [module:/a]
- ... user = r
- ... [other:/b]
- ... user = r
- ... ''')
- >>> int(a.has_permission('/a'))
- 1
- >>> int(a.has_permission('/b'))
- 0
-
- If a module is specified, but the configuration contains a non-module
- path, the non-module path can still apply:
- >>> int(make_auth('module', '''
- ... [/a]
- ... user = r
- ... ''').has_permission('/a'))
- 1
-
- However, the module-specific rule will take precedence if both exist:
- >>> int(make_auth('module', '''
- ... [module:/a]
- ... user =
- ... [/a]
- ... user = r
- ... ''').has_permission('/a'))
- 0
-
-
- Groups and Wildcards
- --------------------
- Authz provides a * wildcard for matching any user:
- >>> int(make_auth('', '''
- ... [/a]
- ... * = r
- ... ''').has_permission('/a'))
- 1
-
- Groups are specified in a separate section and used with an @ prefix:
- >>> int(make_auth('', '''
- ... [groups]
- ... grp = user
- ... [/a]
- ... @grp = r
- ... ''').has_permission('/a'))
- 1
+from trac.resource import Resource
+from trac.test import EnvironmentStub
+from trac.util import create_file
+from trac.versioncontrol.svn_authz import AuthzPermissionPolicy, ParseError, \
+ parse
- Groups can also be members of other groups:
- >>> int(make_auth('', '''
- ... [groups]
- ... grp1 = user
- ... grp2 = @grp1
- ... [/a]
- ... @grp2 = r
- ... ''').has_permission('/a'))
- 1
- Groups should not be defined cyclically, but they are handled appropriately
- to avoid infinite loops:
- >>> int(make_auth('', '''
- ... [groups]
- ... grp1 = @grp2
- ... grp2 = @grp3
- ... grp3 = @grp1, user
- ... [/a]
- ... @grp1 = r
- ... ''').has_permission('/a'))
- 1
-
- If more than one group matches at the specific path, access is granted
- if any of the group rules allow access.
- >>> a = make_auth('', '''
- ... [groups]
- ... grp1 = user
- ... grp2 = user
- ... [/a]
- ... @grp1 = r
- ... @grp2 =
- ... [/b]
- ... @grp1 =
- ... @grp2 = r
- ... ''')
- >>> int(a.has_permission('/a'))
- 1
- >>> int(a.has_permission('/b'))
- 1
-
-
- Precedence
- ----------
- Precedence is user, group, then *:
- >>> a = make_auth('', '''
- ... [groups]
- ... grp = user
- ... [/a]
- ... @grp = r
- ... user =
- ... [/b]
- ... * = r
- ... @grp =
- ... ''')
-
- User specific permission overrides the group permission:
- >>> int(a.has_permission('/a'))
- 0
-
- And group permission overrides the * permission:
- >>> int(a.has_permission('/b'))
- 0
-
- The most specific matching path takes precedence:
- >>> a = make_auth('', '''
- ... [/]
- ... * = r
- ... [/b]
- ... user =
- ... ''')
- >>> int(a.has_permission('/'))
- 1
- >>> int(a.has_permission('/a'))
- 1
- >>> int(a.has_permission('/b'))
- 0
-
- Changeset Permissions
- ---------------------
- A test should go here for the changeset permissions.
- """
+class AuthzParserTestCase(unittest.TestCase):
+
+ def test_parse_file(self):
+ authz = parse("""\
+[groups]
+developers = foo, bar
+users = @developers, &baz
+
+[aliases]
+baz = CN=Hàröld Hacker,OU=Enginéers,DC=red-bean,DC=com
+
+# Applies to all repositories
+[/]
+* = r
+
+[/trunk]
+@developers = rw
+&baz =
+@users = r
+
+[/branches]
+bar = rw
+
+# Applies only to module
+[module:/trunk]
+foo = rw
+&baz = r
+""")
+ self.assertEqual({
+ '': {
+ '/': {
+ '*': True,
+ },
+ '/trunk': {
+ 'foo': True,
+ 'bar': True,
+ u'CN=Hàröld Hacker,OU=Enginéers,DC=red-bean,DC=com': False,
+ },
+ '/branches': {
+ 'bar': True,
+ },
+ },
+ 'module': {
+ '/trunk': {
+ 'foo': True,
+ u'CN=Hàröld Hacker,OU=Enginéers,DC=red-bean,DC=com': True,
+ },
+ },
+ }, authz)
+
+ def test_parse_errors(self):
+ self.assertRaises(ParseError, parse, """\
+user = r
+
+[module:/trunk]
+user = r
+""")
+ self.assertRaises(ParseError, parse, """\
+[module:/trunk]
+user
+""")
+
+
+class AuthzPolicyTestCase(unittest.TestCase):
+
+ def setUp(self):
+ tmpdir = os.path.realpath(tempfile.gettempdir())
+ self.authz = os.path.join(tmpdir, 'trac-authz')
+ create_file(self.authz, """\
+[groups]
+group1 = user
+group2 = @group1
+
+cycle1 = @cycle2
+cycle2 = @cycle3
+cycle3 = @cycle1, user
+
+alias1 = &jekyll
+alias2 = @alias1
+
+[aliases]
+jekyll = Mr Hyde
+
+# Read / write permissions
+[/readonly]
+user = r
+[/writeonly]
+user = w
+[/readwrite]
+user = rw
+[/empty]
+user =
+
+# Trailing slashes
+[/trailing_a]
+user = r
+[/trailing_b/]
+user = r
+
+# Sub-paths
+[/sub/path]
+user = r
+
+# Module usage
+[module:/module_a]
+user = r
+[other:/module_b]
+user = r
+[/module_c]
+user = r
+[module:/module_d]
+user =
+[/module_d]
+user = r
+
+# Wildcards
+[/wildcard]
+* = r
+
+# Groups
+[/groups_a]
+@group1 = r
+[/groups_b]
+@group2 = r
+[/cyclic]
+@cycle1 = r
+
+# Precedence
+[module:/precedence_a]
+user =
+[/precedence_a]
+user = r
+[/precedence_b]
+user = r
+[/precedence_b/sub]
+user =
+[/precedence_b/sub/test]
+user = r
+[/precedence_c]
+user =
+@group1 = r
+[/precedence_d]
+@group1 = r
+user =
+
+# Aliases
+[/aliases_a]
+&jekyll = r
+[/aliases_b]
+@alias2 = r
+""")
+ self.env = EnvironmentStub(enable=[AuthzPermissionPolicy])
+ self.env.config.set('trac', 'authz_file', self.authz)
+ self.policy = AuthzPermissionPolicy(self.env)
+
+ def tearDown(self):
+ self.env.reset_db()
+ os.remove(self.authz)
+
+ def assertPermission(self, result, user, reponame, path):
+ """Assert that `user` is granted access `result` to `path` within
+ the repository `reponame`.
+ """
+ resource = Resource('source', path,
+ parent=Resource('repository', reponame))
+ check = self.policy.check_permission('FILE_VIEW', user, resource, None)
+ self.assertEqual(result, check)
+
+ def test_default_permission(self):
+ # By default, no permission is granted
+ self.assertPermission(False, 'joe', '', '/not_defined')
+ self.assertPermission(False, 'jane', 'repo', '/not/defined/either')
+
+ def test_read_write(self):
+ # Allow 'r' and 'rw' entries, deny 'w' and empty entries
+ self.assertPermission(True, 'user', '', '/readonly')
+ self.assertPermission(True, 'user', '', '/readwrite')
+ self.assertPermission(False, 'user', '', '/writeonly')
+ self.assertPermission(False, 'user', '', '/empty')
+
+ def test_trailing_slashes(self):
+ # Combinations of trailing slashes in the file and in the path
+ self.assertPermission(True, 'user', '', '/trailing_a')
+ self.assertPermission(True, 'user', '', '/trailing_a/')
+ self.assertPermission(True, 'user', '', '/trailing_b')
+ self.assertPermission(True, 'user', '', '/trailing_b/')
+
+ def test_sub_path(self):
+ # Permissions are inherited from containing directories
+ self.assertPermission(True, 'user', '', '/sub/path')
+ self.assertPermission(True, 'user', '', '/sub/path/test')
+ self.assertPermission(True, 'user', '', '/sub/path/other/sub')
+
+ def test_module_usage(self):
+ # If a module name is specified, the rules are specific to the module
+ self.assertPermission(True, 'user', 'module', '/module_a')
+ self.assertPermission(False, 'user', 'module', '/module_b')
+ # If a module is specified, but the configuration contains a non-module
+ # path, the non-module path can still apply
+ self.assertPermission(True, 'user', 'module', '/module_c')
+ # The module-specific rule takes precedence
+ self.assertPermission(False, 'user', 'module', '/module_d')
+
+ def test_wildcard(self):
+ # The * wildcard matches all users
+ self.assertPermission(True, 'joe', '', '/wildcard')
+ self.assertPermission(True, 'jane', '', '/wildcard')
+
+ def test_groups(self):
+ # Groups are specified in a separate section and used with an @ prefix
+ self.assertPermission(True, 'user', '', '/groups_a')
+ # Groups can also be members of other groups
+ self.assertPermission(True, 'user', '', '/groups_b')
+ # Groups should not be defined cyclically, but they are still handled
+ # correctly to avoid infinite loops
+ self.assertPermission(True, 'user', '', '/cyclic')
+
+ def test_precedence(self):
+ # Module-specific sections take precedence over non-module sections
+ self.assertPermission(False, 'user', 'module', '/precedence_a')
+ # The most specific section applies
+ self.assertPermission(True, 'user', '', '/precedence_b/sub/test')
+ self.assertPermission(False, 'user', '', '/precedence_b/sub')
+ self.assertPermission(True, 'user', '', '/precedence_b')
+ # Within a section, the first matching rule applies
+ self.assertPermission(False, 'user', '', '/precedence_c')
+ self.assertPermission(True, 'user', '', '/precedence_d')
+
+ def test_aliases(self):
+ # Aliases are specified in a separate section and used with an & prefix
+ self.assertPermission(True, 'Mr Hyde', '', '/aliases_a')
+ # Aliases can also be used in groups
+ self.assertPermission(True, 'Mr Hyde', '', '/aliases_b')
+
def suite():
- try:
- from doctest import DocTestSuite
- return DocTestSuite(sys.modules[__name__])
- except ImportError:
- print >> sys.stderr, "WARNING: DocTestSuite required to run these " \
- "tests"
- return unittest.TestSuite()
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(AuthzParserTestCase, 'test'))
+ suite.addTest(unittest.makeSuite(AuthzPolicyTestCase, 'test'))
+ return suite
+
if __name__ == '__main__':
runner = unittest.TextTestRunner()
diff --git a/trac/versioncontrol/tests/svn_fs.py b/trac/versioncontrol/tests/svn_fs.py
--- a/trac/versioncontrol/tests/svn_fs.py
+++ b/trac/versioncontrol/tests/svn_fs.py
@@ -87,7 +87,7 @@
def setUp(self):
self.repos = SubversionRepository(REPOS_PATH,
{'name': 'repo', 'id': 1},
- None, logger_factory('test'))
+ logger_factory('test'))
def tearDown(self):
self.repos = None
@@ -510,7 +510,7 @@
def setUp(self):
self.repos = SubversionRepository(REPOS_PATH + u'/tête',
{'name': 'repo', 'id': 1},
- None, logger_factory('test'))
+ logger_factory('test'))
def tearDown(self):
self.repos = None
@@ -760,7 +760,7 @@
def setUp(self):
self.repos = SubversionRepository(REPOS_PATH + u'/tête/dir1',
{'name': 'repo', 'id': 1},
- None, logger_factory('test'))
+ logger_factory('test'))
def tearDown(self):
self.repos = None
@@ -781,7 +781,7 @@
def setUp(self):
self.repos = SubversionRepository(REPOS_PATH + '/tags/v1',
{'name': 'repo', 'id': 1},
- None, logger_factory('test'))
+ logger_factory('test'))
def tearDown(self):
self.repos = None
@@ -800,7 +800,7 @@
def setUp(self):
self.repos = SubversionRepository(REPOS_PATH + '/branches',
{'name': 'repo', 'id': 1},
- None, logger_factory('test'))
+ logger_factory('test'))
def tearDown(self):
self.repos = None
diff --git a/trac/versioncontrol/web_ui/browser.py b/trac/versioncontrol/web_ui/browser.py
--- a/trac/versioncontrol/web_ui/browser.py
+++ b/trac/versioncontrol/web_ui/browser.py
@@ -332,7 +332,7 @@
xhr = req.get_header('X-Requested-With') == 'XMLHttpRequest'
rm = RepositoryManager(self.env)
- reponame, repos, path = rm.get_repository_by_path(path, req.authname)
+ reponame, repos, path = rm.get_repository_by_path(path)
# Repository index
all_repositories = None
@@ -480,7 +480,7 @@
if not reponame or repoinfo.get('hidden') in _TRUE_VALUES:
continue
try:
- repos = rm.get_repository(reponame, context.perm.username)
+ repos = rm.get_repository(reponame)
if repos:
youngest = repos.get_changeset(repos.youngest_rev)
if self.color_scale and youngest:
@@ -518,7 +518,11 @@
for f in entry.__slots__:
setattr(self, f, getattr(node, f))
- entries = [entry(n) for n in node.get_entries()]
+ repos_resource = Resource('repository', reponame)
+ child = repos_resource.child('source')
+ entries = [entry(n) for n in node.get_entries()
+ if 'FILE_VIEW' in req.perm(child(id=n.created_path,
+ version=n.created_rev))]
changes = get_changes(repos, [i.rev for i in entries])
if rev:
diff --git a/trac/versioncontrol/web_ui/changeset.py b/trac/versioncontrol/web_ui/changeset.py
--- a/trac/versioncontrol/web_ui/changeset.py
+++ b/trac/versioncontrol/web_ui/changeset.py
@@ -229,14 +229,13 @@
rm = RepositoryManager(self.env)
if reponame:
- repos = rm.get_repository(reponame, req.authname)
+ repos = rm.get_repository(reponame)
else:
- reponame, repos, new_path = rm.get_repository_by_path(
- new_path, req.authname)
+ reponame, repos, new_path = rm.get_repository_by_path(new_path)
if old_path:
- old_reponame, old_repos, old_path = rm.get_repository_by_path(
- old_path, req.authname)
+ old_reponame, old_repos, old_path = \
+ rm.get_repository_by_path(old_path)
if old_repos != repos:
raise TracError(_("Can't compare across different "
"repositories: %(old)s vs. %(new)s",
@@ -254,9 +253,6 @@
try:
new_path = repos.normalize_path(new_path)
new = repos.normalize_rev(new)
-
- repos.authz.assert_permission_for_changeset(new)
-
old_path = repos.normalize_path(old_path or new_path)
old = repos.normalize_rev(old or new)
except NoSuchChangeset, e:
@@ -500,18 +496,9 @@
options = data['diff']['options']
repos_resource = Resource('repository', reponame)
- def _prop_changes(old_node, new_node):
- old_source = Resource('source', old_node.created_path,
- version=old_node.created_rev,
- parent=repos_resource)
- new_source = Resource('source', new_node.created_path,
- version=new_node.created_rev,
- parent=repos_resource)
- old_props = new_props = []
- if 'FILE_VIEW' in req.perm(old_source):
- old_props = old_node.get_properties()
- if 'FILE_VIEW' in req.perm(new_source):
- new_props = new_node.get_properties()
+ def _prop_changes(old_node, old_source, new_node, new_source):
+ old_props = old_node.get_properties()
+ new_props = new_node.get_properties()
old_ctx = Context.from_request(req, old_source)
new_ctx = Context.from_request(req, new_source)
changed_properties = []
@@ -613,12 +600,21 @@
for old_node, new_node, kind, change in get_changes():
props = []
diffs = []
+ old_source = old_node and Resource('source', old_node.created_path,
+ version=old_node.created_rev,
+ parent=repos_resource)
+ new_source = new_node and Resource('source', new_node.created_path,
+ version=new_node.created_rev,
+ parent=repos_resource)
+ show_old = old_node and 'FILE_VIEW' in req.perm(old_source)
+ show_new = new_node and 'FILE_VIEW' in req.perm(new_source)
show_entry = change != Changeset.EDIT
show_diff = show_diffs or (new_node and new_node.path == annotated)
- if change in Changeset.DIFF_CHANGES and 'FILE_VIEW' in req.perm:
+ if change in Changeset.DIFF_CHANGES and show_old and show_new:
assert old_node and new_node
- props = _prop_changes(old_node, new_node)
+ props = _prop_changes(old_node, old_source, new_node,
+ new_source)
if props:
show_entry = True
if kind == Node.FILE and show_diff:
@@ -628,7 +624,7 @@
has_diffs = True
# elif None (means: manually compare to (previous))
show_entry = True
- if show_entry or not show_diff:
+ if (show_old or show_new) and (show_entry or not show_diff):
info = {'change': change,
'old': old_node and node_info(old_node, annotated),
'new': new_node and node_info(new_node, annotated),
@@ -933,7 +929,7 @@
for reponame in rm.get_all_repositories():
if all_repos or ('repo-' + reponame) in repo_filters:
try:
- repos = rm.get_repository(reponame, req.authname)
+ repos = rm.get_repository(reponame)
for event in generate_changesets(reponame, repos):
yield event
except TracError, e:
@@ -1055,9 +1051,9 @@
rev, path = chgset, '/'
reponame = rm.get_default_repository(formatter.context)
if reponame is not None:
- repos = rm.get_repository(reponame, authname)
+ repos = rm.get_repository(reponame)
else:
- reponame, repos, path = rm.get_repository_by_path(path, authname)
+ reponame, repos, path = rm.get_repository_by_path(path)
if path == '/':
path = None
@@ -1157,8 +1153,7 @@
if req.get_header('X-Requested-With') == 'XMLHttpRequest':
dirname, prefix = posixpath.split(req.args.get('q'))
prefix = prefix.lower()
- reponame, repos, path = rm.get_repository_by_path(dirname,
- req.authname)
+ reponame, repos, path = rm.get_repository_by_path(dirname)
# an entry is a (isdir, name, path) tuple
def kind_order(entry):
return (not entry[0], embedded_numbers(entry[1]))
@@ -1190,9 +1185,9 @@
# -- normalize
new_reponame, new_repos, new_path = \
- rm.get_repository_by_path(new_path, req.authname)
+ rm.get_repository_by_path(new_path)
old_reponame, old_repos, old_path = \
- rm.get_repository_by_path(old_path, req.authname)
+ rm.get_repository_by_path(old_path)
new_rev = new_repos.normalize_rev(new_rev)
old_rev = old_repos.normalize_rev(old_rev)
diff --git a/trac/versioncontrol/web_ui/log.py b/trac/versioncontrol/web_ui/log.py
--- a/trac/versioncontrol/web_ui/log.py
+++ b/trac/versioncontrol/web_ui/log.py
@@ -83,7 +83,7 @@
limit = int(req.args.get('limit') or self.default_log_limit)
reponame, repos, path = RepositoryManager(self.env).\
- get_repository_by_path(path, req.authname)
+ get_repository_by_path(path)
repos_resource = Resource('repository', reponame)
normpath = repos.normalize_path(path)
@@ -105,12 +105,14 @@
# unless explicit ranges have been specified
# * for ''show only add, delete'' we're using
# `Repository.get_path_history()`
+ cset_resource = Resource('changeset', parent=repos_resource)
if mode == 'path_history':
- def history(limit):
- for h in repos.get_path_history(path, rev, limit):
- yield h
+ def history():
+ for h in repos.get_path_history(path, rev):
+ if 'CHANGESET_VIEW' in req.perm(cset_resource(id=h[1])):
+ yield h
elif revranges:
- def history(limit):
+ def history():
prevpath = path
expected_next_item = None
ranges = list(revranges.pairs)
@@ -123,14 +125,15 @@
p, rev, chg = node_history[0]
if rev < a:
break # simply skip, no separator
- if expected_next_item:
- # check whether we're continuing previous range
- np, nrev, nchg = expected_next_item
- if rev != nrev: # no, we need a separator
- yield (np, nrev, None)
- yield node_history[0]
+ if 'CHANGESET_VIEW' in req.perm(cset_resource(id=rev)):
+ if expected_next_item:
+ # check whether we're continuing previous range
+ np, nrev, nchg = expected_next_item
+ if rev != nrev: # no, we need a separator
+ yield (np, nrev, None)
+ yield node_history[0]
prevpath = node_history[-1][0] # follow copy
- b = rev-1
+ b = rev - 1
if len(node_history) > 1:
expected_next_item = node_history[-1]
else:
@@ -138,14 +141,18 @@
if expected_next_item:
yield (expected_next_item[0], expected_next_item[1], None)
else:
- history = get_existing_node(req, repos, path, rev).get_history
+ def history():
+ node = get_existing_node(req, repos, path, rev)
+ for h in node.get_history():
+ if 'CHANGESET_VIEW' in req.perm(cset_resource(id=h[1])):
+ yield h
# -- retrieve history, asking for limit+1 results
info = []
depth = 1
previous_path = normpath
count = 0
- for old_path, old_rev, old_chg in history(limit+1):
+ for old_path, old_rev, old_chg in history():
if stop_rev and repos.rev_older_than(old_rev, stop_rev):
break
old_path = repos.normalize_path(old_path)
@@ -353,9 +360,9 @@
authname = formatter.perm.username
reponame = rm.get_default_repository(formatter.context)
if reponame is not None:
- repos = rm.get_repository(reponame, authname)
+ repos = rm.get_repository(reponame)
else:
- reponame, repos, path = rm.get_repository_by_path(path, authname)
+ reponame, repos, path = rm.get_repository_by_path(path)
revranges = None
if any(c for c in ':-,' if c in revs):
|