path: root/shell.c
diff options
authorJonathan Nieder <>2013-03-09 22:00:11 (GMT)
committerJunio C Hamano <>2013-03-10 07:21:35 (GMT)
commit35297089e550c30e6d0f6db2adca5d44d254a7ed (patch)
tree95c5341a16019c6d31e02291978b86fd6f936966 /shell.c
parentcdd9b3c96cc4a01bbc5f2f778e75028ea67a5f91 (diff)
shell: new no-interactive-login command to print a custom message
If I disable git-shell's interactive mode by removing the ~/git-shell-commands directory, attempts to ssh in to the service produce a message intended for the administrator: $ ssh git@myserver fatal: Interactive git shell is not enabled. hint: ~/git-shell-commands should exist and have read and execute access. $ That is helpful for the new admin who is wondering "What? Why isn't the git-shell I just set up working?", but once the site setup is complete, it would be better to give the user a friendly hint that she is on the right track, like GitHub does. Hi <username>! You've successfully authenticated, but GitHub does not provide shell access. An appropriate greeting might even include more complex dynamic information, like gitolite's list of repositories the user has access to. Add support for a ~/git-shell-commands/no-interactive-login command that generates an arbitrary greeting. When the user tries to log in: * If the file ~/git-shell-commands/no-interactive-login exists, run no-interactive-login to let the server say what it likes, then hang up. * Otherwise, if ~/git-shell-commands/ is present, start an interactive read-eval-print loop. * Otherwise, print the usual configuration hint and hang up. Reported-by: Ethan Reesor <> Signed-off-by: Jonathan Nieder <> Improved-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'shell.c')
1 files changed, 13 insertions, 0 deletions
diff --git a/shell.c b/shell.c
index 84b237f..1429870 100644
--- a/shell.c
+++ b/shell.c
@@ -6,6 +6,7 @@
#define COMMAND_DIR "git-shell-commands"
+#define NOLOGIN_COMMAND COMMAND_DIR "/no-interactive-login"
static int do_generic_cmd(const char *me, char *arg)
@@ -65,6 +66,18 @@ static void run_shell(void)
int done = 0;
static const char *help_argv[] = { HELP_COMMAND, NULL };
+ if (!access(NOLOGIN_COMMAND, F_OK)) {
+ /* Interactive login disabled. */
+ const char *argv[] = { NOLOGIN_COMMAND, NULL };
+ int status;
+ status = run_command_v_opt(argv, 0);
+ if (status < 0)
+ exit(127);
+ exit(status);
+ }
/* Print help if enabled */
run_command_v_opt(help_argv, RUN_SILENT_EXEC_FAILURE);