From 269c5043ab8f66f67d5719ac5149a436ca1baa2b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Extract Federation, Gitblit and Services manager from GitBlit singleton
---
src/main/java/com/gitblit/RpcServlet.java | 160 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 109 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java
index f6368dd..a3629b9 100644
--- a/src/main/java/com/gitblit/RpcServlet.java
+++ b/src/main/java/com/gitblit/RpcServlet.java
@@ -23,6 +23,8 @@
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -30,35 +32,69 @@
import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants.RpcRequest;
-import com.gitblit.models.RegistrantAccessPermission;
+import com.gitblit.manager.IFederationManager;
+import com.gitblit.manager.IGitblitManager;
+import com.gitblit.manager.IRepositoryManager;
+import com.gitblit.manager.IRuntimeManager;
+import com.gitblit.manager.IUserManager;
import com.gitblit.models.RefModel;
+import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.DeepCopier;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.RpcUtils;
+import com.gitblit.utils.StringUtils;
/**
* Handles remote procedure calls.
- *
+ *
* @author James Moger
- *
+ *
*/
+@Singleton
public class RpcServlet extends JsonServlet {
private static final long serialVersionUID = 1L;
- public static final int PROTOCOL_VERSION = 5;
+ public static final int PROTOCOL_VERSION = 6;
- public RpcServlet() {
+ private final IStoredSettings settings;
+
+ private final IRuntimeManager runtimeManager;
+
+ private final IUserManager userManager;
+
+ private final IRepositoryManager repositoryManager;
+
+ private final IFederationManager federationManager;
+
+ private final IGitblitManager gitblitManager;
+
+ @Inject
+ public RpcServlet(
+ IRuntimeManager runtimeManager,
+ IUserManager userManager,
+ IRepositoryManager repositoryManager,
+ IFederationManager federationManager,
+ IGitblitManager gitblitManager) {
+
super();
+
+ this.settings = runtimeManager.getSettings();
+ this.runtimeManager = runtimeManager;
+ this.userManager = userManager;
+ this.repositoryManager = repositoryManager;
+ this.federationManager = federationManager;
+ this.gitblitManager = gitblitManager;
}
/**
* Processes an rpc request.
- *
+ *
* @param request
* @param response
* @throws javax.servlet.ServletException
@@ -75,10 +111,10 @@
UserModel user = (UserModel) request.getUserPrincipal();
boolean allowManagement = user != null && user.canAdmin()
- && GitBlit.getBoolean(Keys.web.enableRpcManagement, false);
+ && settings.getBoolean(Keys.web.enableRpcManagement, false);
boolean allowAdmin = user != null && user.canAdmin()
- && GitBlit.getBoolean(Keys.web.enableRpcAdministration, false);
+ && settings.getBoolean(Keys.web.enableRpcAdministration, false);
Object result = null;
if (RpcRequest.GET_PROTOCOL.equals(reqType)) {
@@ -94,7 +130,7 @@
String cloneUrl = sb.toString();
// list repositories
- List<RepositoryModel> list = GitBlit.self().getRepositoryModels(user);
+ List<RepositoryModel> list = repositoryManager.getRepositoryModels(user);
Map<String, RepositoryModel> repositories = new HashMap<String, RepositoryModel>();
for (RepositoryModel model : list) {
String url = MessageFormat.format(cloneUrl, model.name);
@@ -104,7 +140,7 @@
} else if (RpcRequest.LIST_BRANCHES.equals(reqType)) {
// list all local branches in all repositories accessible to user
Map<String, List<String>> localBranches = new HashMap<String, List<String>>();
- List<RepositoryModel> models = GitBlit.self().getRepositoryModels(user);
+ List<RepositoryModel> models = repositoryManager.getRepositoryModels(user);
for (RepositoryModel model : models) {
if (!model.hasCommits) {
// skip empty repository
@@ -116,7 +152,7 @@
continue;
}
// get local branches
- Repository repository = GitBlit.self().getRepository(model.name);
+ Repository repository = repositoryManager.getRepository(model.name);
List<RefModel> refs = JGitUtils.getLocalBranches(repository, false, -1);
if (model.showRemoteBranches) {
// add remote branches if repository displays them
@@ -132,27 +168,49 @@
repository.close();
}
result = localBranches;
+ } else if (RpcRequest.GET_USER.equals(reqType)) {
+ if (StringUtils.isEmpty(objectName)) {
+ if (UserModel.ANONYMOUS.equals(user)) {
+ response.sendError(forbiddenCode);
+ } else {
+ // return the current user, reset credentials
+ UserModel requestedUser = DeepCopier.copy(user);
+ result = requestedUser;
+ }
+ } else {
+ if (user.canAdmin() || objectName.equals(user.username)) {
+ // return the specified user
+ UserModel requestedUser = userManager.getUserModel(objectName);
+ if (requestedUser == null) {
+ response.setStatus(failureCode);
+ } else {
+ result = requestedUser;
+ }
+ } else {
+ response.sendError(forbiddenCode);
+ }
+ }
} else if (RpcRequest.LIST_USERS.equals(reqType)) {
// list users
- List<String> names = GitBlit.self().getAllUsernames();
+ List<String> names = userManager.getAllUsernames();
List<UserModel> users = new ArrayList<UserModel>();
for (String name : names) {
- users.add(GitBlit.self().getUserModel(name));
+ users.add(userManager.getUserModel(name));
}
result = users;
} else if (RpcRequest.LIST_TEAMS.equals(reqType)) {
// list teams
- List<String> names = GitBlit.self().getAllTeamnames();
+ List<String> names = userManager.getAllTeamNames();
List<TeamModel> teams = new ArrayList<TeamModel>();
for (String name : names) {
- teams.add(GitBlit.self().getTeamModel(name));
+ teams.add(userManager.getTeamModel(name));
}
result = teams;
} else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) {
// create repository
RepositoryModel model = deserialize(request, response, RepositoryModel.class);
try {
- GitBlit.self().updateRepositoryModel(model.name, model, true);
+ repositoryManager.updateRepositoryModel(model.name, model, true);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -165,19 +223,19 @@
repoName = model.name;
}
try {
- GitBlit.self().updateRepositoryModel(repoName, model, false);
+ repositoryManager.updateRepositoryModel(repoName, model, false);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
} else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) {
// delete repository
RepositoryModel model = deserialize(request, response, RepositoryModel.class);
- GitBlit.self().deleteRepositoryModel(model);
+ repositoryManager.deleteRepositoryModel(model);
} else if (RpcRequest.CREATE_USER.equals(reqType)) {
// create user
UserModel model = deserialize(request, response, UserModel.class);
try {
- GitBlit.self().updateUserModel(model.username, model, true);
+ gitblitManager.updateUserModel(model.username, model, true);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -190,21 +248,21 @@
username = model.username;
}
try {
- GitBlit.self().updateUserModel(username, model, false);
+ gitblitManager.updateUserModel(username, model, false);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
} else if (RpcRequest.DELETE_USER.equals(reqType)) {
// delete user
UserModel model = deserialize(request, response, UserModel.class);
- if (!GitBlit.self().deleteUser(model.username)) {
+ if (!userManager.deleteUser(model.username)) {
response.setStatus(failureCode);
}
} else if (RpcRequest.CREATE_TEAM.equals(reqType)) {
// create team
TeamModel model = deserialize(request, response, TeamModel.class);
try {
- GitBlit.self().updateTeamModel(model.name, model, true);
+ gitblitManager.updateTeamModel(model.name, model, true);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
@@ -217,83 +275,83 @@
teamname = model.name;
}
try {
- GitBlit.self().updateTeamModel(teamname, model, false);
+ gitblitManager.updateTeamModel(teamname, model, false);
} catch (GitBlitException e) {
response.setStatus(failureCode);
}
} else if (RpcRequest.DELETE_TEAM.equals(reqType)) {
// delete team
TeamModel model = deserialize(request, response, TeamModel.class);
- if (!GitBlit.self().deleteTeam(model.name)) {
+ if (!userManager.deleteTeam(model.name)) {
response.setStatus(failureCode);
}
} else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) {
// get repository members
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
- result = GitBlit.self().getRepositoryUsers(model);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
+ result = repositoryManager.getRepositoryUsers(model);
} else if (RpcRequest.SET_REPOSITORY_MEMBERS.equals(reqType)) {
// rejected since 1.2.0
response.setStatus(failureCode);
} else if (RpcRequest.LIST_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) {
// get repository member permissions
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
- result = GitBlit.self().getUserAccessPermissions(model);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
+ result = repositoryManager.getUserAccessPermissions(model);
} else if (RpcRequest.SET_REPOSITORY_MEMBER_PERMISSIONS.equals(reqType)) {
// set the repository permissions for the specified users
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);
- result = GitBlit.self().setUserAccessPermissions(model, permissions);
+ result = repositoryManager.setUserAccessPermissions(model, permissions);
} else if (RpcRequest.LIST_REPOSITORY_TEAMS.equals(reqType)) {
// get repository teams
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
- result = GitBlit.self().getRepositoryTeams(model);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
+ result = repositoryManager.getRepositoryTeams(model);
} else if (RpcRequest.SET_REPOSITORY_TEAMS.equals(reqType)) {
// rejected since 1.2.0
response.setStatus(failureCode);
} else if (RpcRequest.LIST_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) {
// get repository team permissions
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
- result = GitBlit.self().getTeamAccessPermissions(model);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
+ result = repositoryManager.getTeamAccessPermissions(model);
} else if (RpcRequest.SET_REPOSITORY_TEAM_PERMISSIONS.equals(reqType)) {
// set the repository permissions for the specified teams
- RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
+ RepositoryModel model = repositoryManager.getRepositoryModel(objectName);
Collection<RegistrantAccessPermission> permissions = deserialize(request, response, RpcUtils.REGISTRANT_PERMISSIONS_TYPE);
- result = GitBlit.self().setTeamAccessPermissions(model, permissions);
+ result = repositoryManager.setTeamAccessPermissions(model, permissions);
} else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {
// return the list of federation registrations
if (allowAdmin) {
- result = GitBlit.self().getFederationRegistrations();
+ result = federationManager.getFederationRegistrations();
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_FEDERATION_RESULTS.equals(reqType)) {
// return the list of federation result registrations
- if (allowAdmin && GitBlit.canFederate()) {
- result = GitBlit.self().getFederationResultRegistrations();
+ if (allowAdmin && federationManager.canFederate()) {
+ result = federationManager.getFederationResultRegistrations();
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) {
// return the list of federation proposals
- if (allowAdmin && GitBlit.canFederate()) {
- result = GitBlit.self().getPendingFederationProposals();
+ if (allowAdmin && federationManager.canFederate()) {
+ result = federationManager.getPendingFederationProposals();
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) {
// return the list of federation sets
- if (allowAdmin && GitBlit.canFederate()) {
+ if (allowAdmin && federationManager.canFederate()) {
String gitblitUrl = HttpUtils.getGitblitURL(request);
- result = GitBlit.self().getFederationSets(gitblitUrl);
+ result = federationManager.getFederationSets(gitblitUrl);
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_SETTINGS.equals(reqType)) {
// return the server's settings
- ServerSettings settings = GitBlit.self().getSettingsModel();
+ ServerSettings serverSettings = runtimeManager.getSettingsModel();
if (allowAdmin) {
// return all settings
- result = settings;
+ result = serverSettings;
} else {
// anonymous users get a few settings to allow browser launching
List<String> keys = new ArrayList<String>();
@@ -310,33 +368,33 @@
// build the settings
ServerSettings managementSettings = new ServerSettings();
for (String key : keys) {
- managementSettings.add(settings.get(key));
+ managementSettings.add(serverSettings.get(key));
}
if (allowManagement) {
- managementSettings.pushScripts = settings.pushScripts;
+ managementSettings.pushScripts = serverSettings.pushScripts;
}
result = managementSettings;
}
} else if (RpcRequest.EDIT_SETTINGS.equals(reqType)) {
// update settings on the server
if (allowAdmin) {
- Map<String, String> settings = deserialize(request, response,
+ Map<String, String> map = deserialize(request, response,
RpcUtils.SETTINGS_TYPE);
- GitBlit.self().updateSettings(settings);
+ runtimeManager.updateSettings(map);
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_STATUS.equals(reqType)) {
// return the server's status information
if (allowAdmin) {
- result = GitBlit.self().getStatus();
+ result = runtimeManager.getStatus();
} else {
response.sendError(notAllowedCode);
}
} else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) {
// clear the repository list cache
if (allowManagement) {
- GitBlit.self().resetRepositoryListCache();
+ repositoryManager.resetRepositoryListCache();
} else {
response.sendError(notAllowedCode);
}
--
Gitblit v1.9.1