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

new option() function in load.pm to quickly test conf options

Browse source 
reminder: these are enabled by 'option foo = bar' keyword in conf and
apply only to the repo
This commit is contained in:
Sitaram Chamarty 2012-03-17 21:50:48 +05:30
parent d5ddf6c68d
commit a6a666af78
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Gitolite/Conf/Load.pm
View file

@ -7,6 +7,7 @@ package Gitolite::Conf::Load;
load load
access access
git_config git_config
option
repo_missing repo_missing
vrefs vrefs
lister_dispatch lister_dispatch
@ -130,6 +131,14 @@ sub git_config {
return \%ret; return \%ret;
} }
sub option {
my ( $repo, $option ) = @_;
$option = "gitolite-options.$option";
my $ret = git_config( $repo, "^\Q$option\E\$" );
return '' unless %$ret;
return $ret->{$option};
}
sub repo_missing { sub repo_missing {
my $repo = shift; my $repo = shift;
return not -d "$rc{GL_REPO_BASE}/$repo.git"; return not -d "$rc{GL_REPO_BASE}/$repo.git";
@ -236,7 +245,7 @@ sub load_1 {
sub memberships { sub memberships {
trace( 3, @_ ); trace( 3, @_ );
my ($type, $base, $repo) = @_; my ( $type, $base, $repo ) = @_;
my $base2 = ''; my $base2 = '';
my @ret = ( $base, '@all' ); my @ret = ( $base, '@all' );
@ -264,7 +273,7 @@ sub memberships {
# find the roles this user has when accessing this repo and add those # find the roles this user has when accessing this repo and add those
# in as groupnames he is a member of. You need the already existing # in as groupnames he is a member of. You need the already existing
# memberships for this; see below this function for an example # memberships for this; see below this function for an example
push @ret, user_roles($base, $repo, @ret); push @ret, user_roles( $base, $repo, @ret );
} }
@ret = @{ sort_u( \@ret ) }; @ret = @{ sort_u( \@ret ) };
@ -293,7 +302,7 @@ sub data_version_mismatch {
} }
sub user_roles { sub user_roles {
my ($user, $repo, @eg) = @_; my ( $user, $repo, @eg ) = @_;
# eg == existing groups (that user is already known to be a member of) # eg == existing groups (that user is already known to be a member of)
my %eg = map { $_ => 1 } @eg; my %eg = map { $_ => 1 } @eg;
@ -301,24 +310,24 @@ sub user_roles {
my %ret = (); my %ret = ();
my $f = "$rc{GL_REPO_BASE}/$repo.git/gl-perms"; my $f = "$rc{GL_REPO_BASE}/$repo.git/gl-perms";
if ( -f $f ) { if ( -f $f ) {
my $fh = _open("<", $f); my $fh = _open( "<", $f );
while (<$fh>) { while (<$fh>) {
chomp; chomp;
# READERS u3 u4 @g1 # READERS u3 u4 @g1
s/^\s+//; s/ +$//; s/=/ /; s/\s+/ /g; s/\@//; s/^\s+//; s/ +$//; s/=/ /; s/\s+/ /g; s/\@//;
my ($role, @members) = split; my ( $role, @members ) = split;
# role = READERS, members = u3, u4, @g1 # role = READERS, members = u3, u4, @g1
if (not $rc{ROLES}{$role}) { if ( not $rc{ROLES}{$role} ) {
_warn "role '$role' not allowed, ignoring"; _warn "role '$role' not allowed, ignoring";
next; next;
} }
for my $m (@members) { for my $m (@members) {
if ($m !~ $USERNAME_PATT) { if ( $m !~ $USERNAME_PATT ) {
_warn "ignoring '$m' in perms line"; _warn "ignoring '$m' in perms line";
next; next;
} }
# if user eq u3/u4, or is a member of @g1, he has role READERS # if user eq u3/u4, or is a member of @g1, he has role READERS
$ret{'@' . $role} = 1 if $m eq $user or $eg{$m}; $ret{ '@' . $role } = 1 if $m eq $user or $eg{$m};
} }
} }
} }