From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.
---
src/com/gitblit/GitBlit.java | 221 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 176 insertions(+), 45 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 2764143..51c3b45 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1,73 +1,82 @@
package com.gitblit;
import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.Collections;
import java.util.List;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.Request;
import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
-import org.eclipse.jgit.http.server.resolver.FileResolver;
-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.transport.resolver.FileResolver;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.User;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.models.RepositoryModel;
+import com.gitblit.wicket.models.UserModel;
-public class GitBlit {
+public class GitBlit implements ServletContextListener {
- private static GitBlit gitblit;
+ private final static GitBlit gitblit;
private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
- private final boolean debugMode;
+ private FileResolver<Void> repositoryResolver;
- private final FileResolver repositoryResolver;
+ private File repositoriesFolder;
- private final File repositories;
-
- private final boolean exportAll;
+ private boolean exportAll;
private ILoginService loginService;
+ private IStoredSettings storedSettings;
+
+ static {
+ gitblit = new GitBlit();
+ }
+
public static GitBlit self() {
- if (gitblit == null) {
- gitblit = new GitBlit();
- }
return gitblit;
}
private GitBlit() {
- repositories = new File(StoredSettings.getString("repositoriesFolder", "repos"));
- exportAll = StoredSettings.getBoolean("exportAll", true);
- repositoryResolver = new FileResolver(repositories, exportAll);
- debugMode = StoredSettings.getBoolean("debugMode", false);
}
-
+
+ public IStoredSettings settings() {
+ return storedSettings;
+ }
+
public boolean isDebugMode() {
- return debugMode;
+ return storedSettings.getBoolean(Keys.web.debugMode, false);
+ }
+
+ public String getCloneUrl(String repositoryName) {
+ return storedSettings.getString(Keys.git.cloneUrl, "https://localhost/git/") + repositoryName;
}
public void setLoginService(ILoginService loginService) {
this.loginService = loginService;
}
- public User authenticate(String username, char[] password) {
+ public UserModel authenticate(String username, char[] password) {
if (loginService == null) {
return null;
}
return loginService.authenticate(username, password);
}
- public User authenticate(Cookie[] cookies) {
+ public UserModel authenticate(Cookie[] cookies) {
if (loginService == null) {
return null;
}
@@ -82,46 +91,168 @@
return null;
}
- public void setCookie(WebResponse response, User user) {
+ public void setCookie(WebResponse response, UserModel user) {
Cookie userCookie = new Cookie(Constants.NAME, user.getCookie());
userCookie.setMaxAge(Integer.MAX_VALUE);
userCookie.setPath("/");
response.addCookie(userCookie);
}
- public List<String> getRepositoryList() {
- return JGitUtils.getRepositoryList(repositories, exportAll, StoredSettings.getBoolean("nestedRepositories", true));
+ public List<String> getAllUsernames() {
+ List<String> names = loginService.getAllUsernames();
+ Collections.sort(names);
+ return names;
}
- public List<RepositoryModel> getRepositories(Request request) {
- List<String> list = getRepositoryList();
- ServletWebRequest servletWebRequest = (ServletWebRequest) request;
- HttpServletRequest req = servletWebRequest.getHttpServletRequest();
+ public UserModel getUserModel(String username) {
+ UserModel user = loginService.getUserModel(username);
+ return user;
+ }
+
+ public List<String> getRepositoryUsers(RepositoryModel repository) {
+ return loginService.getUsernamesForRole(repository.name);
+ }
+
+ public boolean setRepositoryUsers(RepositoryModel repository, List<String> repositoryUsers) {
+ return loginService.setUsernamesForRole(repository.name, repositoryUsers);
+ }
- List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
- for (String repo : list) {
- Repository r = getRepository(req, repo);
- String description = JGitUtils.getRepositoryDescription(r);
- String owner = JGitUtils.getRepositoryOwner(r);
- Date lastchange = JGitUtils.getLastChange(r);
- r.close();
- repositories.add(new RepositoryModel(repo, description, owner, lastchange));
+ public void editUserModel(UserModel user, boolean isCreate) throws GitBlitException {
+ if (!loginService.updateUserModel(user)) {
+ throw new GitBlitException(isCreate ? "Failed to add user!" : "Failed to update user!");
}
- return repositories;
}
- public Repository getRepository(HttpServletRequest req, String repositoryName) {
+ public List<String> getRepositoryList() {
+ return JGitUtils.getRepositoryList(repositoriesFolder, exportAll, storedSettings.getBoolean(Keys.git.nestedRepositories, true));
+ }
+
+ public Repository getRepository(String repositoryName) {
Repository r = null;
try {
- r = repositoryResolver.open(req, repositoryName);
+ r = repositoryResolver.open(null, repositoryName);
} catch (RepositoryNotFoundException e) {
r = null;
- logger.error("Failed to find repository " + repositoryName);
- e.printStackTrace();
+ logger.error("GitBlit.getRepository(String) failed to find repository " + repositoryName);
} catch (ServiceNotEnabledException e) {
r = null;
e.printStackTrace();
}
return r;
}
+
+ public List<RepositoryModel> getRepositoryModels(UserModel user) {
+ List<String> list = getRepositoryList();
+ List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
+ for (String repo : list) {
+ RepositoryModel model = getRepositoryModel(user, repo);
+ if (model != null) {
+ repositories.add(model);
+ }
+ }
+ return repositories;
+ }
+
+ public RepositoryModel getRepositoryModel(UserModel user, String repositoryName) {
+ RepositoryModel model = getRepositoryModel(repositoryName);
+ if (model.accessRestriction.atLeast(AccessRestrictionType.VIEW)) {
+ if (user != null && user.canAccessRepository(model.name)) {
+ return model;
+ }
+ return null;
+ } else {
+ return model;
+ }
+ }
+
+ public RepositoryModel getRepositoryModel(String repositoryName) {
+ Repository r = getRepository(repositoryName);
+ RepositoryModel model = new RepositoryModel();
+ model.name = repositoryName;
+ model.hasCommits = JGitUtils.hasCommits(r);
+ model.lastChange = JGitUtils.getLastChange(r);
+ StoredConfig config = JGitUtils.readConfig(r);
+ if (config != null) {
+ model.description = getConfig(config, "description", "");
+ model.owner = getConfig(config, "owner", "");
+ model.useTickets = getConfig(config, "useTickets", false);
+ model.useDocs = getConfig(config, "useDocs", false);
+ model.accessRestriction = AccessRestrictionType.fromName(getConfig(config, "accessRestriction", null));
+ model.showRemoteBranches = getConfig(config, "showRemoteBranches", false);
+ model.isFrozen = getConfig(config, "isFrozen", false);
+ }
+ r.close();
+ return model;
+ }
+
+ private String getConfig(StoredConfig config, String field, String defaultValue) {
+ String value = config.getString("gitblit", null, field);
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ }
+ return value;
+ }
+
+ private boolean getConfig(StoredConfig config, String field, boolean defaultValue) {
+ return config.getBoolean("gitblit", field, defaultValue);
+ }
+
+ public void editRepositoryModel(RepositoryModel repository, boolean isCreate) throws GitBlitException {
+ Repository r = null;
+ if (isCreate) {
+ if (new File(repositoriesFolder, repository.name).exists()) {
+ throw new GitBlitException(MessageFormat.format("Can not create repository {0} because it already exists.", repository.name));
+ }
+ // create repository
+ logger.info("create repository " + repository.name);
+ r = JGitUtils.createRepository(repositoriesFolder, repository.name, true);
+ } else {
+ // load repository
+ logger.info("edit repository " + repository.name);
+ try {
+ r = repositoryResolver.open(null, repository.name);
+ } catch (RepositoryNotFoundException e) {
+ logger.error("Repository not found", e);
+ } catch (ServiceNotEnabledException e) {
+ logger.error("Service not enabled", e);
+ }
+ }
+
+ // update settings
+ StoredConfig config = JGitUtils.readConfig(r);
+ config.setString("gitblit", null, "description", repository.description);
+ config.setString("gitblit", null, "owner", repository.owner);
+ config.setBoolean("gitblit", null, "useTickets", repository.useTickets);
+ config.setBoolean("gitblit", null, "useDocs", repository.useDocs);
+ config.setString("gitblit", null, "accessRestriction", repository.accessRestriction.name());
+ config.setBoolean("gitblit", null, "showRemoteBranches", repository.showRemoteBranches);
+ config.setBoolean("gitblit", null, "isFrozen", repository.isFrozen);
+ try {
+ config.save();
+ } catch (IOException e) {
+ logger.error("Failed to save repository config!", e);
+ }
+ r.close();
+ }
+
+ public void configureContext(IStoredSettings settings) {
+ logger.info("Using configuration from " + settings.toString());
+ this.storedSettings = settings;
+ repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));
+ exportAll = settings.getBoolean(Keys.git.exportAll, true);
+ repositoryResolver = new FileResolver<Void>(repositoriesFolder, exportAll);
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent contextEvent) {
+ if (storedSettings == null) {
+ WebXmlSettings webxmlSettings = new WebXmlSettings(contextEvent.getServletContext());
+ configureContext(webxmlSettings);
+ }
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent contextEvent) {
+ logger.info("GitBlit context destroyed by servlet container.");
+ }
}
--
Gitblit v1.9.1