From 01b529edac600feb3c0750d27d0759b5f49fde72 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:09 -0400
Subject: [PATCH] Show root commands in welcome shell and improve command registration
---
src/main/java/com/gitblit/transport/ssh/WelcomeShell.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java b/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java
index 156e99e..819028c 100644
--- a/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java
+++ b/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java
@@ -34,6 +34,7 @@
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.models.UserModel;
+import com.gitblit.transport.ssh.commands.DispatchCommand;
import com.gitblit.utils.StringUtils;
/**
@@ -56,7 +57,7 @@
private static class SendMessage implements Command, SessionAware {
private final IStoredSettings settings;
- private SshDaemonClient client;
+ private ServerSession session;
private InputStream in;
private OutputStream out;
@@ -89,7 +90,7 @@
@Override
public void setSession(final ServerSession session) {
- this.client = session.getAttribute(SshDaemonClient.KEY);
+ this.session = session;
}
@Override
@@ -105,27 +106,38 @@
@Override
public void destroy() {
+ this.session = null;
}
String getMessage() {
+ SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
UserModel user = client.getUser();
StringBuilder msg = new StringBuilder();
msg.append("\r\n");
- msg.append(" Hi ");
+ msg.append("Hi ");
msg.append(user.getDisplayName());
- msg.append(", you have successfully connected to Gitblit over SSH.");
+ msg.append(", you have successfully connected to Gitblit over SSH");
+ msg.append("\r\n");
+ msg.append("with client: ");
+ msg.append(session.getClientVersion());
msg.append("\r\n");
msg.append("\r\n");
- msg.append(" You may clone a repository with the following Git syntax:\r\n");
+ msg.append("You may clone a repository with the following Git syntax:\r\n");
msg.append("\r\n");
- msg.append(" git clone ");
+ msg.append(" git clone ");
msg.append(formatUrl(user.username));
msg.append("\r\n");
msg.append("\r\n");
+ // display the core commands
+ SshCommandFactory cmdFactory = (SshCommandFactory) session.getFactoryManager().getCommandFactory();
+ DispatchCommand root = cmdFactory.createRootDispatcher(client, "");
+ String usage = root.usage().replace("\n", "\r\n");
+ msg.append(usage);
+
return msg.toString();
}
--
Gitblit v1.9.1