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

move input command check so it works for non-ssh modes also

Browse source
This commit is contained in:
Sitaram Chamarty 2012-05-21 15:20:04 +05:30
parent 3a59f5aff0
commit 20d2120ea5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gitolite-shell
View file

@ -31,6 +31,12 @@ if ( exists $ENV{G3T_USER} ) {
_die "who the *heck* are you?"; _die "who the *heck* are you?";
} }
# sanity...
my $soc = $ENV{SSH_ORIGINAL_COMMAND};
$soc =~ s/[\n\r]+/<<newline>>/g;
_die "I don't like newlines in the command: '$soc'\n" if $ENV{SSH_ORIGINAL_COMMAND} ne $soc;
# the INPUT trigger massages @ARGV and $ENV{SSH_ORIGINAL_COMMAND} as needed
trigger('INPUT'); trigger('INPUT');
main($id); main($id);
@ -75,9 +81,6 @@ sub in_ssh {
gl_log( 'ssh', "ARGV=" . join( ",", @ARGV ), "SOC=" . ( $ENV{SSH_ORIGINAL_COMMAND} || '' ), "FROM=$ip" ); gl_log( 'ssh', "ARGV=" . join( ",", @ARGV ), "SOC=" . ( $ENV{SSH_ORIGINAL_COMMAND} || '' ), "FROM=$ip" );
$ENV{SSH_ORIGINAL_COMMAND} ||= ''; $ENV{SSH_ORIGINAL_COMMAND} ||= '';
my $soc = $ENV{SSH_ORIGINAL_COMMAND};
$soc =~ s/[\n\r]+/<<newline>>/g;
_die "I don't like newlines in the command: $soc\n" if $ENV{SSH_ORIGINAL_COMMAND} ne $soc;
return $ip; return $ip;
} }