Add hostname and ssh repo url methodso to SshCommand

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
index 67e2805f68c5a9dcf43d741760d9ccbea8b276e0..7008b5ebba72de48dcd2952566750724bff40239 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
@@ -16,11 +16,19 @@ package com.gitblit.transport.ssh.commands;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
 
 import org.apache.sshd.server.Environment;
+import org.eclipse.jgit.util.SystemReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.gitblit.Keys;
+import com.gitblit.manager.IGitblit;
+import com.gitblit.utils.StringUtils;
+
 public abstract class SshCommand extends BaseCommand {
 
        protected Logger log = LoggerFactory.getLogger(getClass());
@@ -45,5 +53,35 @@ public abstract class SshCommand extends BaseCommand {
                });
        }
 
+       protected String getHostname() {
+               IGitblit gitblit = getContext().getGitblit();
+               String host = null;
+               String url = gitblit.getSettings().getString(Keys.web.canonicalUrl, "https://localhost:8443");
+               if (url != null) {
+                       try {
+                               host = new URL(url).getHost();
+                       } catch (MalformedURLException e) {
+                       }
+               }
+               if (StringUtils.isEmpty(host)) {
+                       host = SystemReader.getInstance().getHostname();
+               }
+               return host;
+       }
+
+       protected String getRepositoryUrl(String repository) {
+               String username = getContext().getClient().getUsername();
+               String hostname = getHostname();
+               int port = getContext().getGitblit().getSettings().getInteger(Keys.git.sshPort, 0);
+               if (port == 22) {
+                       // standard port
+                       return MessageFormat.format("{0}@{1}/{2}.git", username, hostname, repository);
+               } else {
+                       // non-standard port
+                       return MessageFormat.format("ssh://{0}@{1}:{2,number,0}/{3}",
+                                       username, hostname, port, repository);
+               }
+       }
+
        protected abstract void run() throws UnloggedFailure, Failure, Exception;
 }