From 18231200d33b62d2d96286b9bbd84476df5d9189 Mon Sep 17 00:00:00 2001
From: Morten Bøgeskov <source@bogeskov.dk>
Date: Mon, 15 Jun 2015 12:51:52 -0400
Subject: [PATCH] Added git.sshDisplay{Port|Host} to hide port forward.
---
src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index 69c254c..d2ddc2c 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -89,6 +89,8 @@
response.getWriter().append("SSH is not active on this server!");
return;
}
+ int sshDisplayPort = settings.getInteger(Keys.git.sshDisplayPort, sshPort);
+
// extract repo name from request
String repoUrl = request.getPathInfo().substring(1);
@@ -111,6 +113,10 @@
String url = settings.getString(Keys.web.canonicalUrl, "https://localhost:8443");
if (!StringUtils.isEmpty(url) && url.indexOf("localhost") == -1) {
host = new URL(url).getHost();
+ }
+ String sshDisplayHost = settings.getString(Keys.git.sshDisplayHost, "");
+ if(sshDisplayHost.isEmpty()) {
+ sshDisplayHost = host;
}
UserModel user;
@@ -141,7 +147,7 @@
StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
sb.append("<sparkleshare><invite>\n");
- sb.append(MessageFormat.format("<address>ssh://{0}@{1}:{2,number,0}/</address>\n", user.username, host, sshPort));
+ sb.append(MessageFormat.format("<address>ssh://{0}@{1}:{2,number,0}/</address>\n", user.username, sshDisplayHost, sshDisplayPort));
sb.append(MessageFormat.format("<remote_path>/{0}</remote_path>\n", model.name));
int fanoutPort = settings.getInteger(Keys.fanout.port, 0);
if (fanoutPort > 0) {
--
Gitblit v1.9.1