From 20d2120ea5578a9f72bf85c42f2969eb32940a64 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Mon, 21 May 2012 15:20:04 +0530 Subject: [PATCH] move input command check so it works for non-ssh modes also --- src/gitolite-shell | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gitolite-shell b/src/gitolite-shell index af03a36..c4463ad 100755 --- a/src/gitolite-shell +++ b/src/gitolite-shell @@ -31,6 +31,12 @@ if ( exists $ENV{G3T_USER} ) { _die "who the *heck* are you?"; } +# sanity... +my $soc = $ENV{SSH_ORIGINAL_COMMAND}; +$soc =~ s/[\n\r]+/<>/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'); main($id); @@ -75,9 +81,6 @@ sub in_ssh { gl_log( 'ssh', "ARGV=" . join( ",", @ARGV ), "SOC=" . ( $ENV{SSH_ORIGINAL_COMMAND} || '' ), "FROM=$ip" ); $ENV{SSH_ORIGINAL_COMMAND} ||= ''; - my $soc = $ENV{SSH_ORIGINAL_COMMAND}; - $soc =~ s/[\n\r]+/<>/g; - _die "I don't like newlines in the command: $soc\n" if $ENV{SSH_ORIGINAL_COMMAND} ne $soc; return $ip; }