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

put single quotes around bad user/repo names etc

Browse source
This commit is contained in:
Sitaram Chamarty 2011-10-05 22:01:49 +05:30
parent e5c3b0e5dc
commit 70010ba56e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gl-compile-conf
View file

@ -143,7 +143,7 @@ sub parse_conf_line
do { $groups{$1}{$_} ||= $fragment } for ( expand_list( split(' ', $2) ) ); do { $groups{$1}{$_} ||= $fragment } for ( expand_list( split(' ', $2) ) );
# create the group hash even if empty # create the group hash even if empty
$groups{$1} = {} unless $groups{$1}; $groups{$1} = {} unless $groups{$1};
die "$ABRT bad group $1\n" unless $1 =~ $REPONAME_PATT; die "$ABRT bad group '$1'\n" unless $1 =~ $REPONAME_PATT;
} }
# repo(s) # repo(s)
elsif ($line =~ /^repo (.*)/) elsif ($line =~ /^repo (.*)/)
@ -155,9 +155,9 @@ sub parse_conf_line
# ...sanity check # ...sanity check
for (@{ $repos_p }) { for (@{ $repos_p }) {
print STDERR "$WARN explicit '.git' extension ignored for $_.git\n" if s/\.git$//; print STDERR "$WARN explicit '.git' extension ignored for $_.git\n" if s/\.git$//;
die "$ABRT bad reponame $_\n" die "$ABRT bad reponame '$_'\n"
if ($GL_WILDREPOS and $_ !~ $REPOPATT_PATT); if ($GL_WILDREPOS and $_ !~ $REPOPATT_PATT);
die "$ABRT bad reponame $_ or you forgot to set \$GL_WILDREPOS\n" die "$ABRT bad reponame '$_' or you forgot to set \$GL_WILDREPOS\n"
if (not $GL_WILDREPOS and $_ !~ $REPONAME_PATT); if (not $GL_WILDREPOS and $_ !~ $REPONAME_PATT);
} }
s/\bCREAT[EO]R\b/\$creator/g for @{ $repos_p }; s/\bCREAT[EO]R\b/\$creator/g for @{ $repos_p };
@ -182,7 +182,7 @@ sub parse_conf_line
# expand the user list, unless it is just "@all" # expand the user list, unless it is just "@all"
@users = expand_list ( @users ) unless $GL_BIG_CONFIG; @users = expand_list ( @users ) unless $GL_BIG_CONFIG;
do { die "$ABRT bad username $_\n" unless $_ =~ $USERNAME_PATT } for @users; do { die "$ABRT bad username '$_'\n" unless $_ =~ $USERNAME_PATT } for @users;
s/\bCREAT[EO]R\b/~\$creator/g for @users; s/\bCREAT[EO]R\b/~\$creator/g for @users;
@ -289,7 +289,7 @@ sub parse_conf_line
elsif ($line =~ /^(\S+)(?: "(.*?)")? = "(.*)"$/) elsif ($line =~ /^(\S+)(?: "(.*?)")? = "(.*)"$/)
{ {
my ($repo, $owner, $desc) = ($1, $2, $3); my ($repo, $owner, $desc) = ($1, $2, $3);
die "$ABRT bad repo name $repo\n" unless $repo =~ $REPONAME_PATT; die "$ABRT bad repo name '$repo'\n" unless $repo =~ $REPONAME_PATT;
die "$ABRT $fragment attempting to set description for $repo\n" if check_fragment_repo_disallowed( $fragment, $repo ); die "$ABRT $fragment attempting to set description for $repo\n" if check_fragment_repo_disallowed( $fragment, $repo );
$desc{"$repo.git"} = $desc; $desc{"$repo.git"} = $desc;
$owner{"$repo.git"} = $owner || ''; $owner{"$repo.git"} = $owner || '';

4
t/t09a-oldtests
View file

@ -11,7 +11,7 @@ echo "
expect "To gitolite:gitolite-admin" expect "To gitolite:gitolite-admin"
expect "master -> master" expect "master -> master"
[[ $1 == 0 ]] && expect "ABORTING" [[ $1 == 0 ]] && expect "ABORTING"
[[ $1 == 0 ]] && expect "bad reponame abc\*def or you forgot to set .GL_WILDREPOS" [[ $1 == 0 ]] && expect "bad reponame 'abc\*def' or you forgot to set .GL_WILDREPOS"
name "bad user name" name "bad user name"
echo " echo "
@ -22,7 +22,7 @@ echo "
RW = sitaram RW = sitaram
" | ugc -r " | ugc -r
expect "ABORTING" expect "ABORTING"
expect "bad username sitaram\*tester" expect "bad username 'sitaram\*tester'"
name "NAME deny" name "NAME deny"
echo " echo "