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

compile: gitolite key as good as shell key for users in @SHELL group

Browse source 
done by inserting a "-s" into the authkey forced command.

(They also lose the "no-pty" restriction, for good measure!)
This commit is contained in:
Sitaram Chamarty 2009-12-19 21:36:55 +05:30
parent 75de6c0438
commit 2cc19091ca
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gl-compile-conf
View file

@ -74,7 +74,8 @@ $ENV{PATH} .= ":$GIT_PATH" if $GIT_PATH;
# command and options for authorized_keys # command and options for authorized_keys
$AUTH_COMMAND="$bindir/gl-auth-command"; $AUTH_COMMAND="$bindir/gl-auth-command";
$AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty"; $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding";
# note, for most users there's also a "no-pty" added to this, see later
# groups can now represent user groups or repo groups. # groups can now represent user groups or repo groups.
@ -441,7 +442,11 @@ for my $pubkey (glob("*"))
print STDERR "WARNING: pubkey $pubkey exists but user $user not in config\n" print STDERR "WARNING: pubkey $pubkey exists but user $user not in config\n"
unless $user_list{$user}; unless $user_list{$user};
$user_list{$user} = 'has pubkey'; $user_list{$user} = 'has pubkey';
print $newkeys_fh "command=\"$AUTH_COMMAND $user\",$AUTH_OPTIONS "; if ($groups{'@SHELL'}{$user}) {
print $newkeys_fh "command=\"$AUTH_COMMAND -s $user\",$AUTH_OPTIONS ";
} else {
print $newkeys_fh "command=\"$AUTH_COMMAND $user\",$AUTH_OPTIONS,no-pty ";
}
# apparently some pubkeys don't end in a newline... # apparently some pubkeys don't end in a newline...
my $pubkey_content = `cat $pubkey`; my $pubkey_content = `cat $pubkey`;
$pubkey_content =~ s/\s*$/\n/; $pubkey_content =~ s/\s*$/\n/;

3
src/gl-easy-install
View file

@ -361,6 +361,7 @@ run_install() {
# MANUAL: setup the initial config file. Edit $GL_ADMINDIR/conf/gitolite.conf # MANUAL: setup the initial config file. Edit $GL_ADMINDIR/conf/gitolite.conf
# and add at least the following lines to it: # and add at least the following lines to it:
# @SHELL = sitaram
# repo gitolite-admin # repo gitolite-admin
# RW+ = sitaram # RW+ = sitaram
@ -368,6 +369,8 @@ initial_conf_key() {
echo "#gitolite conf echo "#gitolite conf
# please see conf/example.conf for details on syntax and features # please see conf/example.conf for details on syntax and features
@SHELL = $admin_name
repo gitolite-admin repo gitolite-admin
RW+ = $admin_name RW+ = $admin_name