Add a default repository prefix.
Used to fail is gitosis.repositories is not set.
This commit is contained in:
parent
4f6a8b8770
commit
c1b15d3e48
2 changed files with 28 additions and 19 deletions
|
@ -77,9 +77,8 @@ def haveAccess(config, user, mode, path):
|
||||||
try:
|
try:
|
||||||
prefix = config.get('gitosis', 'repositories')
|
prefix = config.get('gitosis', 'repositories')
|
||||||
except (NoSectionError, NoOptionError):
|
except (NoSectionError, NoOptionError):
|
||||||
pass
|
prefix = 'repositories'
|
||||||
|
|
||||||
if prefix is not None:
|
|
||||||
log.debug(
|
log.debug(
|
||||||
'Using prefix %(prefix)r for %(path)r'
|
'Using prefix %(prefix)r for %(path)r'
|
||||||
% dict(
|
% dict(
|
||||||
|
|
|
@ -15,7 +15,7 @@ def test_write_yes_simple():
|
||||||
cfg.set('group fooers', 'members', 'jdoe')
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
cfg.set('group fooers', 'writable', 'foo/bar')
|
cfg.set('group fooers', 'writable', 'foo/bar')
|
||||||
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar'),
|
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar'),
|
||||||
'foo/bar')
|
'repositories/foo/bar')
|
||||||
|
|
||||||
def test_write_no_simple_wouldHaveReadonly():
|
def test_write_no_simple_wouldHaveReadonly():
|
||||||
cfg = RawConfigParser()
|
cfg = RawConfigParser()
|
||||||
|
@ -31,7 +31,7 @@ def test_write_yes_map():
|
||||||
cfg.set('group fooers', 'members', 'jdoe')
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
cfg.set('group fooers', 'map writable foo/bar', 'quux/thud')
|
cfg.set('group fooers', 'map writable foo/bar', 'quux/thud')
|
||||||
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar'),
|
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar'),
|
||||||
'quux/thud')
|
'repositories/quux/thud')
|
||||||
|
|
||||||
def test_write_no_map_wouldHaveReadonly():
|
def test_write_no_map_wouldHaveReadonly():
|
||||||
cfg = RawConfigParser()
|
cfg = RawConfigParser()
|
||||||
|
@ -52,7 +52,7 @@ def test_read_yes_simple():
|
||||||
cfg.set('group fooers', 'members', 'jdoe')
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
cfg.set('group fooers', 'readonly', 'foo/bar')
|
cfg.set('group fooers', 'readonly', 'foo/bar')
|
||||||
eq(access.haveAccess(config=cfg, user='jdoe', mode='readonly', path='foo/bar'),
|
eq(access.haveAccess(config=cfg, user='jdoe', mode='readonly', path='foo/bar'),
|
||||||
'foo/bar')
|
'repositories/foo/bar')
|
||||||
|
|
||||||
def test_read_yes_simple_wouldHaveWritable():
|
def test_read_yes_simple_wouldHaveWritable():
|
||||||
cfg = RawConfigParser()
|
cfg = RawConfigParser()
|
||||||
|
@ -68,7 +68,7 @@ def test_read_yes_map():
|
||||||
cfg.set('group fooers', 'members', 'jdoe')
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
cfg.set('group fooers', 'map readonly foo/bar', 'quux/thud')
|
cfg.set('group fooers', 'map readonly foo/bar', 'quux/thud')
|
||||||
eq(access.haveAccess(config=cfg, user='jdoe', mode='readonly', path='foo/bar'),
|
eq(access.haveAccess(config=cfg, user='jdoe', mode='readonly', path='foo/bar'),
|
||||||
'quux/thud')
|
'repositories/quux/thud')
|
||||||
|
|
||||||
def test_read_yes_map_wouldHaveWritable():
|
def test_read_yes_map_wouldHaveWritable():
|
||||||
cfg = RawConfigParser()
|
cfg = RawConfigParser()
|
||||||
|
@ -111,6 +111,16 @@ def test_base_global_relative_simple():
|
||||||
config=cfg, user='jdoe', mode='readonly', path='xyzzy'),
|
config=cfg, user='jdoe', mode='readonly', path='xyzzy'),
|
||||||
'some/relative/path/xyzzy')
|
'some/relative/path/xyzzy')
|
||||||
|
|
||||||
|
def test_base_global_unset():
|
||||||
|
cfg = RawConfigParser()
|
||||||
|
cfg.add_section('gitosis')
|
||||||
|
cfg.add_section('group fooers')
|
||||||
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
|
cfg.set('group fooers', 'readonly', 'foo xyzzy bar')
|
||||||
|
eq(access.haveAccess(
|
||||||
|
config=cfg, user='jdoe', mode='readonly', path='xyzzy'),
|
||||||
|
'repositories/xyzzy')
|
||||||
|
|
||||||
def test_base_local():
|
def test_base_local():
|
||||||
cfg = RawConfigParser()
|
cfg = RawConfigParser()
|
||||||
cfg.add_section('group fooers')
|
cfg.add_section('group fooers')
|
||||||
|
@ -128,4 +138,4 @@ def test_dotgit():
|
||||||
cfg.set('group fooers', 'members', 'jdoe')
|
cfg.set('group fooers', 'members', 'jdoe')
|
||||||
cfg.set('group fooers', 'writable', 'foo/bar')
|
cfg.set('group fooers', 'writable', 'foo/bar')
|
||||||
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar.git'),
|
eq(access.haveAccess(config=cfg, user='jdoe', mode='writable', path='foo/bar.git'),
|
||||||
'foo/bar')
|
'repositories/foo/bar')
|
||||||
|
|
Loading…
Reference in a new issue