deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

(rrq) expand_wild uses new repo_rights sub

Browse source
This commit is contained in:
Sitaram Chamarty 2010-04-24 13:17:37 +05:30
parent 6be0946aee
commit 382505f0e0
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/gitolite.pm
View file

@ -320,10 +320,6 @@ sub expand_wild
# access report instead of having to manually change CREATER to his name # access report instead of having to manually change CREATER to his name
$repo =~ s/\bCREAT[EO]R\b/$user/g; $repo =~ s/\bCREAT[EO]R\b/$user/g;
# get the list of repo patterns
&parse_acl($GL_CONF_COMPILED, "", "NOBODY", "NOBODY", "NOBODY");
my %normal_repos = %repos;
# display matching repos (from *all* the repos in the system) that $user # display matching repos (from *all* the repos in the system) that $user
# has at least "R" access to # has at least "R" access to
@ -334,26 +330,9 @@ sub expand_wild
$actual_repo =~ s/\.git$//; $actual_repo =~ s/\.git$//;
# actual_repo has to match the pattern being expanded # actual_repo has to match the pattern being expanded
next unless $actual_repo =~ /$repo/; next unless $actual_repo =~ /$repo/;
# if actual_repo is present "as is" in the config, those
# permissions will override anything inherited from a my($perm, $creater) = &repo_rights($actual_repo);
# wildcard that also happens to match next unless $perm =~ /\S/;
my $creater;
if ($normal_repos{$actual_repo}) {
%repos = %normal_repos;
$creater = '<gitolite>';
} else {
# find the creater and subsitute in repos
my ($read, $write);
($creater, $read, $write) = &wild_repo_rights($repo_base_abs, $actual_repo, $user);
# get access list with this
&parse_acl($GL_CONF_COMPILED, $actual_repo, $creater, $read || "NOBODY", $write || "NOBODY");
$creater = "($creater)";
}
my $perm = ' ';
# @all repos; see notes above
$perm .= ( $repos{$actual_repo}{R}{'@all'} ? ' @' : ( $repos{'@all'}{R}{$user} ? ' r' : ( $repos{$actual_repo}{R}{$user} ? ' R' : ' ' )));
$perm .= ( $repos{$actual_repo}{W}{'@all'} ? ' @' : ( $repos{'@all'}{W}{$user} ? ' w' : ( $repos{$actual_repo}{W}{$user} ? ' W' : ' ' )));
next if $perm eq ' ';
print "$perm\t$creater\t$actual_repo\n"; print "$perm\t$creater\t$actual_repo\n";
} }
} }