githubFork/gitblit.git - Solinfo Gitblit

			@@ -29,10 +29,7 @@
			import java.lang.reflect.Type;
			import java.net.URI;
			import java.net.URISyntaxException;
			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;
			@@ -48,7 +45,6 @@
			import java.util.Map;
			import java.util.Map.Entry;
			import java.util.Set;
			import java.util.TimeZone;
			import java.util.TreeMap;
			import java.util.TreeSet;
			import java.util.concurrent.ConcurrentHashMap;
			@@ -58,18 +54,13 @@
			import java.util.concurrent.atomic.AtomicInteger;
			import java.util.concurrent.atomic.AtomicReference;

			import javax.mail.Message;
			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;
			import javax.servlet.http.Cookie;
			import javax.servlet.annotation.WebListener;
			import javax.servlet.http.HttpServletRequest;

			import org.apache.wicket.RequestCycle;
			import org.apache.wicket.protocol.http.WebResponse;
			import org.apache.wicket.resource.ContextRelativeResource;
			import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
			import org.eclipse.jgit.lib.Repository;
			@@ -81,12 +72,9 @@
			import org.eclipse.jgit.util.FS;
			import org.eclipse.jgit.util.FileUtils;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;

			import com.gitblit.Constants.AccessPermission;
			import com.gitblit.Constants.AccessRestrictionType;
			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;
			@@ -94,10 +82,21 @@
			import com.gitblit.Constants.FederationToken;
			import com.gitblit.Constants.PermissionType;
			import com.gitblit.Constants.RegistrantType;
			import com.gitblit.dagger.DaggerContextListener;
			import com.gitblit.fanout.FanoutNioService;
			import com.gitblit.fanout.FanoutService;
			import com.gitblit.fanout.FanoutSocketService;
			import com.gitblit.git.GitDaemon;
			import com.gitblit.git.GitServlet;
			import com.gitblit.manager.IFederationManager;
			import com.gitblit.manager.IGitblitManager;
			import com.gitblit.manager.IManager;
			import com.gitblit.manager.INotificationManager;
			import com.gitblit.manager.IProjectManager;
			import com.gitblit.manager.IRepositoryManager;
			import com.gitblit.manager.IRuntimeManager;
			import com.gitblit.manager.ISessionManager;
			import com.gitblit.manager.IUserManager;
			import com.gitblit.models.FederationModel;
			import com.gitblit.models.FederationProposal;
			import com.gitblit.models.FederationSet;
			@@ -111,12 +110,10 @@
			import com.gitblit.models.RepositoryUrl;
			import com.gitblit.models.SearchResult;
			import com.gitblit.models.ServerSettings;
			import com.gitblit.models.ServerStatus;
			import com.gitblit.models.SettingModel;
			import com.gitblit.models.TeamModel;
			import com.gitblit.models.UserModel;
			import com.gitblit.utils.ArrayUtils;
			import com.gitblit.utils.Base64;
			import com.gitblit.utils.ByteFormat;
			import com.gitblit.utils.CommitCache;
			import com.gitblit.utils.ContainerUtils;
			@@ -132,37 +129,43 @@
			import com.gitblit.utils.ObjectCache;
			import com.gitblit.utils.StringUtils;
			import com.gitblit.utils.TimeUtils;
			import com.gitblit.utils.X509Utils.X509Metadata;
			import com.gitblit.wicket.GitBlitWebSession;
			import com.gitblit.wicket.GitblitWicketFilter;
			import com.gitblit.wicket.WicketUtils;
			import com.google.gson.Gson;
			import com.google.gson.JsonIOException;
			import com.google.gson.JsonSyntaxException;
			import com.google.gson.reflect.TypeToken;

			import dagger.ObjectGraph;

			/**
			* GitBlit is the servlet context listener singleton that acts as the core for
			* 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).
			* the GitBlitServer class (Gitblit GO) or is reflectively instantiated by the
			* servlet 3 container (Gitblit WAR or Express).
			*
			* 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 {
			@WebListener
			public class GitBlit extends DaggerContextListener
			implements IRepositoryManager,
			IProjectManager,
			IFederationManager,
			IGitblitManager {

			private static GitBlit gitblit;

			private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
			private final IStoredSettings goSettings;

			private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(5);
			private final File goBaseFolder;

			private final List<IManager> managers = new ArrayList<IManager>();

			private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(10);

			private final List<FederationModel> federationRegistrations = Collections
			.synchronizedList(new ArrayList<FederationModel>());
			@@ -185,27 +188,15 @@

			private final ObjectCache<String> projectRepositoriesMarkdownCache = new ObjectCache<String>();

			private ServletContext servletContext;

			private File baseFolder;

			private File repositoriesFolder;

			private IUserService userService;

			private IStoredSettings settings;

			private ServerSettings settingsModel;

			private ServerStatus serverStatus;

			private MailExecutor mailExecutor;

			private LuceneExecutor luceneExecutor;

			private GCExecutor gcExecutor;

			private TimeZone timezone;
			private MirrorExecutor mirrorExecutor;

			private FileBasedConfig projectConfigs;

			@@ -214,14 +205,13 @@
			private GitDaemon gitDaemon;

			public GitBlit() {
			if (gitblit == null) {
			// set the static singleton reference
			gitblit = this;
			}
			this.goSettings = null;
			this.goBaseFolder = null;
			}

			public GitBlit(final IUserService userService) {
			this.userService = userService;
			public GitBlit(IStoredSettings settings, File baseFolder) {
			this.goSettings = settings;
			this.goBaseFolder = baseFolder;
			gitblit = this;
			}

			@@ -231,19 +221,21 @@
			* @return gitblit singleton
			*/
			public static GitBlit self() {
			if (gitblit == null) {
			new GitBlit();
			}
			return gitblit;
			}

			/**
			* Returns the boot date of the Gitblit server.
			*
			* @return the boot date of Gitblit
			*/
			public static Date getBootDate() {
			return self().serverStatus.bootDate;
			@SuppressWarnings("unchecked")
			public static <X> X getManager(Class<X> managerClass) {
			if (managerClass.isAssignableFrom(GitBlit.class)) {
			return (X) gitblit;
			}

			for (IManager manager : gitblit.managers) {
			if (managerClass.isAssignableFrom(manager.getClass())) {
			return (X) manager;
			}
			}
			return null;
			}

			/**
			@@ -251,10 +243,11 @@
			*
			* @return a date
			*/
			public static Date getLastActivityDate() {
			@Override
			public Date getLastActivityDate() {
			Date date = null;
			for (String name : self().getRepositoryList()) {
			Repository r = self().getRepository(name);
			for (String name : getRepositoryList()) {
			Repository r = getRepository(name);
			Date lastChange = JGitUtils.getLastChange(r).when;
			r.close();
			if (lastChange != null && (date == null \|\| lastChange.after(date))) {
			@@ -265,243 +258,14 @@
			}

			/**
			* 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() {
			return getBoolean(Keys.git.enableGitServlet, true) \|\| (getInteger(Keys.git.daemonPort, 0) > 0);
			}

			/**
			* 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() {
			return self().mailExecutor.isReady();
			}

			/**
			* Returns the preferred timezone for the Gitblit instance.
			*
			* @return a timezone
			*/
			public static TimeZone getTimezone() {
			if (self().timezone == null) {
			String tzid = getString("web.timezone", null);
			if (StringUtils.isEmpty(tzid)) {
			self().timezone = TimeZone.getDefault();
			return self().timezone;
			}
			self().timezone = TimeZone.getTimeZone(tzid);
			}
			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
			* @return key value or defaultValue
			*/
			public static boolean getBoolean(String key, boolean defaultValue) {
			return self().settings.getBoolean(key, defaultValue);
			}

			/**
			* 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
			* @return key value or defaultValue
			*/
			public static int getInteger(String key, int defaultValue) {
			return self().settings.getInteger(key, defaultValue);
			}

			/**
			* 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
			*/
			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
			* @return key value or defaultValue
			*/
			public static int getFilesize(String key, int defaultValue) {
			return self().settings.getFilesize(key, defaultValue);
			}

			/**
			* 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
			* @return key value or defaultValue
			*/
			public static long getFilesize(String key, long defaultValue) {
			return self().settings.getFilesize(key, defaultValue);
			}

			/**
			* 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
			* @return key value or defaultValue
			*/
			public static char getChar(String key, char defaultValue) {
			return self().settings.getChar(key, defaultValue);
			}

			/**
			* 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
			* @return key value or defaultValue
			*/
			public static String getString(String key, String defaultValue) {
			return self().settings.getString(key, defaultValue);
			}

			/**
			* Returns a list of space-separated strings from the specified key.
			*
			* @see IStoredSettings.getStrings(String key)
			* @param n
			* @return list of strings
			*/
			public static List<String> getStrings(String key) {
			return self().settings.getStrings(key);
			}

			/**
			* 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
			*/
			public static Map<String, String> getMap(String key) {
			return self().settings.getMap(key);
			}

			/**
			* 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
			*/

			public static List<String> getAllKeys(String startingWith) {
			return self().settings.getAllKeys(startingWith);
			}

			/**
			* Is Gitblit running in debug mode?
			*
			* @return true if Gitblit is running in debug mode
			*/
			public static boolean isDebugMode() {
			return self().settings.getBoolean(Keys.web.debugMode, false);
			}

			/**
			* Returns the file object for the specified configuration key.
			*
			* @return the file
			*/
			public static File getFileOrFolder(String key, String defaultFileOrFolder) {
			String fileOrFolder = GitBlit.getString(key, defaultFileOrFolder);
			return getFileOrFolder(fileOrFolder);
			}

			/**
			* Returns the file object which may have it's base-path determined by
			* environment variables for running on a cloud hosting service. All Gitblit
			* 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) {
			return com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$,
			self().baseFolder, fileOrFolder);
			}

			/**
			* 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() {
			return getFileOrFolder(Keys.git.repositoriesFolder, "${baseFolder}/git");
			@Override
			public File getRepositoriesFolder() {
			return getManager(IRuntimeManager.class).getFileOrFolder(Keys.git.repositoriesFolder, "${baseFolder}/git");
			}

			/**
			@@ -510,8 +274,9 @@
			*
			* @return the proposals folder path
			*/
			public static File getProposalsFolder() {
			return getFileOrFolder(Keys.federation.proposalsFolder, "${baseFolder}/proposals");
			@Override
			public File getProposalsFolder() {
			return getManager(IRuntimeManager.class).getFileOrFolder(Keys.federation.proposalsFolder, "${baseFolder}/proposals");
			}

			/**
			@@ -520,25 +285,20 @@
			*
			* @return the Groovy scripts folder path
			*/
			public static File getGroovyScriptsFolder() {
			return getFileOrFolder(Keys.groovy.scriptsFolder, "${baseFolder}/groovy");
			@Override
			public File getHooksFolder() {
			return getManager(IRuntimeManager.class).getFileOrFolder(Keys.groovy.scriptsFolder, "${baseFolder}/groovy");
			}

			/**
			* Updates the list of server settings.
			* Returns the path of the Groovy Grape folder. This method checks to see if
			* Gitblit is running on a cloud service and may return an adjusted path.
			*
			* @param settings
			* @return true if the update succeeded
			* @return the Groovy Grape folder path
			*/
			public boolean updateSettings(Map<String, String> updatedSettings) {
			return settings.saveSettings(updatedSettings);
			}

			public ServerStatus getStatus() {
			// update heap memory status
			serverStatus.heapAllocated = Runtime.getRuntime().totalMemory();
			serverStatus.heapFree = Runtime.getRuntime().freeMemory();
			return serverStatus;
			@Override
			public File getGrapesFolder() {
			return getManager(IRuntimeManager.class).getFileOrFolder(Keys.groovy.grapeFolder, "${baseFolder}/groovy/grape");
			}

			/**
			@@ -549,11 +309,12 @@
			* @param repository
			* @return a list of repository urls
			*/
			@Override
			public List<RepositoryUrl> getRepositoryUrls(HttpServletRequest request, UserModel user, RepositoryModel repository) {
			if (user == null) {
			user = UserModel.ANONYMOUS;
			}
			String username = encodeUsername(UserModel.ANONYMOUS.equals(user) ? "" : user.username);
			String username = StringUtils.encodeUsername(UserModel.ANONYMOUS.equals(user) ? "" : user.username);

			List<RepositoryUrl> list = new ArrayList<RepositoryUrl>();
			// http/https url
			@@ -646,9 +407,10 @@
			*
			* @return a collection of client applications
			*/
			@Override
			public Collection<GitClientApplication> getClientApplications() {
			// prefer user definitions, if they exist
			File userDefs = new File(baseFolder, "clientapps.json");
			File userDefs = new File(getManager(IRuntimeManager.class).getBaseFolder(), "clientapps.json");
			if (userDefs.exists()) {
			Date lastModified = new Date(userDefs.lastModified());
			if (clientApplications.hasCurrent("user", lastModified)) {
			@@ -703,268 +465,6 @@
			}

			/**
			* Set the user service. The user service authenticates all users and is
			* responsible for managing user permissions.
			*
			* @param userService
			*/
			public void setUserService(IUserService userService) {
			logger.info("Setting up user service " + userService.toString());
			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
			*/
			public boolean supportsCredentialChanges(UserModel user) {
			if (user == null) {
			return false;
			} else if (AccountType.LOCAL.equals(user.accountType)) {
			// local account, we can change credentials
			return true;
			} else {
			// external account, ask user service
			return userService.supportsCredentialChanges();
			}
			}

			/**
			* Returns true if the user's display name can be changed.
			*
			* @param user
			* @return true if the user service supports display name changes
			*/
			public boolean supportsDisplayNameChanges(UserModel user) {
			return (user != null && user.isLocalAccount()) \|\| userService.supportsDisplayNameChanges();
			}

			/**
			* Returns true if the user's email address can be changed.
			*
			* @param user
			* @return true if the user service supports email address changes
			*/
			public boolean supportsEmailAddressChanges(UserModel user) {
			return (user != null && user.isLocalAccount()) \|\| userService.supportsEmailAddressChanges();
			}

			/**
			* Returns true if the user's team memberships can be changed.
			*
			* @param user
			* @return true if the user service supports team membership changes
			*/
			public boolean supportsTeamMembershipChanges(UserModel user) {
			return (user != null && user.isLocalAccount()) \|\| userService.supportsTeamMembershipChanges();
			}

			/**
			* Returns true if the username represents an internal account
			*
			* @param username
			* @return true if the specified username represents an internal account
			*/
			protected boolean isInternalAccount(String username) {
			return !StringUtils.isEmpty(username)
			&& (username.equalsIgnoreCase(Constants.FEDERATION_USER)
			\|\| username.equalsIgnoreCase(UserModel.ANONYMOUS.username));
			}

			/**
			* Authenticate a user based on a username and password.
			*
			* @see IUserService.authenticate(String, char[])
			* @param username
			* @param password
			* @return a user object or null
			*/
			public UserModel authenticate(String username, char[] password) {
			if (StringUtils.isEmpty(username)) {
			// can not authenticate empty username
			return null;
			}
			String usernameDecoded = decodeUsername(username);
			String pw = new String(password);
			if (StringUtils.isEmpty(pw)) {
			// can not authenticate empty password
			return null;
			}

			// check to see if this is the federation user
			if (canFederate()) {
			if (usernameDecoded.equalsIgnoreCase(Constants.FEDERATION_USER)) {
			List<String> tokens = getFederationTokens();
			if (tokens.contains(pw)) {
			return getFederationUser();
			}
			}
			}

			// delegate authentication to the user service
			if (userService == null) {
			return null;
			}
			return userService.authenticate(usernameDecoded, password);
			}

			/**
			* Authenticate a user based on their cookie.
			*
			* @param cookies
			* @return a user object or null
			*/
			protected UserModel authenticate(Cookie[] cookies) {
			if (userService == null) {
			return null;
			}
			if (userService.supportsCookies()) {
			if (cookies != null && cookies.length > 0) {
			for (Cookie cookie : cookies) {
			if (cookie.getName().equals(Constants.NAME)) {
			String value = cookie.getValue();
			return userService.authenticate(value.toCharArray());
			}
			}
			}
			}
			return null;
			}

			/**
			* 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
			*/
			public UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate) {
			// try to authenticate by certificate
			boolean checkValidity = settings.getBoolean(Keys.git.enforceCertificateValidity, true);
			String [] oids = getStrings(Keys.git.certificateUsernameOIDs).toArray(new String[0]);
			UserModel model = HttpUtils.getUserModelFromCertificate(httpRequest, checkValidity, oids);
			if (model != null) {
			// grab real user model and preserve certificate serial number
			UserModel user = getUserModel(model.username);
			X509Metadata metadata = HttpUtils.getCertificateMetadata(httpRequest);
			if (user != null) {
			flagWicketSession(AuthenticationType.CERTIFICATE);
			logger.debug(MessageFormat.format("{0} authenticated by client certificate {1} from {2}",
			user.username, metadata.serialNumber, httpRequest.getRemoteAddr()));
			return user;
			} else {
			logger.warn(MessageFormat.format("Failed to find UserModel for {0}, attempted client certificate ({1}) authentication from {2}",
			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) {
			String username = principal.getName();
			if (!StringUtils.isEmpty(username)) {
			boolean internalAccount = isInternalAccount(username);
			UserModel user = getUserModel(username);
			if (user != null) {
			// existing user
			flagWicketSession(AuthenticationType.CONTAINER);
			logger.debug(MessageFormat.format("{0} authenticated by servlet container principal from {1}",
			user.username, httpRequest.getRemoteAddr()));
			return user;
			} else if (settings.getBoolean(Keys.realm.container.autoCreateAccounts, false)
			&& !internalAccount) {
			// auto-create user from an authenticated container principal
			user = new UserModel(username.toLowerCase());
			user.displayName = username;
			user.password = Constants.EXTERNAL_ACCOUNT;
			userService.updateUserModel(user);
			flagWicketSession(AuthenticationType.CONTAINER);
			logger.debug(MessageFormat.format("{0} authenticated and created by servlet container principal from {1}",
			user.username, httpRequest.getRemoteAddr()));
			return user;
			} else if (!internalAccount) {
			logger.warn(MessageFormat.format("Failed to find UserModel for {0}, attempted servlet container authentication from {1}",
			principal.getName(), httpRequest.getRemoteAddr()));
			}
			}
			}

			// try to authenticate by cookie
			if (allowCookieAuthentication()) {
			UserModel user = authenticate(httpRequest.getCookies());
			if (user != null) {
			flagWicketSession(AuthenticationType.COOKIE);
			logger.debug(MessageFormat.format("{0} authenticated by cookie from {1}",
			user.username, httpRequest.getRemoteAddr()));
			return user;
			}
			}

			// try to authenticate by BASIC
			final String authorization = httpRequest.getHeader("Authorization");
			if (authorization != null && authorization.startsWith("Basic")) {
			// Authorization: Basic base64credentials
			String base64Credentials = authorization.substring("Basic".length()).trim();
			String credentials = new String(Base64.decode(base64Credentials),
			Charset.forName("UTF-8"));
			// credentials = username:password
			final String[] values = credentials.split(":",2);

			if (values.length == 2) {
			String username = values[0];
			char[] password = values[1].toCharArray();
			UserModel user = authenticate(username, password);
			if (user != null) {
			flagWicketSession(AuthenticationType.CREDENTIALS);
			logger.debug(MessageFormat.format("{0} authenticated by BASIC request header from {1}",
			user.username, httpRequest.getRemoteAddr()));
			return user;
			} else {
			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) {
			// flag the Wicket session, if this is a Wicket request
			GitBlitWebSession session = GitBlitWebSession.get();
			session.authenticationType = authenticationType;
			}
			}

			/**
			* Open a file resource using the Servlet container.
			* @param file to open
			* @return InputStream of the opened file
			@@ -975,131 +475,12 @@
			return res.getResourceStream().getInputStream();
			}

			/**
			* Sets a cookie for the specified user.
			*
			* @param response
			* @param user
			*/
			public void setCookie(WebResponse response, UserModel user) {
			if (userService == null) {
			return;
			}
			GitBlitWebSession session = GitBlitWebSession.get();
			boolean standardLogin = session.authenticationType.isStandard();

			if (userService.supportsCookies() && standardLogin) {
			Cookie userCookie;
			if (user == null) {
			// clear cookie for logout
			userCookie = new Cookie(Constants.NAME, "");
			} else {
			// set cookie for login
			String cookie = userService.getCookie(user);
			if (StringUtils.isEmpty(cookie)) {
			// create empty cookie
			userCookie = new Cookie(Constants.NAME, "");
			} else {
			// create real cookie
			userCookie = new Cookie(Constants.NAME, cookie);
			userCookie.setMaxAge(Integer.MAX_VALUE);
			}
			}
			userCookie.setPath("/");
			response.addCookie(userCookie);
			}
			}

			/**
			* Logout a user.
			*
			* @param user
			*/
			public void logout(UserModel user) {
			if (userService == null) {
			return;
			}
			userService.logout(user);
			}

			/**
			* 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");
			}

			/**
			* 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
			*/
			public List<String> getAllUsernames() {
			List<String> names = new ArrayList<String>(userService.getAllUsernames());
			return names;
			}

			/**
			* Returns the list of all users available to the login service.
			*
			* @see IUserService.getAllUsernames()
			* @return list of all usernames
			*/
			public List<UserModel> getAllUsers() {
			List<UserModel> users = userService.getAllUsers();
			return users;
			}

			/**
			* Delete the user object with the specified username
			*
			* @see IUserService.deleteUser(String)
			* @param username
			* @return true if successful
			*/
			public boolean deleteUser(String username) {
			if (StringUtils.isEmpty(username)) {
			return false;
			}
			String usernameDecoded = decodeUsername(username);
			return userService.deleteUser(usernameDecoded);
			}

			protected UserModel getFederationUser() {
			@Override
			public UserModel getFederationUser() {
			// the federation user is an administrator
			UserModel federationUser = new UserModel(Constants.FEDERATION_USER);
			federationUser.canAdmin = true;
			return federationUser;
			}

			/**
			* Retrieve the user object for the specified username.
			*
			* @see IUserService.getUserModel(String)
			* @param username
			* @return a user object or null
			*/
			public UserModel getUserModel(String username) {
			if (StringUtils.isEmpty(username)) {
			return null;
			}
			String usernameDecoded = decodeUsername(username);
			UserModel user = userService.getUserModel(usernameDecoded);
			return user;
			}

			/**
			@@ -1109,6 +490,7 @@
			* @param user
			* @return the effective list of permissions for the user
			*/
			@Override
			public List<RegistrantAccessPermission> getUserAccessPermissions(UserModel user) {
			if (StringUtils.isEmpty(user.username)) {
			// new user
			@@ -1119,7 +501,7 @@
			// Flag missing repositories
			for (RegistrantAccessPermission permission : set) {
			if (permission.mutable && PermissionType.EXPLICIT.equals(permission.permissionType)) {
			RepositoryModel rm = GitBlit.self().getRepositoryModel(permission.registrant);
			RepositoryModel rm = getRepositoryModel(permission.registrant);
			if (rm == null) {
			permission.permissionType = PermissionType.MISSING;
			permission.mutable = false;
			@@ -1154,6 +536,7 @@
			* @param repository
			* @return a list of RegistrantAccessPermissions
			*/
			@Override
			public List<RegistrantAccessPermission> getUserAccessPermissions(RepositoryModel repository) {
			List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
			if (AccessRestrictionType.NONE.equals(repository.accessRestriction)) {
			@@ -1165,7 +548,7 @@
			return list;
			}
			// NAMED users and teams
			for (UserModel user : userService.getAllUsers()) {
			for (UserModel user : getManager(IUserManager.class).getAllUsers()) {
			RegistrantAccessPermission ap = user.getRepositoryPermission(repository);
			if (ap.permission.exceeds(AccessPermission.NONE)) {
			list.add(ap);
			@@ -1181,17 +564,18 @@
			* @param permissions
			* @return true if the user models have been updated
			*/
			@Override
			public boolean setUserAccessPermissions(RepositoryModel repository, Collection<RegistrantAccessPermission> permissions) {
			List<UserModel> users = new ArrayList<UserModel>();
			for (RegistrantAccessPermission up : permissions) {
			if (up.mutable) {
			// only set editable defined permissions
			UserModel user = userService.getUserModel(up.registrant);
			UserModel user = getManager(IUserManager.class).getUserModel(up.registrant);
			user.setRepositoryPermission(repository.name, up.permission);
			users.add(user);
			}
			}
			return userService.updateUserModels(users);
			return getManager(IUserManager.class).updateUserModels(users);
			}

			/**
			@@ -1202,8 +586,9 @@
			* @param repository
			* @return list of all usernames that have an access permission for the repository
			*/
			@Override
			public List<String> getRepositoryUsers(RepositoryModel repository) {
			return userService.getUsernamesForRepositoryRole(repository.name);
			return getManager(IUserManager.class).getUsernamesForRepositoryRole(repository.name);
			}

			/**
			@@ -1232,10 +617,11 @@
			* @param isCreate
			* @throws GitBlitException
			*/
			@Override
			public void updateUserModel(String username, UserModel user, boolean isCreate)
			throws GitBlitException {
			if (!username.equalsIgnoreCase(user.username)) {
			if (userService.getUserModel(user.username) != null) {
			if (getManager(IUserManager.class).getUserModel(user.username) != null) {
			throw new GitBlitException(MessageFormat.format(
			"Failed to rename ''{0}'' because ''{1}'' already exists.", username,
			user.username));
			@@ -1257,41 +643,9 @@
			}
			}
			}
			if (!userService.updateUserModel(username, user)) {
			if (!getManager(IUserManager.class).updateUserModel(username, user)) {
			throw new GitBlitException(isCreate ? "Failed to add user!" : "Failed to update user!");
			}
			}

			/**
			* Returns the list of available teams that a user or repository may be
			* assigned to.
			*
			* @return the list of teams
			*/
			public List<String> getAllTeamnames() {
			List<String> teams = new ArrayList<String>(userService.getAllTeamNames());
			return teams;
			}

			/**
			* Returns the list of available teams that a user or repository may be
			* assigned to.
			*
			* @return the list of teams
			*/
			public List<TeamModel> getAllTeams() {
			List<TeamModel> teams = userService.getAllTeams();
			return teams;
			}

			/**
			* 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);
			}

			/**
			@@ -1302,9 +656,10 @@
			* @param repository
			* @return a list of RegistrantAccessPermissions
			*/
			@Override
			public List<RegistrantAccessPermission> getTeamAccessPermissions(RepositoryModel repository) {
			List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
			for (TeamModel team : userService.getAllTeams()) {
			for (TeamModel team : getManager(IUserManager.class).getAllTeams()) {
			RegistrantAccessPermission ap = team.getRepositoryPermission(repository);
			if (ap.permission.exceeds(AccessPermission.NONE)) {
			list.add(ap);
			@@ -1321,17 +676,18 @@
			* @param permissions
			* @return true if the team models have been updated
			*/
			@Override
			public boolean setTeamAccessPermissions(RepositoryModel repository, Collection<RegistrantAccessPermission> permissions) {
			List<TeamModel> teams = new ArrayList<TeamModel>();
			for (RegistrantAccessPermission tp : permissions) {
			if (tp.mutable) {
			// only set explicitly defined access permissions
			TeamModel team = userService.getTeamModel(tp.registrant);
			TeamModel team = getManager(IUserManager.class).getTeamModel(tp.registrant);
			team.setRepositoryPermission(repository.name, tp.permission);
			teams.add(team);
			}
			}
			return userService.updateTeamModels(teams);
			return getManager(IUserManager.class).updateTeamModels(teams);
			}

			/**
			@@ -1342,8 +698,9 @@
			* @param repository
			* @return list of all teamnames with explicit access permissions to the repository
			*/
			@Override
			public List<String> getRepositoryTeams(RepositoryModel repository) {
			return userService.getTeamnamesForRepositoryRole(repository.name);
			return getManager(IUserManager.class).getTeamNamesForRepositoryRole(repository.name);
			}

			/**
			@@ -1369,29 +726,19 @@
			* @param team
			* @param isCreate
			*/
			@Override
			public void updateTeamModel(String teamname, TeamModel team, boolean isCreate)
			throws GitBlitException {
			if (!teamname.equalsIgnoreCase(team.name)) {
			if (userService.getTeamModel(team.name) != null) {
			if (getManager(IUserManager.class).getTeamModel(team.name) != null) {
			throw new GitBlitException(MessageFormat.format(
			"Failed to rename ''{0}'' because ''{1}'' already exists.", teamname,
			team.name));
			}
			}
			if (!userService.updateTeamModel(teamname, team)) {
			if (!getManager(IUserManager.class).updateTeamModel(teamname, team)) {
			throw new GitBlitException(isCreate ? "Failed to add team!" : "Failed to update team!");
			}
			}

			/**
			* Delete the team object with the specified teamname
			*
			* @see IUserService.deleteTeam(String)
			* @param teamname
			* @return true if successful
			*/
			public boolean deleteTeam(String teamname) {
			return userService.deleteTeam(teamname);
			}

			/**
			@@ -1400,7 +747,8 @@
			*
			* @param model
			*/
			private void addToCachedRepositoryList(RepositoryModel model) {
			@Override
			public void addToCachedRepositoryList(RepositoryModel model) {
			if (settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			repositoryListCache.put(model.name.toLowerCase(), model);

			@@ -1441,6 +789,7 @@
			* Resets the repository list cache.
			*
			*/
			@Override
			public void resetRepositoryListCache() {
			logger.info("Repository cache manually reset");
			repositoryListCache.clear();
			@@ -1484,6 +833,7 @@
			*
			* @return list of all repositories
			*/
			@Override
			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
			@@ -1501,7 +851,7 @@
			} else {
			// we are caching this list
			String msg = "{0} repositories identified in {1} msecs";
			if (getBoolean(Keys.web.showRepositorySizes, true)) {
			if (settings.getBoolean(Keys.web.showRepositorySizes, true)) {
			// optionally (re)calculate repository sizes
			msg = "{0} repositories identified with calculated folder sizes in {1} msecs";
			}
			@@ -1540,6 +890,7 @@
			* @param repositoryName
			* @return repository or null
			*/
			@Override
			public Repository getRepository(String repositoryName) {
			return getRepository(repositoryName, true);
			}
			@@ -1551,6 +902,7 @@
			* @param logError
			* @return repository or null
			*/
			@Override
			public Repository getRepository(String repositoryName, boolean logError) {
			// Decode url-encoded repository name (issue-278)
			// http://stackoverflow.com/questions/17183110
			@@ -1584,6 +936,7 @@
			* @param user
			* @return list of repository models accessible to user
			*/
			@Override
			public List<RepositoryModel> getRepositoryModels(UserModel user) {
			long methodStart = System.currentTimeMillis();
			List<String> list = getRepositoryList();
			@@ -1616,6 +969,7 @@
			* @param repositoryName
			* @return repository model or null
			*/
			@Override
			public RepositoryModel getRepositoryModel(UserModel user, String repositoryName) {
			RepositoryModel model = getRepositoryModel(repositoryName);
			if (model == null) {
			@@ -1637,6 +991,7 @@
			* @param repositoryName
			* @return repository model or null
			*/
			@Override
			public RepositoryModel getRepositoryModel(String repositoryName) {
			// Decode url-encoded repository name (issue-278)
			// http://stackoverflow.com/questions/17183110
			@@ -1698,9 +1053,10 @@
			* @param repository
			* @return the star count
			*/
			@Override
			public long getStarCount(RepositoryModel repository) {
			long count = 0;
			for (UserModel user : getAllUsers()) {
			for (UserModel user : getManager(IUserManager.class).getAllUsers()) {
			if (user.getPreferences().isStarredRepository(repository.name)) {
			count++;
			}
			@@ -1748,7 +1104,7 @@
			}

			// project configs
			String rootName = GitBlit.getString(Keys.web.repositoryRootGroupName, "main");
			String rootName = settings.getString(Keys.web.repositoryRootGroupName, "main");
			ProjectModel rootProject = new ProjectModel(rootName, true);

			Map<String, ProjectModel> configs = new HashMap<String, ProjectModel>();
			@@ -1783,6 +1139,7 @@
			* @param includeUsers
			* @return list of projects that are accessible to the user
			*/
			@Override
			public List<ProjectModel> getProjectModels(UserModel user, boolean includeUsers) {
			Map<String, ProjectModel> configs = getProjectConfigs();

			@@ -1837,6 +1194,7 @@
			* @param user
			* @return a project model, or null if it does not exist
			*/
			@Override
			public ProjectModel getProjectModel(String name, UserModel user) {
			for (ProjectModel project : getProjectModels(user, true)) {
			if (project.name.equalsIgnoreCase(name)) {
			@@ -1852,13 +1210,14 @@
			* @param name a project name
			* @return a project model or null if the project does not exist
			*/
			@Override
			public ProjectModel getProjectModel(String name) {
			Map<String, ProjectModel> configs = getProjectConfigs();
			ProjectModel project = configs.get(name.toLowerCase());
			if (project == null) {
			project = new ProjectModel(name);
			if (ModelUtils.isPersonalRepository(name)) {
			UserModel user = getUserModel(ModelUtils.getUserNameFromRepoPath(name));
			UserModel user = getManager(IUserManager.class).getUserModel(ModelUtils.getUserNameFromRepoPath(name));
			if (user != null) {
			project.title = user.getDisplayName();
			project.description = "personal repositories";
			@@ -1902,6 +1261,7 @@
			* @param includeUsers
			* @return a list of project models
			*/
			@Override
			public List<ProjectModel> getProjectModels(List<RepositoryModel> repositoryModels, boolean includeUsers) {
			Map<String, ProjectModel> projects = new LinkedHashMap<String, ProjectModel>();
			for (RepositoryModel repository : repositoryModels) {
			@@ -1972,7 +1332,7 @@
			}
			RepositoryModel model = new RepositoryModel();
			model.isBare = r.isBare();
			File basePath = getFileOrFolder(Keys.git.repositoriesFolder, "${baseFolder}/git");
			File basePath = getRepositoriesFolder();
			if (model.isBare) {
			model.name = com.gitblit.utils.FileUtils.getRelativePath(basePath, r.getDirectory());
			} else {
			@@ -2002,7 +1362,6 @@
			model.description = getConfig(config, "description", "");
			model.originRepository = getConfig(config, "originRepository", null);
			model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));
			model.useDocs = getConfig(config, "useDocs", false);
			model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);
			model.incrementalPushTagPrefix = getConfig(config, "incrementalPushTagPrefix", null);
			model.allowForks = getConfig(config, "allowForks", true);
			@@ -2013,7 +1372,6 @@
			model.verifyCommitter = getConfig(config, "verifyCommitter", false);
			model.showRemoteBranches = getConfig(config, "showRemoteBranches", hasOrigin);
			model.isFrozen = getConfig(config, "isFrozen", false);
			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",
			@@ -2034,6 +1392,7 @@
			model.origin = config.getString("remote", "origin", "url");
			if (model.origin != null) {
			model.origin = model.origin.replace('\\', '/');
			model.isMirror = config.getBoolean("remote", "origin", "mirror", false);
			}
			model.preReceiveScripts = new ArrayList<String>(Arrays.asList(config.getStringList(
			Constants.CONFIG_GITBLIT, null, "preReceiveScript")));
			@@ -2087,6 +1446,7 @@
			* @param n
			* @return true if the repository exists
			*/
			@Override
			public boolean hasRepository(String repositoryName) {
			return hasRepository(repositoryName, false);
			}
			@@ -2098,6 +1458,7 @@
			* @param caseInsensitive
			* @return true if the repository exists
			*/
			@Override
			public boolean hasRepository(String repositoryName, boolean caseSensitiveCheck) {
			if (!caseSensitiveCheck && settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			// if we are caching use the cache to determine availability
			@@ -2120,6 +1481,7 @@
			* @param origin
			* @return true the if the user has a fork
			*/
			@Override
			public boolean hasFork(String username, String origin) {
			return getFork(username, origin) != null;
			}
			@@ -2132,6 +1494,7 @@
			* @param origin
			* @return the name of the user's fork, null otherwise
			*/
			@Override
			public String getFork(String username, String origin) {
			String userProject = ModelUtils.getPersonalPath(username);
			if (settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			@@ -2197,6 +1560,7 @@
			* @param repository
			* @return a ForkModel
			*/
			@Override
			public ForkModel getForkNetwork(String repository) {
			if (settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			// find the root, cached
			@@ -2260,12 +1624,13 @@
			* @param model
			* @return size in bytes of the repository
			*/
			@Override
			public long updateLastChangeFields(Repository r, RepositoryModel model) {
			LastChange lc = JGitUtils.getLastChange(r);
			model.lastChange = lc.when;
			model.lastChangeAuthor = lc.who;

			if (!getBoolean(Keys.web.showRepositorySizes, true) \|\| model.skipSizeCalculation) {
			if (!settings.getBoolean(Keys.web.showRepositorySizes, true) \|\| model.skipSizeCalculation) {
			model.size = null;
			return 0L;
			}
			@@ -2333,11 +1698,12 @@
			* @param repository
			* @return a new array list of metrics
			*/
			@Override
			public List<Metric> getRepositoryDefaultMetrics(RepositoryModel model, Repository repository) {
			if (repositoryMetricsCache.hasCurrent(model.name, model.lastChange)) {
			return new ArrayList<Metric>(repositoryMetricsCache.getObject(model.name));
			}
			List<Metric> metrics = MetricUtils.getDateMetrics(repository, null, true, null, getTimezone());
			List<Metric> metrics = MetricUtils.getDateMetrics(repository, null, true, null, getManager(IRuntimeManager.class).getTimezone());
			repositoryMetricsCache.updateObject(model.name, model.lastChange, metrics);
			return new ArrayList<Metric>(metrics);
			}
			@@ -2407,6 +1773,7 @@
			* @param isCreate
			* @throws GitBlitException
			*/
			@Override
			public void updateRepositoryModel(String repositoryName, RepositoryModel repository,
			boolean isCreate) throws GitBlitException {
			if (gcExecutor.isCollectingGarbage(repositoryName)) {
			@@ -2416,7 +1783,7 @@
			Repository r = null;
			String projectPath = StringUtils.getFirstPathElement(repository.name);
			if (!StringUtils.isEmpty(projectPath)) {
			if (projectPath.equalsIgnoreCase(getString(Keys.web.repositoryRootGroupName, "main"))) {
			if (projectPath.equalsIgnoreCase(settings.getString(Keys.web.repositoryRootGroupName, "main"))) {
			// strip leading group name
			repository.name = repository.name.substring(projectPath.length() + 1);
			}
			@@ -2433,7 +1800,7 @@
			}
			// create repository
			logger.info("create repository " + repository.name);
			String shared = getString(Keys.git.createRepositoriesShared, "FALSE");
			String shared = settings.getString(Keys.git.createRepositoriesShared, "FALSE");
			r = JGitUtils.createRepository(repositoriesFolder, repository.name, shared);
			} else {
			// rename repository
			@@ -2467,7 +1834,7 @@
			repository.name));
			}
			// rename the roles
			if (!userService.renameRepositoryRole(repositoryName, repository.name)) {
			if (!getManager(IUserManager.class).renameRepositoryRole(repositoryName, repository.name)) {
			throw new GitBlitException(MessageFormat.format(
			"Failed to rename repository permissions ''{0}'' to ''{1}''.",
			repositoryName, repository.name));
			@@ -2535,9 +1902,9 @@

			// Adjust permissions in case we updated the config files
			JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "config"),
			getString(Keys.git.createRepositoriesShared, "FALSE"));
			settings.getString(Keys.git.createRepositoriesShared, "FALSE"));
			JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "HEAD"),
			getString(Keys.git.createRepositoriesShared, "FALSE"));
			settings.getString(Keys.git.createRepositoriesShared, "FALSE"));

			// close the repository object
			r.close();
			@@ -2557,12 +1924,12 @@
			* @param repository
			* the Gitblit repository model
			*/
			@Override
			public void updateConfiguration(Repository r, RepositoryModel repository) {
			StoredConfig config = r.getConfig();
			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, "useDocs", repository.useDocs);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalPushTags", repository.useIncrementalPushTags);
			if (StringUtils.isEmpty(repository.incrementalPushTagPrefix) \|\|
			repository.incrementalPushTagPrefix.equals(settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r"))) {
			@@ -2576,7 +1943,6 @@
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "verifyCommitter", repository.verifyCommitter);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "showRemoteBranches", repository.showRemoteBranches);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "isFrozen", repository.isFrozen);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "showReadme", repository.showReadme);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "skipSizeCalculation", repository.skipSizeCalculation);
			config.setBoolean(Constants.CONFIG_GITBLIT, null, "skipSummaryMetrics", repository.skipSummaryMetrics);
			config.setString(Constants.CONFIG_GITBLIT, null, "federationStrategy",
			@@ -2658,6 +2024,7 @@
			* @param model
			* @return true if successful
			*/
			@Override
			public boolean deleteRepositoryModel(RepositoryModel model) {
			return deleteRepository(model.name);
			}
			@@ -2669,6 +2036,7 @@
			* @param repositoryName
			* @return true if successful
			*/
			@Override
			public boolean deleteRepository(String repositoryName) {
			try {
			closeRepository(repositoryName);
			@@ -2683,7 +2051,7 @@
			File folder = new File(repositoriesFolder, repositoryName);
			if (folder.exists() && folder.isDirectory()) {
			FileUtils.delete(folder, FileUtils.RECURSIVE \| FileUtils.RETRY);
			if (userService.deleteRepositoryRole(repositoryName)) {
			if (getManager(IUserManager.class).deleteRepositoryRole(repositoryName)) {
			logger.info(MessageFormat.format("Repository \"{0}\" deleted", repositoryName));
			return true;
			}
			@@ -2710,7 +2078,7 @@
			try {
			String prepared = processCommitMessageRegex(repository.name, text);
			return MarkdownUtils.transformMarkdown(prepared);
			} catch (ParseException e) {
			} catch (Exception e) {
			logger.error("Failed to render commit message as markdown", e);
			}
			break;
			@@ -2790,8 +2158,9 @@
			return scheduledExecutor;
			}

			public static boolean canFederate() {
			String passphrase = getString(Keys.federation.passphrase, "");
			@Override
			public boolean canFederate() {
			String passphrase = settings.getString(Keys.federation.passphrase, "");
			return !StringUtils.isEmpty(passphrase);
			}

			@@ -2834,6 +2203,7 @@
			*
			* @return list of registered gitblit instances
			*/
			@Override
			public List<FederationModel> getFederationRegistrations() {
			if (federationRegistrations.isEmpty()) {
			federationRegistrations.addAll(FederationUtils.getFederationRegistrations(settings));
			@@ -2848,6 +2218,7 @@
			* the name of the registration
			* @return a federation registration
			*/
			@Override
			public FederationModel getFederationRegistration(String url, String name) {
			// check registrations
			for (FederationModel r : getFederationRegistrations()) {
			@@ -2870,6 +2241,7 @@
			*
			* @return list of federation sets
			*/
			@Override
			public List<FederationSet> getFederationSets(String gitblitUrl) {
			List<FederationSet> list = new ArrayList<FederationSet>();
			// generate standard tokens
			@@ -2893,6 +2265,7 @@
			*
			* @return list of federation tokens
			*/
			@Override
			public List<String> getFederationTokens() {
			List<String> tokens = new ArrayList<String>();
			// generate standard tokens
			@@ -2912,6 +2285,7 @@
			* @param type
			* @return a federation token
			*/
			@Override
			public String getFederationToken(FederationToken type) {
			return getFederationToken(type.name());
			}
			@@ -2922,6 +2296,7 @@
			* @param value
			* @return a federation token
			*/
			@Override
			public String getFederationToken(String value) {
			String passphrase = settings.getString(Keys.federation.passphrase, "");
			return StringUtils.getSHA1(passphrase + "-" + value);
			@@ -2935,6 +2310,7 @@
			* @param token
			* @return true if the request can be executed
			*/
			@Override
			public boolean validateFederationRequest(FederationRequest req, String token) {
			String all = getFederationToken(FederationToken.ALL);
			String unr = getFederationToken(FederationToken.USERS_AND_REPOSITORIES);
			@@ -2963,6 +2339,7 @@
			* the registration from the pulling Gitblit instance
			* @return true if acknowledged
			*/
			@Override
			public boolean acknowledgeFederationStatus(String identification, FederationModel registration) {
			// reset the url to the identification of the pulling Gitblit instance
			registration.url = identification;
			@@ -2979,6 +2356,7 @@
			*
			* @return the list of registration results
			*/
			@Override
			public List<FederationModel> getFederationResultRegistrations() {
			return new ArrayList<FederationModel>(federationPullResults.values());
			}
			@@ -2994,6 +2372,7 @@
			* administrators
			* @return true if the proposal was submitted
			*/
			@Override
			public boolean submitFederationProposal(FederationProposal proposal, String gitblitUrl) {
			// convert proposal to json
			String json = JsonUtils.toJsonString(proposal);
			@@ -3011,7 +2390,7 @@
			}

			// send an email, if possible
			sendMailToAdministrators("Federation proposal from " + proposal.url,
			getManager(INotificationManager.class).sendMailToAdministrators("Federation proposal from " + proposal.url,
			"Please review the proposal @ " + gitblitUrl + "/proposal/" + proposal.token);
			return true;
			}
			@@ -3021,6 +2400,7 @@
			*
			* @return list of federation proposals
			*/
			@Override
			public List<FederationProposal> getPendingFederationProposals() {
			List<FederationProposal> list = new ArrayList<FederationProposal>();
			File folder = getProposalsFolder();
			@@ -3051,9 +2431,10 @@
			* the federation token
			* @return a map of <cloneurl, RepositoryModel>
			*/
			@Override
			public Map<String, RepositoryModel> getRepositories(String gitblitUrl, String token) {
			Map<String, String> federationSets = new HashMap<String, String>();
			for (String set : getStrings(Keys.federation.sets)) {
			for (String set : settings.getStrings(Keys.federation.sets)) {
			federationSets.put(getFederationToken(set), set);
			}

			@@ -3109,6 +2490,7 @@
			* @param token
			* @return a potential proposal
			*/
			@Override
			public FederationProposal createFederationProposal(String gitblitUrl, String token) {
			FederationToken tokenType = FederationToken.REPOSITORIES;
			for (FederationToken type : FederationToken.values()) {
			@@ -3129,6 +2511,7 @@
			* @param token
			* @return the specified proposal or null
			*/
			@Override
			public FederationProposal getPendingFederationProposal(String token) {
			List<FederationProposal> list = getPendingFederationProposals();
			for (FederationProposal proposal : list) {
			@@ -3146,6 +2529,7 @@
			* proposal
			* @return true if the proposal was deleted
			*/
			@Override
			public boolean deletePendingFederationProposal(FederationProposal proposal) {
			File folder = getProposalsFolder();
			File file = new File(folder, proposal.token + Constants.PROPOSAL_EXT);
			@@ -3158,8 +2542,9 @@
			*
			* @return list of available hook scripts
			*/
			@Override
			public List<String> getAllScripts() {
			File groovyFolder = getGroovyScriptsFolder();
			File groovyFolder = getHooksFolder();
			File[] files = groovyFolder.listFiles(new FileFilter() {
			@Override
			public boolean accept(File pathname) {
			@@ -3184,10 +2569,11 @@
			* if null only the globally specified scripts are returned
			* @return a list of scripts
			*/
			@Override
			public List<String> getPreReceiveScriptsInherited(RepositoryModel repository) {
			Set<String> scripts = new LinkedHashSet<String>();
			// Globals
			for (String script : getStrings(Keys.groovy.preReceiveScripts)) {
			for (String script : settings.getStrings(Keys.groovy.preReceiveScripts)) {
			if (script.endsWith(".groovy")) {
			scripts.add(script.substring(0, script.lastIndexOf('.')));
			} else {
			@@ -3197,8 +2583,8 @@

			// Team Scripts
			if (repository != null) {
			for (String teamname : userService.getTeamnamesForRepositoryRole(repository.name)) {
			TeamModel team = userService.getTeamModel(teamname);
			for (String teamname : getManager(IUserManager.class).getTeamNamesForRepositoryRole(repository.name)) {
			TeamModel team = getManager(IUserManager.class).getTeamModel(teamname);
			if (!ArrayUtils.isEmpty(team.preReceiveScripts)) {
			scripts.addAll(team.preReceiveScripts);
			}
			@@ -3216,6 +2602,7 @@
			* optional parameter
			* @return list of available hook scripts
			*/
			@Override
			public List<String> getPreReceiveScriptsUnused(RepositoryModel repository) {
			Set<String> inherited = new TreeSet<String>(getPreReceiveScriptsInherited(repository));

			@@ -3237,10 +2624,11 @@
			* if null only the globally specified scripts are returned
			* @return a list of scripts
			*/
			@Override
			public List<String> getPostReceiveScriptsInherited(RepositoryModel repository) {
			Set<String> scripts = new LinkedHashSet<String>();
			// Global Scripts
			for (String script : getStrings(Keys.groovy.postReceiveScripts)) {
			for (String script : settings.getStrings(Keys.groovy.postReceiveScripts)) {
			if (script.endsWith(".groovy")) {
			scripts.add(script.substring(0, script.lastIndexOf('.')));
			} else {
			@@ -3249,8 +2637,8 @@
			}
			// Team Scripts
			if (repository != null) {
			for (String teamname : userService.getTeamnamesForRepositoryRole(repository.name)) {
			TeamModel team = userService.getTeamModel(teamname);
			for (String teamname : getManager(IUserManager.class).getTeamNamesForRepositoryRole(repository.name)) {
			TeamModel team = getManager(IUserManager.class).getTeamModel(teamname);
			if (!ArrayUtils.isEmpty(team.postReceiveScripts)) {
			scripts.addAll(team.postReceiveScripts);
			}
			@@ -3268,6 +2656,7 @@
			* optional parameter
			* @return list of available hook scripts
			*/
			@Override
			public List<String> getPostReceiveScriptsUnused(RepositoryModel repository) {
			Set<String> inherited = new TreeSet<String>(getPostReceiveScriptsInherited(repository));

			@@ -3290,129 +2679,10 @@
			* @param repositories
			* @return
			*/
			@Override
			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
			*/
			public void sendMailToAdministrators(String subject, String message) {
			List<String> toAddresses = settings.getStrings(Keys.mail.adminAddresses);
			sendMail(subject, message, toAddresses);
			}

			/**
			* Notify users by email of something.
			*
			* @param subject
			* @param message
			* @param toAddresses
			*/
			public void sendMail(String subject, String message, Collection<String> toAddresses) {
			this.sendMail(subject, message, toAddresses.toArray(new String[0]));
			}

			/**
			* Notify users by email of something.
			*
			* @param subject
			* @param message
			* @param toAddresses
			*/
			public void sendMail(String subject, String message, String... toAddresses) {
			if (toAddresses == null \|\| toAddresses.length == 0) {
			logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
			return;
			}
			try {
			Message mail = mailExecutor.createMessage(toAddresses);
			if (mail != null) {
			mail.setSubject(subject);

			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) {
			logger.error("Messaging error", e);
			}
			}

			/**
			* Notify users by email of something.
			*
			* @param subject
			* @param message
			* @param toAddresses
			*/
			public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
			this.sendHtmlMail(subject, message, toAddresses.toArray(new String[0]));
			}

			/**
			* Notify users by email of something.
			*
			* @param subject
			* @param message
			* @param toAddresses
			*/
			public void sendHtmlMail(String subject, String message, String... toAddresses) {
			if (toAddresses == null \|\| toAddresses.length == 0) {
			logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
			return;
			}
			try {
			Message mail = mailExecutor.createMessage(toAddresses);
			if (mail != null) {
			mail.setSubject(subject);

			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);

			mailExecutor.queue(mail);
			}
			} catch (MessagingException e) {
			logger.error("Messaging error", e);
			}
			}

			/**
			* Returns the descriptions/comments of the Gitblit config settings.
			*
			* @return SettingsModel
			*/
			public ServerSettings getSettingsModel() {
			// ensure that the current values are updated in the setting models
			for (String key : settings.getAllKeys(null)) {
			SettingModel setting = settingsModel.get(key);
			if (setting == null) {
			// unreferenced setting, create a setting model
			setting = new SettingModel();
			setting.name = key;
			settingsModel.add(setting);
			}
			setting.currentValue = settings.getString(key, "");
			}
			settingsModel.pushScripts = getAllScripts();
			return settingsModel;
			}

			/**
			@@ -3422,12 +2692,15 @@
			*
			* @return Map<String, SettingModel>
			*/
			private ServerSettings loadSettingModels() {
			ServerSettings settingsModel = new ServerSettings();
			settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();
			settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();
			settingsModel.supportsEmailAddressChanges = userService.supportsEmailAddressChanges();
			settingsModel.supportsTeamMembershipChanges = userService.supportsTeamMembershipChanges();
			private ServerSettings loadSettingModels(ServerSettings settingsModel) {
			// this entire "supports" concept will go away with user service refactoring
			UserModel externalUser = new UserModel(Constants.EXTERNAL_ACCOUNT);
			externalUser.password = Constants.EXTERNAL_ACCOUNT;
			IUserManager userManager = getManager(IUserManager.class);
			settingsModel.supportsCredentialChanges = userManager.supportsCredentialChanges(externalUser);
			settingsModel.supportsDisplayNameChanges = userManager.supportsDisplayNameChanges(externalUser);
			settingsModel.supportsEmailAddressChanges = userManager.supportsEmailAddressChanges(externalUser);
			settingsModel.supportsTeamMembershipChanges = userManager.supportsTeamMembershipChanges(externalUser);
			try {
			// Read bundled Gitblit properties to extract setting descriptions.
			// This copy is pristine and only used for populating the setting
			@@ -3484,86 +2757,6 @@
			return settingsModel;
			}

			/**
			* 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) {
			this.settings = settings;
			this.baseFolder = folder;

			repositoriesFolder = getRepositoriesFolder();

			logger.info("Gitblit base folder = " + folder.getAbsolutePath());
			logger.info("Git repositories folder = " + repositoriesFolder.getAbsolutePath());
			logger.info("Gitblit settings = " + settings.toString());

			// prepare service executors
			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);

			// calculate repository list settings checksum for future config changes
			repositoryListSettingsChecksum.set(getRepositoryListSettingsChecksum());

			// build initial repository list
			if (settings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			logger.info("Identifying available repositories...");
			getRepositoryList();
			}

			logTimezone("JVM", TimeZone.getDefault());
			logTimezone(Constants.NAME, getTimezone());

			serverStatus = new ServerStatus(isGO());

			if (this.userService == null) {
			String realm = settings.getString(Keys.realm.userService, "${baseFolder}/users.properties");
			IUserService loginService = null;
			try {
			// check to see if this "file" is a login service class
			Class<?> realmClass = Class.forName(realm);
			loginService = (IUserService) realmClass.newInstance();
			} catch (Throwable t) {
			loginService = new GitblitUserService();
			}
			setUserService(loginService);
			}

			// load and cache the project metadata
			projectConfigs = new FileBasedConfig(getFileOrFolder(Keys.web.projectsFile, "${baseFolder}/projects.conf"), FS.detect());
			getProjectConfigs();

			configureMailExecutor();
			configureLuceneIndexing();
			configureGarbageCollector();
			if (startFederation) {
			configureFederation();
			}
			configureJGit();
			configureFanout();
			configureGitDaemon();
			configureCommitCache();

			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.");
			scheduledExecutor.scheduleAtFixedRate(mailExecutor, 1, 2, TimeUnit.MINUTES);
			} else {
			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.");
			@@ -3592,6 +2785,19 @@
			}
			logger.info(MessageFormat.format("Next scheculed GC scan is in {0}", when));
			scheduledExecutor.scheduleAtFixedRate(gcExecutor, delay, 60*24, TimeUnit.MINUTES);
			}
			}

			protected void configureMirrorExecutor() {
			if (mirrorExecutor.isReady()) {
			int mins = TimeUtils.convertFrequencyToMinutes(settings.getString(Keys.git.mirrorPeriod, "30 mins"));
			if (mins < 5) {
			mins = 5;
			}
			int delay = 1;
			scheduledExecutor.scheduleAtFixedRate(mirrorExecutor, delay, mins, TimeUnit.MINUTES);
			logger.info("Mirror executor is scheduled to fetch updates every {} minutes.", mins);
			logger.info("Next scheduled mirror fetch is in {} minutes", delay);
			}
			}

			@@ -3652,7 +2858,17 @@
			String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
			if (port > 0) {
			try {
			gitDaemon = new GitDaemon(bindInterface, port, getRepositoriesFolder());
			// HACK temporary pending manager separation and injection
			Gitblit gitblit = new Gitblit(
			getManager(IRuntimeManager.class),
			getManager(INotificationManager.class),
			getManager(IUserManager.class),
			getManager(ISessionManager.class),
			this,
			this,
			this,
			this);
			gitDaemon = new GitDaemon(gitblit);
			gitDaemon.start();
			} catch (IOException e) {
			gitDaemon = null;
			@@ -3709,13 +2925,6 @@
			return luceneExecutor;
			}

			private void logTimezone(String type, TimeZone zone) {
			SimpleDateFormat df = new SimpleDateFormat("z Z");
			df.setTimeZone(zone);
			String offset = df.format(new Date());
			logger.info(type + " timezone is " + zone.getID() + " (" + offset + ")");
			}

			/**
			* Configure Gitblit from the web.xml, if no configuration has already been
			* specified.
			@@ -3723,76 +2932,227 @@
			* @see ServletContextListener.contextInitialize(ServletContextEvent)
			*/
			@Override
			public void contextInitialized(ServletContextEvent contextEvent) {
			servletContext = contextEvent.getServletContext();
			if (settings == null) {
			// Gitblit is running in a servlet container
			ServletContext context = contextEvent.getServletContext();
			protected void beforeServletInjection(ServletContext context) {
			ObjectGraph injector = getInjector(context);

			// create the runtime settings object
			IStoredSettings runtimeSettings = injector.get(IStoredSettings.class);
			this.settings = runtimeSettings; // XXX remove me eventually
			final File baseFolder;

			if (goSettings != null) {
			// Gitblit GO
			logger.debug("configuring Gitblit GO");
			baseFolder = configureGO(context, goSettings, goBaseFolder, runtimeSettings);
			} else {
			// servlet container
			WebXmlSettings webxmlSettings = new WebXmlSettings(context);
			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);
			logger.info("EXPRESS contextFolder is " + contextFolder.getAbsolutePath());

			// 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);
			if (!localScripts.exists()) {
			File warScripts = new File(contextFolder, "/WEB-INF/data/groovy");
			if (!warScripts.equals(localScripts)) {
			try {
			com.gitblit.utils.FileUtils.copy(localScripts, warScripts.listFiles());
			} catch (IOException e) {
			logger.error(MessageFormat.format(
			"Failed to copy included Groovy scripts from {0} to {1}",
			warScripts, localScripts));
			}
			}
			}

			// configure context using the web.xml
			configureContext(webxmlSettings, base, true);
			if (!StringUtils.isEmpty(System.getenv("OPENSHIFT_DATA_DIR"))) {
			// RedHat OpenShift
			logger.debug("configuring Gitblit Express");
			baseFolder = configureExpress(context, webxmlSettings, contextFolder, runtimeSettings);
			} else {
			// Gitblit is running in a standard servlet container
			logger.info("WAR contextFolder is " + ((contextFolder != null) ? contextFolder.getAbsolutePath() : "<empty>"));
			// standard WAR
			logger.debug("configuring Gitblit WAR");
			baseFolder = configureWAR(context, webxmlSettings, contextFolder, runtimeSettings);
			}

			String path = webxmlSettings.getString(Constants.baseFolder, Constants.contextFolder$ + "/WEB-INF/data");
			// Test for Tomcat forward-slash/%2F issue and auto-adjust settings
			ContainerUtils.CVE_2007_0450.test(runtimeSettings);
			}

			if (path.contains(Constants.contextFolder$) && contextFolder == null) {
			// warn about null contextFolder (issue-199)
			logger.error("");
			logger.error(MessageFormat.format("\"{0}\" depends on \"{1}\" but \"{2}\" is returning NULL for \"{1}\"!",
			Constants.baseFolder, Constants.contextFolder$, context.getServerInfo()));
			logger.error(MessageFormat.format("Please specify a non-parameterized path for <context-param> {0} in web.xml!!", Constants.baseFolder));
			logger.error(MessageFormat.format("OR configure your servlet container to specify a \"{0}\" parameter in the context configuration!!", Constants.baseFolder));
			logger.error("");
			// Runtime manager is a container for settings and other parameters
			IRuntimeManager runtime = startManager(injector, IRuntimeManager.class);
			runtime.setBaseFolder(baseFolder);
			runtime.getStatus().isGO = goSettings != null;
			runtime.getStatus().servletContainer = context.getServerInfo();

			startManager(injector, INotificationManager.class);
			startManager(injector, IUserManager.class);
			startManager(injector, ISessionManager.class);

			repositoriesFolder = getRepositoriesFolder();

			logger.info("Gitblit base folder = " + baseFolder.getAbsolutePath());
			logger.info("Git repositories folder = " + repositoriesFolder.getAbsolutePath());

			// prepare service executors
			luceneExecutor = new LuceneExecutor(runtimeSettings, getManager(IRepositoryManager.class));
			gcExecutor = new GCExecutor(runtimeSettings, getManager(IRepositoryManager.class));
			mirrorExecutor = new MirrorExecutor(runtimeSettings, getManager(IRepositoryManager.class));

			// initialize utilities
			String prefix = runtimeSettings.getString(Keys.git.userRepositoryPrefix, "~");
			ModelUtils.setUserRepoPrefix(prefix);

			// calculate repository list settings checksum for future config changes
			repositoryListSettingsChecksum.set(getRepositoryListSettingsChecksum());

			// build initial repository list
			if (runtimeSettings.getBoolean(Keys.git.cacheRepositoryList, true)) {
			logger.info("Identifying available repositories...");
			getRepositoryList();
			}

			loadSettingModels(runtime.getSettingsModel());

			// load and cache the project metadata
			projectConfigs = new FileBasedConfig(runtime.getFileOrFolder(Keys.web.projectsFile, "${baseFolder}/projects.conf"), FS.detect());
			getProjectConfigs();

			configureLuceneIndexing();
			configureGarbageCollector();
			configureMirrorExecutor();
			if (true/startFederation/) {
			configureFederation();
			}
			configureJGit();
			configureFanout();
			configureGitDaemon();
			configureCommitCache();
			}

			/**
			* Configures Gitblit GO
			*
			* @param context
			* @param settings
			* @param baseFolder
			* @param runtimeSettings
			* @return the base folder
			*/
			protected File configureGO(
			ServletContext context,
			IStoredSettings goSettings,
			File goBaseFolder,
			IStoredSettings runtimeSettings) {

			// merge the stored settings into the runtime settings
			//
			// if runtimeSettings is also a FileSettings w/o a specified target file,
			// the target file for runtimeSettings is set to "localSettings".
			runtimeSettings.merge(goSettings);
			File base = goBaseFolder;
			return base;
			}


			/**
			* Configures a standard WAR instance of Gitblit.
			*
			* @param context
			* @param webxmlSettings
			* @param contextFolder
			* @param runtimeSettings
			* @return the base folder
			*/
			protected File configureWAR(
			ServletContext context,
			WebXmlSettings webxmlSettings,
			File contextFolder,
			IStoredSettings runtimeSettings) {

			// 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("");
			logger.error(MessageFormat.format("\"{0}\" depends on \"{1}\" but \"{2}\" is returning NULL for \"{1}\"!",
			Constants.baseFolder, Constants.contextFolder$, context.getServerInfo()));
			logger.error(MessageFormat.format("Please specify a non-parameterized path for <context-param> {0} in web.xml!!", Constants.baseFolder));
			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();

			// try to extract the data folder resource to the baseFolder
			File localSettings = new File(base, "gitblit.properties");
			if (!localSettings.exists()) {
			extractResources(context, "/WEB-INF/data/", base);
			}

			// delegate all config to baseFolder/gitblit.properties file
			FileSettings fileSettings = new FileSettings(localSettings.getAbsolutePath());

			// merge the stored settings into the runtime settings
			//
			// if runtimeSettings is also a FileSettings w/o a specified target file,
			// the target file for runtimeSettings is set to "localSettings".
			runtimeSettings.merge(fileSettings);

			return base;
			}

			/**
			* Configures an OpenShift instance of Gitblit.
			*
			* @param context
			* @param webxmlSettings
			* @param contextFolder
			* @param runtimeSettings
			* @return the base folder
			*/
			private File configureExpress(
			ServletContext context,
			WebXmlSettings webxmlSettings,
			File contextFolder,
			IStoredSettings runtimeSettings) {

			// Gitblit is running in OpenShift/JBoss
			String openShift = System.getenv("OPENSHIFT_DATA_DIR");
			File base = new File(openShift);
			logger.info("EXPRESS contextFolder is " + contextFolder.getAbsolutePath());

			// 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);
			if (!localScripts.exists()) {
			File warScripts = new File(contextFolder, "/WEB-INF/data/groovy");
			if (!warScripts.equals(localScripts)) {
			try {
			com.gitblit.utils.FileUtils.copy(localScripts, warScripts.listFiles());
			} catch (IOException e) {
			logger.error(MessageFormat.format(
			"Failed to copy included Groovy scripts from {0} to {1}",
			warScripts, localScripts));
			}

			File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path);
			base.mkdirs();

			// try to extract the data folder resource to the baseFolder
			File localSettings = new File(base, "gitblit.properties");
			if (!localSettings.exists()) {
			extractResources(context, "/WEB-INF/data/", base);
			}

			// delegate all config to baseFolder/gitblit.properties file
			FileSettings settings = new FileSettings(localSettings.getAbsolutePath());
			configureContext(settings, base, true);
			}
			}

			settingsModel = loadSettingModels();
			serverStatus.servletContainer = servletContext.getServerInfo();
			// merge the WebXmlSettings into the runtime settings (for backwards-compatibilty)
			runtimeSettings.merge(webxmlSettings);

			// settings are to be stored in openshift/gitblit.properties
			File localSettings = new File(base, "gitblit.properties");
			FileSettings fileSettings = new FileSettings(localSettings.getAbsolutePath());

			// merge the stored settings into the runtime settings
			//
			// if runtimeSettings is also a FileSettings w/o a specified target file,
			// the target file for runtimeSettings is set to "localSettings".
			runtimeSettings.merge(fileSettings);

			return base;
			}

			protected void extractResources(ServletContext context, String path, File toDir) {
			@@ -3847,11 +3207,17 @@
			* shutting down or because the servlet container is re-deploying Gitblit.
			*/
			@Override
			public void contextDestroyed(ServletContextEvent contextEvent) {
			protected void destroyContext(ServletContext context) {
			logger.info("Gitblit context destroyed by servlet container.");
			for (IManager manager : managers) {
			logger.debug("stopping {}", manager.getClass().getSimpleName());
			manager.stop();
			}

			scheduledExecutor.shutdownNow();
			luceneExecutor.close();
			gcExecutor.close();
			mirrorExecutor.close();
			if (fanoutService != null) {
			fanoutService.stop();
			}
			@@ -3864,6 +3230,7 @@
			*
			* @return true if we are running the gc executor
			*/
			@Override
			public boolean isCollectingGarbage() {
			return gcExecutor.isRunning();
			}
			@@ -3874,6 +3241,7 @@
			* @param repositoryName
			* @return true if actively collecting garbage
			*/
			@Override
			public boolean isCollectingGarbage(String repositoryName) {
			return gcExecutor.isCollectingGarbage(repositoryName);
			}
			@@ -3888,6 +3256,7 @@
			* @return the repository model of the fork, if successful
			* @throws GitBlitException
			*/
			@Override
			public RepositoryModel fork(RepositoryModel repository, UserModel user) throws GitBlitException {
			String cloneName = MessageFormat.format("{0}/{1}.git", user.getPersonalPath(), StringUtils.stripDotGit(StringUtils.getLastPathElement(repository.name)));
			String fromUrl = MessageFormat.format("file://{0}/{1}", repositoriesFolder.getAbsolutePath(), repository.name);
			@@ -3908,7 +3277,7 @@
			// add the owner of the source repository to the clone's access list
			if (!ArrayUtils.isEmpty(repository.owners)) {
			for (String owner : repository.owners) {
			UserModel originOwner = getUserModel(owner);
			UserModel originOwner = getManager(IUserManager.class).getUserModel(owner);
			if (originOwner != null) {
			originOwner.setRepositoryPermission(cloneName, AccessPermission.CLONE);
			updateUserModel(originOwner.username, originOwner, false);
			@@ -3921,7 +3290,7 @@
			List<UserModel> cloneUsers = new ArrayList<UserModel>();
			for (String name : users) {
			if (!name.equalsIgnoreCase(user.username)) {
			UserModel cloneUser = getUserModel(name);
			UserModel cloneUser = getManager(IUserManager.class).getUserModel(name);
			if (cloneUser.canClone(repository)) {
			// origin user can clone origin, grant clone access to fork
			cloneUser.setRepositoryPermission(cloneName, AccessPermission.CLONE);
			@@ -3929,33 +3298,67 @@
			cloneUsers.add(cloneUser);
			}
			}
			userService.updateUserModels(cloneUsers);
			getManager(IUserManager.class).updateUserModels(cloneUsers);

			// grant origin's team list clone permission to fork
			List<String> teams = getRepositoryTeams(repository);
			List<TeamModel> cloneTeams = new ArrayList<TeamModel>();
			for (String name : teams) {
			TeamModel cloneTeam = getTeamModel(name);
			TeamModel cloneTeam = getManager(IUserManager.class).getTeamModel(name);
			if (cloneTeam.canClone(repository)) {
			// origin team can clone origin, grant clone access to fork
			cloneTeam.setRepositoryPermission(cloneName, AccessPermission.CLONE);
			}
			cloneTeams.add(cloneTeam);
			}
			userService.updateTeamModels(cloneTeams);
			getManager(IUserManager.class).updateTeamModels(cloneTeams);

			// add this clone to the cached model
			addToCachedRepositoryList(cloneModel);
			return cloneModel;
			}

			@Override
			protected Object [] getModules() {
			return new Object [] { new DaggerModule(this) };
			}

			protected <X extends IManager> X startManager(ObjectGraph injector, Class<X> clazz) {
			logger.debug("injecting and starting {}", clazz.getSimpleName());
			X x = injector.get(clazz);
			x.setup();
			managers.add(x);
			return x;
			}

			/**
			* Allow to understand if GitBlit supports and is configured to allow
			* cookie-based authentication.
			*
			* @return status of Cookie authentication enablement.
			* Instantiate and inject all filters and servlets into the container using
			* the servlet 3 specification.
			*/
			public boolean allowCookieAuthentication() {
			return GitBlit.getBoolean(Keys.web.allowCookieAuthentication, true) && userService.supportsCookies();
			@Override
			protected void injectServlets(ServletContext context) {
			// access restricted servlets
			serve(context, Constants.GIT_PATH, GitServlet.class, GitFilter.class);
			serve(context, Constants.PAGES, PagesServlet.class, PagesFilter.class);
			serve(context, Constants.RPC_PATH, RpcServlet.class, RpcFilter.class);
			serve(context, Constants.ZIP_PATH, DownloadZipServlet.class, DownloadZipFilter.class);
			serve(context, Constants.SYNDICATION_PATH, SyndicationServlet.class, SyndicationFilter.class);

			// servlets
			serve(context, Constants.FEDERATION_PATH, FederationServlet.class);
			serve(context, Constants.SPARKLESHARE_INVITE_PATH, SparkleShareInviteServlet.class);
			serve(context, Constants.BRANCH_GRAPH_PATH, BranchGraphServlet.class);
			file(context, "/robots.txt", RobotsTxtServlet.class);
			file(context, "/logo.png", LogoServlet.class);

			// optional force basic authentication
			filter(context, "/*", EnforceAuthenticationFilter.class, null);

			// Wicket
			String toIgnore = StringUtils.flattenStrings(getRegisteredPaths(), ",");
			Map<String, String> params = new HashMap<String, String>();
			params.put(GitblitWicketFilter.FILTER_MAPPING_PARAM, "/*");
			params.put(GitblitWicketFilter.IGNORE_PATHS_PARAM, toIgnore);
			filter(context, "/*", GitblitWicketFilter.class, params);
			}
			}