From aa99de75cb60fea60a59cfab9a94291deb70c06a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 22 2017 12:45:59 +0000 Subject: Fix provenpackager access, they also need branch access Signed-off-by: Pierre-Yves Chibon --- diff --git a/dist_git_auth.py b/dist_git_auth.py index fb81a61..22d1447 100644 --- a/dist_git_auth.py +++ b/dist_git_auth.py @@ -138,6 +138,11 @@ class DistGitoliteAuth(Gitolite3Auth): access, branch, ' '.join(users) ) ) + if groups: + config.append(' %s %s = @%s' % ( + access, branch, ' @'.join(groups) + ) + ) # Then, blacklist a pattern over that (after). config.append(_blacklist) diff --git a/dist_git_auth_tests.py b/dist_git_auth_tests.py index 10aaf68..157d424 100644 --- a/dist_git_auth_tests.py +++ b/dist_git_auth_tests.py @@ -18,7 +18,9 @@ expected = """ repo test R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -33,7 +35,9 @@ repo requests/test repo test2 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -48,7 +52,9 @@ repo requests/test2 repo somenamespace/test3 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -167,7 +173,9 @@ class DistGitoliteAuthTestCase(tests.Modeltests): expected = '''repo test2 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -182,7 +190,9 @@ repo requests/test2 repo somenamespace/test3 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -197,7 +207,9 @@ repo requests/somenamespace/test3 repo test R = @all RWC master = foo pingou + RWC master = @provenpackager RWC f9000 = foo pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -273,7 +285,9 @@ repo requests/test repo test2 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -288,7 +302,9 @@ repo requests/test2 repo somenamespace/test3 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -303,7 +319,9 @@ repo requests/somenamespace/test3 repo test R = @all RWC master = foo + RWC master = @test_grp @provenpackager RWC f9000 = foo + RWC f9000 = @test_grp @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -355,7 +373,9 @@ repo requests/test expected = '''repo test R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -370,7 +390,9 @@ repo requests/test repo test2 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -385,7 +407,9 @@ repo requests/test2 repo somenamespace/test3 R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all @@ -483,7 +507,9 @@ repo requests/rpms/firefox expected = """repo firefox R = @all RWC master = pingou + RWC master = @provenpackager RWC f9000 = pingou + RWC f9000 = @provenpackager - f[0-9][0-9] = @all - epel[0-9] = @all - epel[0-9][0-9] = @all