From e9dac2e9ead1decb8abb1bf9df3cd638a2f5eb04 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 15 Oct 2013 08:13:04 -0400
Subject: [PATCH] Merge pull request #118 from Mrbytes/master
---
src/main/java/com/gitblit/GitBlit.java | 676 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 374 insertions(+), 302 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 8c0d62d..7f82432 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -32,6 +32,7 @@
import java.nio.charset.Charset;
import java.security.Principal;
import java.text.MessageFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -61,6 +62,9 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -87,6 +91,7 @@
import com.gitblit.Constants.AccountType;
import com.gitblit.Constants.AuthenticationType;
import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Constants.CommitMessageRenderer;
import com.gitblit.Constants.FederationRequest;
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.Constants.FederationToken;
@@ -124,6 +129,7 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.LastChange;
import com.gitblit.utils.JsonUtils;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.MetricUtils;
import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.ObjectCache;
@@ -142,28 +148,28 @@
* the web ui and the servlets. This class is either directly instantiated by
* the GitBlitServer class (Gitblit GO) or is reflectively instantiated from the
* definition in the web.xml file (Gitblit WAR).
- *
+ *
* This class is the central logic processor for Gitblit. All settings, user
* object, and repository object operations pass through this class.
- *
+ *
* Repository Resolution. There are two pathways for finding repositories. One
* pathway, for web ui display and repository authentication & authorization, is
* within this class. The other pathway is through the standard GitServlet.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GitBlit implements ServletContextListener {
private static GitBlit gitblit;
-
+
private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(5);
private final List<FederationModel> federationRegistrations = Collections
.synchronizedList(new ArrayList<FederationModel>());
-
+
private final ObjectCache<Collection<GitClientApplication>> clientApplications = new ObjectCache<Collection<GitClientApplication>>();
private final Map<String, FederationModel> federationPullResults = new ConcurrentHashMap<String, FederationModel>();
@@ -171,19 +177,19 @@
private final ObjectCache<Long> repositorySizeCache = new ObjectCache<Long>();
private final ObjectCache<List<Metric>> repositoryMetricsCache = new ObjectCache<List<Metric>>();
-
+
private final Map<String, RepositoryModel> repositoryListCache = new ConcurrentHashMap<String, RepositoryModel>();
-
+
private final Map<String, ProjectModel> projectCache = new ConcurrentHashMap<String, ProjectModel>();
-
+
private final AtomicReference<String> repositoryListSettingsChecksum = new AtomicReference<String>("");
-
+
private final ObjectCache<String> projectMarkdownCache = new ObjectCache<String>();
-
+
private final ObjectCache<String> projectRepositoriesMarkdownCache = new ObjectCache<String>();
private ServletContext servletContext;
-
+
private File baseFolder;
private File repositoriesFolder;
@@ -197,15 +203,15 @@
private ServerStatus serverStatus;
private MailExecutor mailExecutor;
-
+
private LuceneExecutor luceneExecutor;
-
+
private GCExecutor gcExecutor;
-
+
private TimeZone timezone;
-
+
private FileBasedConfig projectConfigs;
-
+
private FanoutService fanoutService;
private GitDaemon gitDaemon;
@@ -224,7 +230,7 @@
/**
* Returns the Gitblit singleton.
- *
+ *
* @return gitblit singleton
*/
public static GitBlit self() {
@@ -233,19 +239,19 @@
}
return gitblit;
}
-
+
/**
* Returns the boot date of the Gitblit server.
- *
+ *
* @return the boot date of Gitblit
*/
public static Date getBootDate() {
return self().serverStatus.bootDate;
}
-
+
/**
* Returns the most recent change date of any repository served by Gitblit.
- *
+ *
* @return a date
*/
public static Date getLastActivityDate() {
@@ -263,17 +269,17 @@
/**
* Determine if this is the GO variant of Gitblit.
- *
+ *
* @return true if this is the GO variant of Gitblit.
*/
public static boolean isGO() {
return self().settings instanceof FileSettings;
}
-
+
/**
* Determine if this Gitblit instance is actively serving git repositories
* or if it is merely a repository viewer.
- *
+ *
* @return true if Gitblit is serving repositories
*/
public static boolean isServingRepositories() {
@@ -283,7 +289,7 @@
/**
* Determine if this Gitblit instance is actively serving git repositories
* or if it is merely a repository viewer.
- *
+ *
* @return true if Gitblit is serving repositories
*/
public static boolean isSendingMail() {
@@ -292,7 +298,7 @@
/**
* Returns the preferred timezone for the Gitblit instance.
- *
+ *
* @return a timezone
*/
public static TimeZone getTimezone() {
@@ -306,31 +312,31 @@
}
return self().timezone;
}
-
+
/**
* Returns the active settings.
- *
+ *
* @return the active settings
*/
public static IStoredSettings getSettings() {
return self().settings;
}
-
+
/**
* Returns the user-defined blob encodings.
- *
+ *
* @return an array of encodings, may be empty
*/
public static String [] getEncodings() {
return getStrings(Keys.web.blobEncodings).toArray(new String[0]);
}
-
+
/**
* Returns the boolean value for the specified key. If the key does not
* exist or the value for the key can not be interpreted as a boolean, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getBoolean(String, boolean)
* @param key
* @param defaultValue
@@ -344,7 +350,7 @@
* Returns the integer value for the specified key. If the key does not
* exist or the value for the key can not be interpreted as an integer, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getInteger(String key, int defaultValue)
* @param key
* @param defaultValue
@@ -358,7 +364,7 @@
* Returns the integer list for the specified key. If the key does not
* exist or the value for the key can not be interpreted as an integer, an
* empty list is returned.
- *
+ *
* @see IStoredSettings.getIntegers(String key)
* @param key
* @return key value or defaultValue
@@ -366,12 +372,12 @@
public static List<Integer> getIntegers(String key) {
return self().settings.getIntegers(key);
}
-
+
/**
* Returns the value in bytes for the specified key. If the key does not
* exist or the value for the key can not be interpreted as an integer, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getFilesize(String key, int defaultValue)
* @param key
* @param defaultValue
@@ -385,7 +391,7 @@
* Returns the value in bytes for the specified key. If the key does not
* exist or the value for the key can not be interpreted as a long, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getFilesize(String key, long defaultValue)
* @param key
* @param defaultValue
@@ -399,7 +405,7 @@
* Returns the char value for the specified key. If the key does not exist
* or the value for the key can not be interpreted as a character, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getChar(String key, char defaultValue)
* @param key
* @param defaultValue
@@ -413,7 +419,7 @@
* Returns the string value for the specified key. If the key does not exist
* or the value for the key can not be interpreted as a string, the
* defaultValue is returned.
- *
+ *
* @see IStoredSettings.getString(String key, String defaultValue)
* @param key
* @param defaultValue
@@ -425,7 +431,7 @@
/**
* Returns a list of space-separated strings from the specified key.
- *
+ *
* @see IStoredSettings.getStrings(String key)
* @param n
* @return list of strings
@@ -436,7 +442,7 @@
/**
* Returns a map of space-separated key-value pairs from the specified key.
- *
+ *
* @see IStoredSettings.getStrings(String key)
* @param n
* @return map of string, string
@@ -448,7 +454,7 @@
/**
* Returns the list of keys whose name starts with the specified prefix. If
* the prefix is null or empty, all key names are returned.
- *
+ *
* @see IStoredSettings.getAllKeys(String key)
* @param startingWith
* @return list of keys
@@ -460,7 +466,7 @@
/**
* Is Gitblit running in debug mode?
- *
+ *
* @return true if Gitblit is running in debug mode
*/
public static boolean isDebugMode() {
@@ -469,7 +475,7 @@
/**
* Returns the file object for the specified configuration key.
- *
+ *
* @return the file
*/
public static File getFileOrFolder(String key, String defaultFileOrFolder) {
@@ -483,7 +489,7 @@
* file or folder retrievals are (at least initially) funneled through this
* method so it is the correct point to globally override/alter filesystem
* access based on environment or some other indicator.
- *
+ *
* @return the file
*/
public static File getFileOrFolder(String fileOrFolder) {
@@ -494,7 +500,7 @@
/**
* Returns the path of the repositories folder. This method checks to see if
* Gitblit is running on a cloud service and may return an adjusted path.
- *
+ *
* @return the repositories folder path
*/
public static File getRepositoriesFolder() {
@@ -504,7 +510,7 @@
/**
* Returns the path of the proposals folder. This method checks to see if
* Gitblit is running on a cloud service and may return an adjusted path.
- *
+ *
* @return the proposals folder path
*/
public static File getProposalsFolder() {
@@ -514,16 +520,16 @@
/**
* Returns the path of the Groovy folder. This method checks to see if
* Gitblit is running on a cloud service and may return an adjusted path.
- *
+ *
* @return the Groovy scripts folder path
*/
public static File getGroovyScriptsFolder() {
return getFileOrFolder(Keys.groovy.scriptsFolder, "${baseFolder}/groovy");
}
-
+
/**
* Updates the list of server settings.
- *
+ *
* @param settings
* @return true if the update succeeded
*/
@@ -537,10 +543,10 @@
serverStatus.heapFree = Runtime.getRuntime().freeMemory();
return serverStatus;
}
-
+
/**
* Returns a list of repository URLs and the user access permission.
- *
+ *
* @param request
* @param user
* @param repository
@@ -586,13 +592,13 @@
}
return list;
}
-
+
protected String getRepositoryUrl(HttpServletRequest request, String username, RepositoryModel repository) {
StringBuilder sb = new StringBuilder();
sb.append(HttpUtils.getGitblitURL(request));
sb.append(Constants.GIT_PATH);
sb.append(repository.name);
-
+
// inject username into repository url if authentication is required
if (repository.accessRestriction.exceeds(AccessRestrictionType.NONE)
&& !StringUtils.isEmpty(username)) {
@@ -600,7 +606,7 @@
}
return sb.toString();
}
-
+
protected String getGitDaemonUrl(HttpServletRequest request, UserModel user, RepositoryModel repository) {
if (gitDaemon != null) {
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
@@ -617,7 +623,7 @@
}
return null;
}
-
+
protected AccessPermission getGitDaemonAccessPermission(UserModel user, RepositoryModel repository) {
if (gitDaemon != null && user.canClone(repository)) {
AccessPermission gitDaemonPermission = user.getRepositoryPermission(repository).permission;
@@ -640,7 +646,7 @@
/**
* Returns the list of custom client applications to be used for the
* repository url panel;
- *
+ *
* @return a collection of client applications
*/
public Collection<GitClientApplication> getClientApplications() {
@@ -659,13 +665,13 @@
if (clients != null) {
clientApplications.updateObject("user", lastModified, clients);
return clients;
- }
+ }
} catch (IOException e) {
logger.error("Failed to deserialize " + userDefs.getAbsolutePath(), e);
}
}
}
-
+
// no user definitions, use system definitions
if (!clientApplications.hasCurrent("system", new Date(0))) {
try {
@@ -679,10 +685,10 @@
logger.error("Failed to deserialize clientapps.json resource!", e);
}
}
-
+
return clientApplications.getObject("system");
}
-
+
private Collection<GitClientApplication> readClientApplications(InputStream is) {
try {
Type type = new TypeToken<Collection<GitClientApplication>>() {
@@ -702,7 +708,7 @@
/**
* Set the user service. The user service authenticates all users and is
* responsible for managing user permissions.
- *
+ *
* @param userService
*/
public void setUserService(IUserService userService) {
@@ -710,14 +716,14 @@
this.userService = userService;
this.userService.setup(settings);
}
-
+
public boolean supportsAddUser() {
return supportsCredentialChanges(new UserModel(""));
}
-
+
/**
* Returns true if the user's credentials can be changed.
- *
+ *
* @param user
* @return true if the user service supports credential changes
*/
@@ -735,7 +741,7 @@
/**
* Returns true if the user's display name can be changed.
- *
+ *
* @param user
* @return true if the user service supports display name changes
*/
@@ -745,7 +751,7 @@
/**
* Returns true if the user's email address can be changed.
- *
+ *
* @param user
* @return true if the user service supports email address changes
*/
@@ -755,7 +761,7 @@
/**
* Returns true if the user's team memberships can be changed.
- *
+ *
* @param user
* @return true if the user service supports team membership changes
*/
@@ -765,7 +771,7 @@
/**
* Returns true if the username represents an internal account
- *
+ *
* @param username
* @return true if the specified username represents an internal account
*/
@@ -777,7 +783,7 @@
/**
* Authenticate a user based on a username and password.
- *
+ *
* @see IUserService.authenticate(String, char[])
* @param username
* @param password
@@ -814,7 +820,7 @@
/**
* Authenticate a user based on their cookie.
- *
+ *
* @param cookies
* @return a user object or null
*/
@@ -837,22 +843,22 @@
/**
* Authenticate a user based on HTTP request parameters.
- *
+ *
* Authentication by X509Certificate is tried first and then by cookie.
- *
+ *
* @param httpRequest
* @return a user object or null
*/
public UserModel authenticate(HttpServletRequest httpRequest) {
return authenticate(httpRequest, false);
}
-
+
/**
* Authenticate a user based on HTTP request parameters.
- *
+ *
* Authentication by X509Certificate, servlet container principal, cookie,
* and BASIC header.
- *
+ *
* @param httpRequest
* @param requiresCertificate
* @return a user object or null
@@ -876,12 +882,12 @@
model.username, metadata.serialNumber, httpRequest.getRemoteAddr()));
}
}
-
+
if (requiresCertificate) {
// caller requires client certificate authentication (e.g. git servlet)
return null;
}
-
+
// try to authenticate by servlet container principal
Principal principal = httpRequest.getUserPrincipal();
if (principal != null) {
@@ -912,7 +918,7 @@
}
}
}
-
+
// try to authenticate by cookie
if (allowCookieAuthentication()) {
UserModel user = authenticate(httpRequest.getCookies());
@@ -923,7 +929,7 @@
return user;
}
}
-
+
// try to authenticate by BASIC
final String authorization = httpRequest.getHeader("Authorization");
if (authorization != null && authorization.startsWith("Basic")) {
@@ -944,14 +950,14 @@
user.username, httpRequest.getRemoteAddr()));
return user;
} else {
- logger.warn(MessageFormat.format("Failed login attempt for {0}, invalid credentials ({1}) from {2}",
- username, credentials, httpRequest.getRemoteAddr()));
+ logger.warn(MessageFormat.format("Failed login attempt for {0}, invalid credentials from {1}",
+ username, httpRequest.getRemoteAddr()));
}
}
}
return null;
}
-
+
protected void flagWicketSession(AuthenticationType authenticationType) {
RequestCycle requestCycle = RequestCycle.get();
if (requestCycle != null) {
@@ -974,7 +980,7 @@
/**
* Sets a cookie for the specified user.
- *
+ *
* @param response
* @param user
*/
@@ -1006,10 +1012,10 @@
response.addCookie(userCookie);
}
}
-
+
/**
* Logout a user.
- *
+ *
* @param user
*/
public void logout(UserModel user) {
@@ -1021,27 +1027,27 @@
/**
* Encode the username for user in an url.
- *
+ *
* @param name
* @return the encoded name
*/
protected String encodeUsername(String name) {
- return name.replace("@", "%40").replace(" ", "%20").replace("\\", "%5C");
+ return name.replace("@", "%40").replace(" ", "%20").replace("\\", "%5C");
}
/**
* Decode a username from an encoded url.
- *
+ *
* @param name
* @return the decoded name
*/
protected String decodeUsername(String name) {
return name.replace("%40", "@").replace("%20", " ").replace("%5C", "\\");
}
-
+
/**
* Returns the list of all users available to the login service.
- *
+ *
* @see IUserService.getAllUsernames()
* @return list of all usernames
*/
@@ -1052,7 +1058,7 @@
/**
* Returns the list of all users available to the login service.
- *
+ *
* @see IUserService.getAllUsernames()
* @return list of all usernames
*/
@@ -1063,7 +1069,7 @@
/**
* Delete the user object with the specified username
- *
+ *
* @see IUserService.deleteUser(String)
* @param username
* @return true if successful
@@ -1075,7 +1081,7 @@
String usernameDecoded = decodeUsername(username);
return userService.deleteUser(usernameDecoded);
}
-
+
protected UserModel getFederationUser() {
// the federation user is an administrator
UserModel federationUser = new UserModel(Constants.FEDERATION_USER);
@@ -1085,7 +1091,7 @@
/**
* Retrieve the user object for the specified username.
- *
+ *
* @see IUserService.getUserModel(String)
* @param username
* @return a user object or null
@@ -1095,14 +1101,14 @@
return null;
}
String usernameDecoded = decodeUsername(username);
- UserModel user = userService.getUserModel(usernameDecoded);
+ UserModel user = userService.getUserModel(usernameDecoded);
return user;
}
-
+
/**
* Returns the effective list of permissions for this user, taking into account
* team memberships, ownerships.
- *
+ *
* @param user
* @return the effective list of permissions for the user
*/
@@ -1137,7 +1143,7 @@
set.add(rp);
}
}
-
+
List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>(set);
Collections.sort(list);
return list;
@@ -1147,7 +1153,7 @@
* Returns the list of users and their access permissions for the specified
* repository including permission source information such as the team or
* regular expression which sets the permission.
- *
+ *
* @param repository
* @return a list of RegistrantAccessPermissions
*/
@@ -1170,10 +1176,10 @@
}
return list;
}
-
+
/**
* Sets the access permissions to the specified repository for the specified users.
- *
+ *
* @param repository
* @param permissions
* @return true if the user models have been updated
@@ -1190,11 +1196,11 @@
}
return userService.updateUserModels(users);
}
-
+
/**
* Returns the list of all users who have an explicit access permission
* for the specified repository.
- *
+ *
* @see IUserService.getUsernamesForRepositoryRole(String)
* @param repository
* @return list of all usernames that have an access permission for the repository
@@ -1206,7 +1212,7 @@
/**
* Sets the list of all uses who are allowed to bypass the access
* restriction placed on the specified repository.
- *
+ *
* @see IUserService.setUsernamesForRepositoryRole(String, List<String>)
* @param repository
* @param usernames
@@ -1222,7 +1228,7 @@
/**
* Adds/updates a complete user object keyed by username. This method allows
* for renaming a user.
- *
+ *
* @see IUserService.updateUserModel(String, UserModel)
* @param username
* @param user
@@ -1237,7 +1243,7 @@
"Failed to rename ''{0}'' because ''{1}'' already exists.", username,
user.username));
}
-
+
// rename repositories and owner fields for all repositories
for (RepositoryModel model : getRepositoryModels(user)) {
if (model.isUsersPersonalRepository(username)) {
@@ -1262,7 +1268,7 @@
/**
* Returns the list of available teams that a user or repository may be
* assigned to.
- *
+ *
* @return the list of teams
*/
public List<String> getAllTeamnames() {
@@ -1273,7 +1279,7 @@
/**
* Returns the list of available teams that a user or repository may be
* assigned to.
- *
+ *
* @return the list of teams
*/
public List<TeamModel> getAllTeams() {
@@ -1283,19 +1289,19 @@
/**
* Returns the TeamModel object for the specified name.
- *
+ *
* @param teamname
* @return a TeamModel object or null
*/
public TeamModel getTeamModel(String teamname) {
return userService.getTeamModel(teamname);
}
-
+
/**
* Returns the list of teams and their access permissions for the specified
* repository including the source of the permission such as the admin flag
* or a regular expression.
- *
+ *
* @param repository
* @return a list of RegistrantAccessPermissions
*/
@@ -1310,10 +1316,10 @@
Collections.sort(list);
return list;
}
-
+
/**
* Sets the access permissions to the specified repository for the specified teams.
- *
+ *
* @param repository
* @param permissions
* @return true if the team models have been updated
@@ -1330,11 +1336,11 @@
}
return userService.updateTeamModels(teams);
}
-
+
/**
* Returns the list of all teams who have an explicit access permission for
* the specified repository.
- *
+ *
* @see IUserService.getTeamnamesForRepositoryRole(String)
* @param repository
* @return list of all teamnames with explicit access permissions to the repository
@@ -1346,7 +1352,7 @@
/**
* Sets the list of all uses who are allowed to bypass the access
* restriction placed on the specified repository.
- *
+ *
* @see IUserService.setTeamnamesForRepositoryRole(String, List<String>)
* @param repository
* @param teamnames
@@ -1361,7 +1367,7 @@
/**
* Updates the TeamModel object for the specified name.
- *
+ *
* @param teamname
* @param team
* @param isCreate
@@ -1382,7 +1388,7 @@
/**
* Delete the team object with the specified teamname
- *
+ *
* @see IUserService.deleteTeam(String)
* @param teamname
* @return true if successful
@@ -1390,17 +1396,17 @@
public boolean deleteTeam(String teamname) {
return userService.deleteTeam(teamname);
}
-
+
/**
* Adds the repository to the list of cached repositories if Gitblit is
* configured to cache the repository list.
- *
+ *
* @param model
*/
private void addToCachedRepositoryList(RepositoryModel model) {
if (settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
repositoryListCache.put(model.name.toLowerCase(), model);
-
+
// update the fork origin repository with this repository clone
if (!StringUtils.isEmpty(model.originRepository)) {
if (repositoryListCache.containsKey(model.originRepository)) {
@@ -1410,10 +1416,10 @@
}
}
}
-
+
/**
* Removes the repository from the list of cached repositories.
- *
+ *
* @param name
* @return the model being removed
*/
@@ -1426,23 +1432,23 @@
/**
* Clears all the cached metadata for the specified repository.
- *
+ *
* @param repositoryName
*/
private void clearRepositoryMetadataCache(String repositoryName) {
repositorySizeCache.remove(repositoryName);
repositoryMetricsCache.remove(repositoryName);
}
-
+
/**
* Resets the repository list cache.
- *
+ *
*/
public void resetRepositoryListCache() {
logger.info("Repository cache manually reset");
repositoryListCache.clear();
}
-
+
/**
* Calculate the checksum of settings that affect the repository list cache.
* @return a checksum
@@ -1457,11 +1463,11 @@
String checksum = StringUtils.getSHA1(ns.toString());
return checksum;
}
-
+
/**
* Compare the last repository list setting checksum to the current checksum.
* If different then clear the cache so that it may be rebuilt.
- *
+ *
* @return true if the cached repository list is valid since the last check
*/
private boolean isValidRepositoryList() {
@@ -1478,14 +1484,14 @@
/**
* Returns the list of all repositories available to Gitblit. This method
* does not consider user access permissions.
- *
+ *
* @return list of all repositories
*/
public List<String> getRepositoryList() {
if (repositoryListCache.size() == 0 || !isValidRepositoryList()) {
// we are not caching OR we have not yet cached OR the cached list is invalid
long startTime = System.currentTimeMillis();
- List<String> repositories = JGitUtils.getRepositoryList(repositoriesFolder,
+ List<String> repositories = JGitUtils.getRepositoryList(repositoriesFolder,
settings.getBoolean(Keys.git.onlyAccessBareRepositories, false),
settings.getBoolean(Keys.git.searchRepositoriesSubfolders, true),
settings.getInteger(Keys.git.searchRecursionDepth, -1),
@@ -1502,11 +1508,11 @@
// optionally (re)calculate repository sizes
msg = "{0} repositories identified with calculated folder sizes in {1} msecs";
}
-
+
for (String repository : repositories) {
getRepositoryModel(repository);
}
-
+
// rebuild fork networks
for (RepositoryModel model : repositoryListCache.values()) {
if (!StringUtils.isEmpty(model.originRepository)) {
@@ -1516,12 +1522,12 @@
}
}
}
-
+
long duration = System.currentTimeMillis() - startTime;
logger.info(MessageFormat.format(msg, repositoryListCache.size(), duration));
}
}
-
+
// return sorted copy of cached list
List<String> list = new ArrayList<String>();
for (RepositoryModel model : repositoryListCache.values()) {
@@ -1533,7 +1539,7 @@
/**
* Returns the JGit repository for the specified name.
- *
+ *
* @param repositoryName
* @return repository or null
*/
@@ -1543,7 +1549,7 @@
/**
* Returns the JGit repository for the specified name.
- *
+ *
* @param repositoryName
* @param logError
* @return repository or null
@@ -1552,7 +1558,7 @@
// Decode url-encoded repository name (issue-278)
// http://stackoverflow.com/questions/17183110
repositoryName = repositoryName.replace("%7E", "~").replace("%7e", "~");
-
+
if (isCollectingGarbage(repositoryName)) {
logger.warn(MessageFormat.format("Rejecting request for {0}, busy collecting garbage!", repositoryName));
return null;
@@ -1561,7 +1567,7 @@
File dir = FileKey.resolve(new File(repositoriesFolder, repositoryName), FS.DETECTED);
if (dir == null)
return null;
-
+
Repository r = null;
try {
FileKey key = FileKey.exact(dir, FS.DETECTED);
@@ -1577,7 +1583,7 @@
/**
* Returns the list of repository models that are accessible to the user.
- *
+ *
* @param user
* @return list of repository models accessible to user
*/
@@ -1608,7 +1614,7 @@
/**
* Returns a repository model if the repository exists and the user may
* access the repository.
- *
+ *
* @param user
* @param repositoryName
* @return repository model or null
@@ -1630,7 +1636,7 @@
/**
* Returns the repository model for the specified repository. This method
* does not consider user access permissions.
- *
+ *
* @param repositoryName
* @return repository model or null
*/
@@ -1647,7 +1653,7 @@
addToCachedRepositoryList(model);
return DeepCopier.copy(model);
}
-
+
// cached model
RepositoryModel model = repositoryListCache.get(repositoryName.toLowerCase());
@@ -1666,7 +1672,7 @@
logger.error(MessageFormat.format("Repository \"{0}\" is missing! Removing from cache.", repositoryName));
return null;
}
-
+
FileBasedConfig config = (FileBasedConfig) getRepositoryConfig(r);
if (config.isOutdated()) {
// reload model
@@ -1675,7 +1681,7 @@
removeFromCachedRepositoryList(model.name);
addToCachedRepositoryList(model);
} else {
- // update a few repository parameters
+ // update a few repository parameters
if (!model.hasCommits) {
// update hasCommits, assume a repository only gains commits :)
model.hasCommits = JGitUtils.hasCommits(r);
@@ -1684,14 +1690,14 @@
updateLastChangeFields(r, model);
}
r.close();
-
+
// return a copy of the cached model
return DeepCopier.copy(model);
}
-
+
/**
* Returns the star count of the repository.
- *
+ *
* @param repository
* @return the star count
*/
@@ -1704,7 +1710,7 @@
}
return count;
}
-
+
private void reloadProjectMarkdown(ProjectModel project) {
// project markdown
File pmkd = new File(getRepositoriesFolder(), (project.isRoot ? "" : project.name) + "/project.mkd");
@@ -1716,7 +1722,7 @@
}
project.projectMarkdown = projectMarkdownCache.getObject(project.name);
}
-
+
// project repositories markdown
File rmkd = new File(getRepositoriesFolder(), (project.isRoot ? "" : project.name) + "/repositories.mkd");
if (rmkd.exists()) {
@@ -1728,17 +1734,17 @@
project.repositoriesMarkdown = projectRepositoriesMarkdownCache.getObject(project.name);
}
}
-
-
+
+
/**
* Returns the map of project config. This map is cached and reloaded if
* the underlying projects.conf file changes.
- *
+ *
* @return project config map
*/
private Map<String, ProjectModel> getProjectConfigs() {
if (projectCache.isEmpty() || projectConfigs.isOutdated()) {
-
+
try {
projectConfigs.load();
} catch (Exception e) {
@@ -1762,9 +1768,9 @@
}
project.title = projectConfigs.getString("project", name, "title");
project.description = projectConfigs.getString("project", name, "description");
-
+
reloadProjectMarkdown(project);
-
+
configs.put(name.toLowerCase(), project);
}
projectCache.clear();
@@ -1772,10 +1778,10 @@
}
return projectCache;
}
-
+
/**
* Returns a list of project models for the user.
- *
+ *
* @param user
* @param includeUsers
* @return list of projects that are accessible to the user
@@ -1787,9 +1793,9 @@
Map<String, ProjectModel> map = new TreeMap<String, ProjectModel>();
// root project
map.put("", configs.get(""));
-
+
for (RepositoryModel model : getRepositoryModels(user)) {
- String rootPath = StringUtils.getRootPath(model.name).toLowerCase();
+ String rootPath = StringUtils.getRootPath(model.name).toLowerCase();
if (!map.containsKey(rootPath)) {
ProjectModel project;
if (configs.containsKey(rootPath)) {
@@ -1803,7 +1809,7 @@
}
map.get(rootPath).addRepository(model);
}
-
+
// sort projects, root project first
List<ProjectModel> projects;
if (includeUsers) {
@@ -1826,10 +1832,10 @@
}
return projects;
}
-
+
/**
* Returns the project model for the specified user.
- *
+ *
* @param name
* @param user
* @return a project model, or null if it does not exist
@@ -1842,10 +1848,10 @@
}
return null;
}
-
+
/**
* Returns a project model for the Gitblit/system user.
- *
+ *
* @param name a project name
* @return a project model or null if the project does not exist
*/
@@ -1885,16 +1891,16 @@
// no repositories == no project
return null;
}
-
+
reloadProjectMarkdown(project);
return project;
}
-
+
/**
* Returns the list of project models that are referenced by the supplied
* repository model list. This is an alternative method exists to ensure
* Gitblit does not call getRepositoryModels(UserModel) twice in a request.
- *
+ *
* @param repositoryModels
* @param includeUsers
* @return a list of project models
@@ -1932,7 +1938,7 @@
}
return new ArrayList<ProjectModel>(projects.values());
}
-
+
/**
* Workaround JGit. I need to access the raw config object directly in order
* to see if the config is dirty so that I can reload a repository model.
@@ -1940,7 +1946,7 @@
* config. If the config changes are made within Gitblit this is fine as
* the returned config will still be flagged as dirty. BUT... if the config
* is manipulated outside Gitblit then it fails to recognize this as dirty.
- *
+ *
* @param r
* @return a config
*/
@@ -1955,10 +1961,10 @@
}
return r.getConfig();
}
-
+
/**
* Create a repository model from the configuration and repository data.
- *
+ *
* @param repositoryName
* @return a repositoryModel or null if the repository does not exist
*/
@@ -1981,10 +1987,10 @@
model.name = repositoryName;
}
model.projectPath = StringUtils.getFirstPathElement(repositoryName);
-
+
StoredConfig config = r.getConfig();
boolean hasOrigin = !StringUtils.isEmpty(config.getString("remote", "origin", "url"));
-
+
if (config != null) {
// Initialize description from description file
if (getConfig(config,"description", null) == null) {
@@ -1999,13 +2005,12 @@
model.description = getConfig(config, "description", "");
model.originRepository = getConfig(config, "originRepository", null);
model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));
- model.useTickets = getConfig(config, "useTickets", false);
model.useDocs = getConfig(config, "useDocs", false);
model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);
model.incrementalPushTagPrefix = getConfig(config, "incrementalPushTagPrefix", null);
model.allowForks = getConfig(config, "allowForks", true);
model.accessRestriction = AccessRestrictionType.fromName(getConfig(config,
- "accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, null)));
+ "accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, "PUSH")));
model.authorizationControl = AuthorizationControl.fromName(getConfig(config,
"authorizationControl", settings.getString(Keys.git.defaultAuthorizationControl, null)));
model.verifyCommitter = getConfig(config, "verifyCommitter", false);
@@ -2014,6 +2019,8 @@
model.showReadme = getConfig(config, "showReadme", false);
model.skipSizeCalculation = getConfig(config, "skipSizeCalculation", false);
model.skipSummaryMetrics = getConfig(config, "skipSummaryMetrics", false);
+ model.commitMessageRenderer = CommitMessageRenderer.fromName(getConfig(config, "commitMessageRenderer",
+ settings.getString(Keys.web.commitMessageRenderer, null)));
model.federationStrategy = FederationStrategy.fromName(getConfig(config,
"federationStrategy", null));
model.federationSets = new ArrayList<String>(Arrays.asList(config.getStringList(
@@ -2041,7 +2048,7 @@
Constants.CONFIG_GITBLIT, null, "indexBranch")));
model.metricAuthorExclusions = new ArrayList<String>(Arrays.asList(config.getStringList(
Constants.CONFIG_GITBLIT, null, "metricAuthorExclusions")));
-
+
// Custom defined properties
model.customFields = new LinkedHashMap<String, String>();
for (String aProperty : config.getNames(Constants.CONFIG_GITBLIT, Constants.CONFIG_CUSTOM_FIELDS)) {
@@ -2054,7 +2061,7 @@
model.hasCommits = JGitUtils.hasCommits(r);
updateLastChangeFields(r, model);
r.close();
-
+
if (StringUtils.isEmpty(model.originRepository) && model.origin != null && model.origin.startsWith("file://")) {
// repository was cloned locally... perhaps as a fork
try {
@@ -2065,7 +2072,7 @@
File repoFolder = new File(getRepositoriesFolder(), originRepo);
if (repoFolder.exists()) {
model.originRepository = originRepo.toLowerCase();
-
+
// persist the fork origin
updateConfiguration(r, model);
}
@@ -2076,20 +2083,20 @@
}
return model;
}
-
+
/**
* Determines if this server has the requested repository.
- *
+ *
* @param n
* @return true if the repository exists
*/
public boolean hasRepository(String repositoryName) {
return hasRepository(repositoryName, false);
}
-
+
/**
* Determines if this server has the requested repository.
- *
+ *
* @param n
* @param caseInsensitive
* @return true if the repository exists
@@ -2099,7 +2106,7 @@
// if we are caching use the cache to determine availability
// otherwise we end up adding a phantom repository to the cache
return repositoryListCache.containsKey(repositoryName.toLowerCase());
- }
+ }
Repository r = getRepository(repositoryName, false);
if (r == null) {
return false;
@@ -2107,11 +2114,11 @@
r.close();
return true;
}
-
+
/**
* Determines if the specified user has a fork of the specified origin
* repository.
- *
+ *
* @param username
* @param origin
* @return true the if the user has a fork
@@ -2119,11 +2126,11 @@
public boolean hasFork(String username, String origin) {
return getFork(username, origin) != null;
}
-
+
/**
* Gets the name of a user's fork of the specified origin
* repository.
- *
+ *
* @param username
* @param origin
* @return the name of the user's fork, null otherwise
@@ -2145,7 +2152,7 @@
}
}
}
-
+
if (originModel.originRepository != null) {
roots.add(originModel.originRepository);
originModel = repositoryListCache.get(originModel.originRepository);
@@ -2154,7 +2161,7 @@
originModel = null;
}
}
-
+
for (String repository : repositoryListCache.keySet()) {
if (repository.startsWith(userPath)) {
RepositoryModel model = repositoryListCache.get(repository);
@@ -2185,11 +2192,11 @@
// user does not have a fork
return null;
}
-
+
/**
* Returns the fork network for a repository by traversing up the fork graph
* to discover the root and then down through all children of the root node.
- *
+ *
* @param repository
* @return a ForkModel
*/
@@ -2212,7 +2219,7 @@
return root;
}
}
-
+
private ForkModel getForkModelFromCache(String repository) {
RepositoryModel model = repositoryListCache.get(repository.toLowerCase());
if (model == null) {
@@ -2229,7 +2236,7 @@
}
return fork;
}
-
+
private ForkModel getForkModel(String repository) {
RepositoryModel model = getRepositoryModel(repository.toLowerCase());
if (model == null) {
@@ -2252,7 +2259,7 @@
* repository. Gitblit caches the repository sizes to reduce the performance
* penalty of recursive calculation. The cache is updated if the repository
* has been changed since the last calculation.
- *
+ *
* @param model
* @return size in bytes of the repository
*/
@@ -2279,7 +2286,7 @@
/**
* Ensure that a cached repository is completely closed and its resources
* are properly released.
- *
+ *
* @param repositoryName
*/
private void closeRepository(String repositoryName) {
@@ -2314,7 +2321,7 @@
repository.close();
}
}
-
+
// close any open index writer/searcher in the Lucene executor
luceneExecutor.close(repositoryName);
}
@@ -2324,7 +2331,7 @@
* This method builds a metrics cache. The cache is updated if the
* repository is updated. A new copy of the metrics list is returned on each
* call so that modifications to the list are non-destructive.
- *
+ *
* @param model
* @param repository
* @return a new array list of metrics
@@ -2341,7 +2348,7 @@
/**
* Returns the gitblit string value for the specified key. If key is not
* set, returns defaultValue.
- *
+ *
* @param config
* @param field
* @param defaultValue
@@ -2358,7 +2365,7 @@
/**
* Returns the gitblit boolean value for the specified key. If key is not
* set, returns defaultValue.
- *
+ *
* @param config
* @param field
* @param defaultValue
@@ -2367,11 +2374,11 @@
private boolean getConfig(StoredConfig config, String field, boolean defaultValue) {
return config.getBoolean(Constants.CONFIG_GITBLIT, field, defaultValue);
}
-
+
/**
* Returns the gitblit string value for the specified key. If key is not
* set, returns defaultValue.
- *
+ *
* @param config
* @param field
* @param defaultValue
@@ -2393,11 +2400,11 @@
* Creates/updates the repository model keyed by reopsitoryName. Saves all
* repository settings in .git/config. This method allows for renaming
* repositories and will update user access permissions accordingly.
- *
+ *
* All repositories created by this method are bare and automatically have
* .git appended to their names, which is the standard convention for bare
* repositories.
- *
+ *
* @param repositoryName
* @param repository
* @param isCreate
@@ -2468,7 +2475,7 @@
"Failed to rename repository permissions ''{0}'' to ''{1}''.",
repositoryName, repository.name));
}
-
+
// rename fork origins in their configs
if (!ArrayUtils.isEmpty(repository.forks)) {
for (String fork : repository.forks) {
@@ -2486,7 +2493,7 @@
rf.close();
}
}
-
+
// update this repository's origin's fork list
if (!StringUtils.isEmpty(repository.originRepository)) {
RepositoryModel origin = repositoryListCache.get(repository.originRepository);
@@ -2521,7 +2528,7 @@
// only update symbolic head if it changes
String currentRef = JGitUtils.getHEADRef(r);
if (!StringUtils.isEmpty(repository.HEAD) && !repository.HEAD.equals(currentRef)) {
- logger.info(MessageFormat.format("Relinking {0} HEAD from {1} to {2}",
+ logger.info(MessageFormat.format("Relinking {0} HEAD from {1} to {2}",
repository.name, currentRef, repository.HEAD));
if (JGitUtils.setHEADtoRef(r, repository.HEAD)) {
// clear the cache
@@ -2529,25 +2536,25 @@
}
}
+ // Adjust permissions in case we updated the config files
+ JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "config"),
+ getString(Keys.git.createRepositoriesShared, "FALSE"));
+ JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "HEAD"),
+ getString(Keys.git.createRepositoriesShared, "FALSE"));
+
// close the repository object
r.close();
}
-
- // Adjust permissions in case we updated the config files
- JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "config"),
- getString(Keys.git.createRepositoriesShared, "FALSE"));
- JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "HEAD"),
- getString(Keys.git.createRepositoriesShared, "FALSE"));
// update repository cache
removeFromCachedRepositoryList(repositoryName);
// model will actually be replaced on next load because config is stale
addToCachedRepositoryList(repository);
}
-
+
/**
* Updates the Gitblit configuration for the specified repository.
- *
+ *
* @param r
* the Git repository
* @param repository
@@ -2558,7 +2565,6 @@
config.setString(Constants.CONFIG_GITBLIT, null, "description", repository.description);
config.setString(Constants.CONFIG_GITBLIT, null, "originRepository", repository.originRepository);
config.setString(Constants.CONFIG_GITBLIT, null, "owner", ArrayUtils.toString(repository.owners));
- config.setBoolean(Constants.CONFIG_GITBLIT, null, "useTickets", repository.useTickets);
config.setBoolean(Constants.CONFIG_GITBLIT, null, "useDocs", repository.useDocs);
config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalPushTags", repository.useIncrementalPushTags);
if (StringUtils.isEmpty(repository.incrementalPushTagPrefix) ||
@@ -2596,13 +2602,23 @@
config.setInt(Constants.CONFIG_GITBLIT, null, "maxActivityCommits", repository.maxActivityCommits);
}
+ CommitMessageRenderer defaultRenderer = CommitMessageRenderer.fromName(settings.getString(Keys.web.commitMessageRenderer, null));
+ if (repository.commitMessageRenderer == null || repository.commitMessageRenderer == defaultRenderer) {
+ // use default from config
+ config.unset(Constants.CONFIG_GITBLIT, null, "commitMessageRenderer");
+ } else {
+ // repository overrides default
+ config.setString(Constants.CONFIG_GITBLIT, null, "commitMessageRenderer",
+ repository.commitMessageRenderer.name());
+ }
+
updateList(config, "federationSets", repository.federationSets);
updateList(config, "preReceiveScript", repository.preReceiveScripts);
updateList(config, "postReceiveScript", repository.postReceiveScripts);
updateList(config, "mailingList", repository.mailingLists);
updateList(config, "indexBranch", repository.indexedBranches);
updateList(config, "metricAuthorExclusions", repository.metricAuthorExclusions);
-
+
// User Defined Properties
if (repository.customFields != null) {
if (repository.customFields.size() == 0) {
@@ -2624,7 +2640,7 @@
logger.error("Failed to save repository config!", e);
}
}
-
+
private void updateList(StoredConfig config, String field, List<String> list) {
// a null list is skipped, not cleared
// this is for RPC administration where an older manager might be used
@@ -2641,7 +2657,7 @@
/**
* Deletes the repository from the file system and removes the repository
* permission from all repository users.
- *
+ *
* @param model
* @return true if successful
*/
@@ -2652,7 +2668,7 @@
/**
* Deletes the repository from the file system and removes the repository
* permission from all repository users.
- *
+ *
* @param repositoryName
* @return true if successful
*/
@@ -2661,7 +2677,7 @@
closeRepository(repositoryName);
// clear the repository cache
clearRepositoryMetadataCache(repositoryName);
-
+
RepositoryModel model = removeFromCachedRepositoryList(repositoryName);
if (model != null && !ArrayUtils.isEmpty(model.forks)) {
resetRepositoryListCache();
@@ -2684,13 +2700,57 @@
/**
* Returns an html version of the commit message with any global or
* repository-specific regular expression substitution applied.
- *
+ *
+ * This method uses the preferred renderer to transform the commit message.
+ *
+ * @param repository
+ * @param text
+ * @return html version of the commit message
+ */
+ public String processCommitMessage(RepositoryModel repository, String text) {
+ switch (repository.commitMessageRenderer) {
+ case MARKDOWN:
+ try {
+ String prepared = processCommitMessageRegex(repository.name, text);
+ return MarkdownUtils.transformMarkdown(prepared);
+ } catch (ParseException e) {
+ logger.error("Failed to render commit message as markdown", e);
+ }
+ break;
+ default:
+ // noop
+ break;
+ }
+
+ return processPlainCommitMessage(repository.name, text);
+ }
+
+ /**
+ * Returns an html version of the commit message with any global or
+ * repository-specific regular expression substitution applied.
+ *
+ * This method assumes the commit message is plain text.
+ *
* @param repositoryName
* @param text
* @return html version of the commit message
*/
- public String processCommitMessage(String repositoryName, String text) {
- String html = StringUtils.breakLinesForHtml(text);
+ public String processPlainCommitMessage(String repositoryName, String text) {
+ String html = StringUtils.escapeForHtml(text, false);
+ html = processCommitMessageRegex(repositoryName, html);
+ return StringUtils.breakLinesForHtml(html);
+
+ }
+
+ /**
+ * Apply globally or per-repository specified regex substitutions to the
+ * commit message.
+ *
+ * @param repositoryName
+ * @param text
+ * @return the processed commit message
+ */
+ protected String processCommitMessageRegex(String repositoryName, String text) {
Map<String, String> map = new HashMap<String, String>();
// global regex keys
if (settings.getBoolean(Keys.regex.global, false)) {
@@ -2714,19 +2774,19 @@
String definition = entry.getValue().trim();
String[] chunks = definition.split("!!!");
if (chunks.length == 2) {
- html = html.replaceAll(chunks[0], chunks[1]);
+ text = text.replaceAll(chunks[0], chunks[1]);
} else {
logger.warn(entry.getKey()
+ " improperly formatted. Use !!! to separate match from replacement: "
+ definition);
}
}
- return html;
+ return text;
}
/**
* Returns Gitblit's scheduled executor service for scheduling tasks.
- *
+ *
* @return scheduledExecutor
*/
public ScheduledExecutorService executor() {
@@ -2774,7 +2834,7 @@
/**
* Returns the list of federated gitblit instances that this instance will
* try to pull.
- *
+ *
* @return list of registered gitblit instances
*/
public List<FederationModel> getFederationRegistrations() {
@@ -2786,7 +2846,7 @@
/**
* Retrieve the specified federation registration.
- *
+ *
* @param name
* the name of the registration
* @return a federation registration
@@ -2810,7 +2870,7 @@
/**
* Returns the list of federation sets.
- *
+ *
* @return list of federation sets
*/
public List<FederationSet> getFederationSets(String gitblitUrl) {
@@ -2833,7 +2893,7 @@
/**
* Returns the list of possible federation tokens for this Gitblit instance.
- *
+ *
* @return list of federation tokens
*/
public List<String> getFederationTokens() {
@@ -2851,7 +2911,7 @@
/**
* Returns the specified federation token for this Gitblit instance.
- *
+ *
* @param type
* @return a federation token
*/
@@ -2861,7 +2921,7 @@
/**
* Returns the specified federation token for this Gitblit instance.
- *
+ *
* @param value
* @return a federation token
*/
@@ -2873,7 +2933,7 @@
/**
* Compares the provided token with this Gitblit instance's tokens and
* determines if the requested permission may be granted to the token.
- *
+ *
* @param req
* @param token
* @return true if the request can be executed
@@ -2899,7 +2959,7 @@
/**
* Acknowledge and cache the status of a remote Gitblit instance.
- *
+ *
* @param identification
* the identification of the pulling Gitblit instance
* @param registration
@@ -2919,7 +2979,7 @@
/**
* Returns the list of registration results.
- *
+ *
* @return the list of registration results
*/
public List<FederationModel> getFederationResultRegistrations() {
@@ -2929,7 +2989,7 @@
/**
* Submit a federation proposal. The proposal is cached locally and the
* Gitblit administrator(s) are notified via email.
- *
+ *
* @param proposal
* the proposal
* @param gitblitUrl
@@ -2961,7 +3021,7 @@
/**
* Returns the list of pending federation proposals
- *
+ *
* @return list of federation proposals
*/
public List<FederationProposal> getPendingFederationProposals() {
@@ -2987,7 +3047,7 @@
/**
* Get repositories for the specified token.
- *
+ *
* @param gitblitUrl
* the base url of this gitblit instance
* @param token
@@ -3046,7 +3106,7 @@
/**
* Creates a proposal from the token.
- *
+ *
* @param gitblitUrl
* the url of this Gitblit instance
* @param token
@@ -3068,7 +3128,7 @@
/**
* Returns the proposal identified by the supplied token.
- *
+ *
* @param token
* @return the specified proposal or null
*/
@@ -3084,7 +3144,7 @@
/**
* Deletes a pending federation proposal.
- *
+ *
* @param a
* proposal
* @return true if the proposal was deleted
@@ -3098,7 +3158,7 @@
/**
* Returns the list of all Groovy push hook scripts. Script files must have
* .groovy extension
- *
+ *
* @return list of available hook scripts
*/
public List<String> getAllScripts() {
@@ -3122,7 +3182,7 @@
/**
* Returns the list of pre-receive scripts the repository inherited from the
* global settings and team affiliations.
- *
+ *
* @param repository
* if null only the globally specified scripts are returned
* @return a list of scripts
@@ -3154,7 +3214,7 @@
* Returns the list of all available Groovy pre-receive push hook scripts
* that are not already inherited by the repository. Script files must have
* .groovy extension
- *
+ *
* @param repository
* optional parameter
* @return list of available hook scripts
@@ -3175,7 +3235,7 @@
/**
* Returns the list of post-receive scripts the repository inherited from
* the global settings and team affiliations.
- *
+ *
* @param repository
* if null only the globally specified scripts are returned
* @return a list of scripts
@@ -3206,7 +3266,7 @@
* Returns the list of unused Groovy post-receive push hook scripts that are
* not already inherited by the repository. Script files must have .groovy
* extension
- *
+ *
* @param repository
* optional parameter
* @return list of available hook scripts
@@ -3223,24 +3283,24 @@
}
return scripts;
}
-
+
/**
* Search the specified repositories using the Lucene query.
- *
+ *
* @param query
* @param page
* @param pageSize
* @param repositories
* @return
*/
- public List<SearchResult> search(String query, int page, int pageSize, List<String> repositories) {
+ public List<SearchResult> search(String query, int page, int pageSize, List<String> repositories) {
List<SearchResult> srs = luceneExecutor.search(query, page, pageSize, repositories);
return srs;
}
/**
* Notify the administrators by email.
- *
+ *
* @param subject
* @param message
*/
@@ -3251,7 +3311,7 @@
/**
* Notify users by email of something.
- *
+ *
* @param subject
* @param message
* @param toAddresses
@@ -3262,7 +3322,7 @@
/**
* Notify users by email of something.
- *
+ *
* @param subject
* @param message
* @param toAddresses
@@ -3276,16 +3336,16 @@
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
+
+ MimeBodyPart messagePart = new MimeBodyPart();
messagePart.setText(message, "utf-8");
messagePart.setHeader("Content-Type", "text/plain; charset=\"utf-8\"");
messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
+
MimeMultipart multiPart = new MimeMultipart();
multiPart.addBodyPart(messagePart);
mail.setContent(multiPart);
-
+
mailExecutor.queue(mail);
}
} catch (MessagingException e) {
@@ -3295,7 +3355,7 @@
/**
* Notify users by email of something.
- *
+ *
* @param subject
* @param message
* @param toAddresses
@@ -3306,7 +3366,7 @@
/**
* Notify users by email of something.
- *
+ *
* @param subject
* @param message
* @param toAddresses
@@ -3320,12 +3380,12 @@
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
mail.setSubject(subject);
-
- MimeBodyPart messagePart = new MimeBodyPart();
+
+ MimeBodyPart messagePart = new MimeBodyPart();
messagePart.setText(message, "utf-8");
messagePart.setHeader("Content-Type", "text/html; charset=\"utf-8\"");
messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
-
+
MimeMultipart multiPart = new MimeMultipart();
multiPart.addBodyPart(messagePart);
mail.setContent(multiPart);
@@ -3339,7 +3399,7 @@
/**
* Returns the descriptions/comments of the Gitblit config settings.
- *
+ *
* @return SettingsModel
*/
public ServerSettings getSettingsModel() {
@@ -3352,7 +3412,7 @@
setting.name = key;
settingsModel.add(setting);
}
- setting.currentValue = settings.getString(key, "");
+ setting.currentValue = settings.getString(key, "");
}
settingsModel.pushScripts = getAllScripts();
return settingsModel;
@@ -3362,7 +3422,7 @@
* Parse the properties file and aggregate all the comments by the setting
* key. A setting model tracks the current value, the default value, the
* description of the setting and and directives about the setting.
- *
+ *
* @return Map<String, SettingModel>
*/
private ServerSettings loadSettingModels() {
@@ -3431,7 +3491,7 @@
* Configure the Gitblit singleton with the specified settings source. This
* source may be file settings (Gitblit GO) or may be web.xml settings
* (Gitblit WAR).
- *
+ *
* @param settings
*/
public void configureContext(IStoredSettings settings, File folder, boolean startFederation) {
@@ -3448,7 +3508,7 @@
mailExecutor = new MailExecutor(settings);
luceneExecutor = new LuceneExecutor(settings, repositoriesFolder);
gcExecutor = new GCExecutor(settings);
-
+
// initialize utilities
String prefix = settings.getString(Keys.git.userRepositoryPrefix, "~");
ModelUtils.setUserRepoPrefix(prefix);
@@ -3461,7 +3521,7 @@
logger.info("Identifying available repositories...");
getRepositoryList();
}
-
+
logTimezone("JVM", TimeZone.getDefault());
logTimezone(Constants.NAME, getTimezone());
@@ -3479,12 +3539,12 @@
}
setUserService(loginService);
}
-
+
// load and cache the project metadata
projectConfigs = new FileBasedConfig(getFileOrFolder(Keys.web.projectsFile, "${baseFolder}/projects.conf"), FS.detect());
getProjectConfigs();
-
- configureMailExecutor();
+
+ configureMailExecutor();
configureLuceneIndexing();
configureGarbageCollector();
if (startFederation) {
@@ -3497,7 +3557,7 @@
ContainerUtils.CVE_2007_0450.test();
}
-
+
protected void configureMailExecutor() {
if (mailExecutor.isReady()) {
logger.info("Mail executor is scheduled to process the message queue every 2 minutes.");
@@ -3506,12 +3566,12 @@
logger.warn("Mail server is not properly configured. Mail services disabled.");
}
}
-
+
protected void configureLuceneIndexing() {
scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);
logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");
}
-
+
protected void configureGarbageCollector() {
// schedule gc engine
if (gcExecutor.isReady()) {
@@ -3531,13 +3591,13 @@
delay = (int) ((cd.getTime() - now.getTime())/TimeUtils.MIN);
String when = delay + " mins";
if (delay > 60) {
- when = MessageFormat.format("{0,number,0.0} hours", ((float)delay)/60f);
+ when = MessageFormat.format("{0,number,0.0} hours", (delay)/60f);
}
logger.info(MessageFormat.format("Next scheculed GC scan is in {0}", when));
scheduledExecutor.scheduleAtFixedRate(gcExecutor, delay, 60*24, TimeUnit.MINUTES);
}
}
-
+
protected void configureJGit() {
// Configure JGit
WindowCacheConfig cfg = new WindowCacheConfig();
@@ -3561,7 +3621,7 @@
logger.error("Failed to configure JGit parameters!", e);
}
}
-
+
protected void configureFanout() {
// startup Fanout PubSub service
if (settings.getInteger(Keys.fanout.port, 0) > 0) {
@@ -3589,7 +3649,7 @@
fanoutService.start();
}
}
-
+
protected void configureGitDaemon() {
int port = settings.getInteger(Keys.git.daemonPort, 0);
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
@@ -3603,7 +3663,7 @@
}
}
}
-
+
protected void configureCommitCache() {
int daysToCache = settings.getInteger(Keys.web.activityCacheDays, 14);
if (daysToCache <= 0) {
@@ -3639,11 +3699,11 @@
daysToCache, commitCount, repoCount, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)));
}
}
-
+
protected final Logger getLogger() {
return logger;
}
-
+
protected final ScheduledExecutorService getScheduledExecutor() {
return scheduledExecutor;
}
@@ -3651,7 +3711,7 @@
protected final LuceneExecutor getLuceneExecutor() {
return luceneExecutor;
}
-
+
private void logTimezone(String type, TimeZone zone) {
SimpleDateFormat df = new SimpleDateFormat("z Z");
df.setTimeZone(zone);
@@ -3662,7 +3722,7 @@
/**
* Configure Gitblit from the web.xml, if no configuration has already been
* specified.
- *
+ *
* @see ServletContextListener.contextInitialize(ServletContextEvent)
*/
@Override
@@ -3675,7 +3735,7 @@
String contextRealPath = context.getRealPath("/");
File contextFolder = (contextRealPath != null) ? new File(contextRealPath) : null;
String openShift = System.getenv("OPENSHIFT_DATA_DIR");
-
+
if (!StringUtils.isEmpty(openShift)) {
// Gitblit is running in OpenShift/JBoss
File base = new File(openShift);
@@ -3684,7 +3744,7 @@
// gitblit.properties setting overrides
File overrideFile = new File(base, "gitblit.properties");
webxmlSettings.applyOverrides(overrideFile);
-
+
// Copy the included scripts to the configured groovy folder
String path = webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy");
File localScripts = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, path);
@@ -3700,15 +3760,15 @@
}
}
}
-
+
// configure context using the web.xml
configureContext(webxmlSettings, base, true);
} else {
// Gitblit is running in a standard servlet container
logger.info("WAR contextFolder is " + ((contextFolder != null) ? contextFolder.getAbsolutePath() : "<empty>"));
-
+
String path = webxmlSettings.getString(Constants.baseFolder, Constants.contextFolder$ + "/WEB-INF/data");
-
+
if (path.contains(Constants.contextFolder$) && contextFolder == null) {
// warn about null contextFolder (issue-199)
logger.error("");
@@ -3718,7 +3778,19 @@
logger.error(MessageFormat.format("OR configure your servlet container to specify a \"{0}\" parameter in the context configuration!!", Constants.baseFolder));
logger.error("");
}
-
+
+ try {
+ // try to lookup JNDI env-entry for the baseFolder
+ InitialContext ic = new InitialContext();
+ Context env = (Context) ic.lookup("java:comp/env");
+ String val = (String) env.lookup("baseFolder");
+ if (!StringUtils.isEmpty(val)) {
+ path = val;
+ }
+ } catch (NamingException n) {
+ logger.error("Failed to get JNDI env-entry: " + n.getExplanation());
+ }
+
File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);
base.mkdirs();
@@ -3729,15 +3801,15 @@
}
// delegate all config to baseFolder/gitblit.properties file
- FileSettings settings = new FileSettings(localSettings.getAbsolutePath());
+ FileSettings settings = new FileSettings(localSettings.getAbsolutePath());
configureContext(settings, base, true);
}
}
-
+
settingsModel = loadSettingModels();
serverStatus.servletContainer = servletContext.getServerInfo();
}
-
+
protected void extractResources(ServletContext context, String path, File toDir) {
for (String resource : context.getResourcePaths(path)) {
// extract the resource to the directory if it does not exist
@@ -3802,18 +3874,18 @@
gitDaemon.stop();
}
}
-
+
/**
- *
+ *
* @return true if we are running the gc executor
*/
public boolean isCollectingGarbage() {
return gcExecutor.isRunning();
}
-
+
/**
* Returns true if Gitblit is actively collecting garbage in this repository.
- *
+ *
* @param repositoryName
* @return true if actively collecting garbage
*/
@@ -3824,8 +3896,8 @@
/**
* Creates a personal fork of the specified repository. The clone is view
* restricted by default and the owner of the source repository is given
- * access to the clone.
- *
+ * access to the clone.
+ *
* @param repository
* @param user
* @return the repository model of the fork, if successful
@@ -3885,7 +3957,7 @@
}
cloneTeams.add(cloneTeam);
}
- userService.updateTeamModels(cloneTeams);
+ userService.updateTeamModels(cloneTeams);
// add this clone to the cached model
addToCachedRepositoryList(cloneModel);
@@ -3895,7 +3967,7 @@
/**
* Allow to understand if GitBlit supports and is configured to allow
* cookie-based authentication.
- *
+ *
* @return status of Cookie authentication enablement.
*/
public boolean allowCookieAuthentication() {
--
Gitblit v1.9.1