From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index 4b8b24f..e989ece 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -16,26 +16,24 @@
package com.gitblit.servlet;
import java.io.IOException;
+import java.net.URL;
import java.text.MessageFormat;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.Keys.fanout;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
/**
* Handles requests for Sparkleshare Invites
@@ -48,25 +46,24 @@
private static final long serialVersionUID = 1L;
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IUserManager userManager;
+ private IUserManager userManager;
- private final ISessionManager sessionManager;
+ private IAuthenticationManager authenticationManager;
- private final IRepositoryManager repositoryManager;
+ private IRepositoryManager repositoryManager;
@Inject
public SparkleShareInviteServlet(
- IRuntimeManager runtimeManager,
+ IStoredSettings settings,
IUserManager userManager,
- ISessionManager sessionManager,
+ IAuthenticationManager authenticationManager,
IRepositoryManager repositoryManager) {
- super();
- this.settings = runtimeManager.getSettings();
+ this.settings = settings;
this.userManager = userManager;
- this.sessionManager = sessionManager;
+ this.authenticationManager = authenticationManager;
this.repositoryManager = repositoryManager;
}
@@ -86,6 +83,14 @@
javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,
java.io.IOException {
+ int sshPort = settings.getInteger(Keys.git.sshPort, 0);
+ if (sshPort == 0) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ response.getWriter().append("SSH is not active on this server!");
+ return;
+ }
+ int sshDisplayPort = settings.getInteger(Keys.git.sshAdvertisedPort, sshPort);
+
// extract repo name from request
String repoUrl = request.getPathInfo().substring(1);
@@ -94,25 +99,36 @@
repoUrl = repoUrl.substring(0, repoUrl.length() - 4);
}
- String servletPath = Constants.GIT_PATH;
-
- int schemeIndex = repoUrl.indexOf("://") + 3;
- String host = repoUrl.substring(0, repoUrl.indexOf('/', schemeIndex));
- String path = repoUrl.substring(repoUrl.indexOf(servletPath) + servletPath.length());
String username = null;
+ String path;
int fetchIndex = repoUrl.indexOf('@');
if (fetchIndex > -1) {
- username = repoUrl.substring(schemeIndex, fetchIndex);
+ username = repoUrl.substring(0, fetchIndex);
+ path = repoUrl.substring(fetchIndex + 1);
+ } else {
+ path = repoUrl;
}
+
+ String host = request.getServerName();
+ 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.sshAdvertisedHost, "");
+ if(sshDisplayHost.isEmpty()) {
+ sshDisplayHost = host;
+ }
+
UserModel user;
if (StringUtils.isEmpty(username)) {
- user = sessionManager.authenticate(request);
+ user = authenticationManager.authenticate(request);
} else {
user = userManager.getUserModel(username);
}
- if (user == null) {
- user = UserModel.ANONYMOUS;
- username = "";
+ if (user == null || user.disabled) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ response.getWriter().append("Access is not permitted!");
+ return;
}
// ensure that the requested repository exists
@@ -123,14 +139,20 @@
return;
}
+ if (!user.canRewindRef(model)) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ response.getWriter().append(MessageFormat.format("{0} does not have RW+ permissions to \"{1}\"!", user.username, model.name));
+ }
+
StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
sb.append("<sparkleshare><invite>\n");
- sb.append(MessageFormat.format("<address>{0}</address>\n", host));
- sb.append(MessageFormat.format("<remote_path>{0}{1}</remote_path>\n", servletPath, model.name));
- if (settings.getInteger(Keys.fanout.port, 0) > 0) {
+ 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 is running it's own fanout service for pubsub notifications
- sb.append(MessageFormat.format("<announcements_url>tcp://{0}:{1}</announcements_url>\n", request.getServerName(), settings.getString(Keys.fanout.port, "")));
+ sb.append(MessageFormat.format("<announcements_url>tcp://{0}:{1,number,0}</announcements_url>\n", request.getServerName(), fanoutPort));
}
sb.append("</invite></sparkleshare>\n");
--
Gitblit v1.9.1