From a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 10 Oct 2014 12:04:39 -0400
Subject: [PATCH] Improve relative path determination using Java 7 Paths
---
src/main/java/com/gitblit/manager/GitblitManager.java | 227 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 152 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index e3b6cf7..88fa804 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
@@ -42,9 +43,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import ro.fortsoft.pf4j.PluginClassLoader;
+import ro.fortsoft.pf4j.PluginState;
import ro.fortsoft.pf4j.PluginWrapper;
-import ro.fortsoft.pf4j.RuntimeMode;
+import ro.fortsoft.pf4j.Version;
import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
@@ -61,6 +62,7 @@
import com.gitblit.models.GitClientApplication;
import com.gitblit.models.Mailing;
import com.gitblit.models.Metric;
+import com.gitblit.models.PluginRegistry.InstallState;
import com.gitblit.models.PluginRegistry.PluginRegistration;
import com.gitblit.models.PluginRegistry.PluginRelease;
import com.gitblit.models.ProjectModel;
@@ -81,6 +83,7 @@
import com.gitblit.utils.JsonUtils;
import com.gitblit.utils.ObjectCache;
import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.XssFilter;
import com.google.gson.Gson;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
@@ -214,6 +217,13 @@
RepositoryModel cloneModel = repository.cloneAs(cloneName);
// owner has REWIND/RW+ permissions
cloneModel.addOwner(user.username);
+
+ // ensure initial access restriction of the fork
+ // is not lower than the source repository (issue-495/ticket-167)
+ if (repository.accessRestriction.exceeds(cloneModel.accessRestriction)) {
+ cloneModel.accessRestriction = repository.accessRestriction;
+ }
+
repositoryManager.updateRepositoryModel(cloneName, cloneModel, false);
// add the owner of the source repository to the clone's access list
@@ -440,7 +450,7 @@
// no user definitions, use system definitions
if (!clientApplications.hasCurrent("system", new Date(0))) {
try {
- InputStream is = getClass().getResourceAsStream("/clientapps.json");
+ InputStream is = GitblitManager.class.getResourceAsStream("/clientapps.json");
Collection<GitClientApplication> clients = readClientApplications(is);
is.close();
if (clients != null) {
@@ -482,7 +492,7 @@
// Read bundled Gitblit properties to extract setting descriptions.
// This copy is pristine and only used for populating the setting
// models map.
- InputStream is = getClass().getResourceAsStream("/reference.properties");
+ InputStream is = GitblitManager.class.getResourceAsStream("/reference.properties");
BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));
StringBuilder description = new StringBuilder();
SettingModel setting = new SettingModel();
@@ -600,8 +610,28 @@
}
@Override
+ public boolean isServingHTTP() {
+ return runtimeManager.isServingHTTP();
+ }
+
+ @Override
+ public boolean isServingGIT() {
+ return runtimeManager.isServingGIT();
+ }
+
+ @Override
+ public boolean isServingSSH() {
+ return runtimeManager.isServingSSH();
+ }
+
+ @Override
public TimeZone getTimezone() {
return runtimeManager.getTimezone();
+ }
+
+ @Override
+ public Locale getLocale() {
+ return runtimeManager.getLocale();
}
@Override
@@ -634,9 +664,19 @@
return runtimeManager.getStatus();
}
+ @Override
+ public XssFilter getXssFilter() {
+ return runtimeManager.getXssFilter();
+ }
+
/*
* NOTIFICATION MANAGER
*/
+
+ @Override
+ public boolean isSendingMail() {
+ return notificationManager.isSendingMail();
+ }
@Override
public void sendMailToAdministrators(String subject, String message) {
@@ -696,13 +736,25 @@
}
@Override
+ @Deprecated
public void setCookie(HttpServletResponse response, UserModel user) {
authenticationManager.setCookie(response, user);
}
@Override
+ public void setCookie(HttpServletRequest request, HttpServletResponse response, UserModel user) {
+ authenticationManager.setCookie(request, response, user);
+ }
+
+ @Override
+ @Deprecated
public void logout(HttpServletResponse response, UserModel user) {
authenticationManager.logout(response, user);
+ }
+
+ @Override
+ public void logout(HttpServletRequest request, HttpServletResponse response, UserModel user) {
+ authenticationManager.logout(request, response, user);
}
@Override
@@ -922,6 +974,11 @@
}
@Override
+ public void resetRepositoryCache(String repositoryName) {
+ repositoryManager.resetRepositoryCache(repositoryName);
+ }
+
+ @Override
public List<String> getRepositoryList() {
return repositoryManager.getRepositoryList();
}
@@ -934,6 +991,11 @@
@Override
public Repository getRepository(String repositoryName, boolean logError) {
return repositoryManager.getRepository(repositoryName, logError);
+ }
+
+ @Override
+ public List<RepositoryModel> getRepositoryModels() {
+ return repositoryManager.getRepositoryModels();
}
@Override
@@ -1000,6 +1062,11 @@
@Override
public void updateConfiguration(Repository r, RepositoryModel repository) {
repositoryManager.updateConfiguration(r, repository);
+ }
+
+ @Override
+ public boolean canDelete(RepositoryModel model) {
+ return repositoryManager.canDelete(model);
}
@Override
@@ -1190,73 +1257,8 @@
*/
@Override
- public <T> List<T> getExtensions(Class<T> clazz) {
- return pluginManager.getExtensions(clazz);
- }
-
- @Override
- public PluginWrapper whichPlugin(Class<?> clazz) {
- return pluginManager.whichPlugin(clazz);
- }
-
- @Override
- public boolean deletePlugin(PluginWrapper wrapper) {
- return pluginManager.deletePlugin(wrapper);
- }
-
- @Override
- public boolean refreshRegistry() {
- return pluginManager.refreshRegistry();
- }
-
- @Override
- public boolean installPlugin(String url) {
- return pluginManager.installPlugin(url);
- }
-
- @Override
- public boolean installPlugin(PluginRelease pv) {
- return pluginManager.installPlugin(pv);
- }
-
- @Override
- public List<PluginRegistration> getRegisteredPlugins() {
- return pluginManager.getRegisteredPlugins();
- }
-
- @Override
- public PluginRegistration lookupPlugin(String idOrName) {
- return pluginManager.lookupPlugin(idOrName);
- }
-
- @Override
- public PluginRelease lookupRelease(String idOrName, String version) {
- return pluginManager.lookupRelease(idOrName, version);
- }
-
- @Override
- public List<PluginWrapper> getPlugins() {
- return pluginManager.getPlugins();
- }
-
- @Override
- public List<PluginWrapper> getResolvedPlugins() {
- return pluginManager.getResolvedPlugins();
- }
-
- @Override
- public List<PluginWrapper> getUnresolvedPlugins() {
- return pluginManager.getUnresolvedPlugins();
- }
-
- @Override
- public List<PluginWrapper> getStartedPlugins() {
- return pluginManager.getStartedPlugins();
- }
-
- @Override
- public void loadPlugins() {
- pluginManager.loadPlugins();
+ public Version getSystemVersion() {
+ return pluginManager.getSystemVersion();
}
@Override
@@ -1270,12 +1272,87 @@
}
@Override
- public PluginClassLoader getPluginClassLoader(String pluginId) {
- return pluginManager.getPluginClassLoader(pluginId);
+ public List<PluginWrapper> getPlugins() {
+ return pluginManager.getPlugins();
}
@Override
- public RuntimeMode getRuntimeMode() {
- return pluginManager.getRuntimeMode();
+ public PluginWrapper getPlugin(String pluginId) {
+ return pluginManager.getPlugin(pluginId);
+ }
+
+ @Override
+ public List<Class<?>> getExtensionClasses(String pluginId) {
+ return pluginManager.getExtensionClasses(pluginId);
+ }
+
+ @Override
+ public <T> List<T> getExtensions(Class<T> clazz) {
+ return pluginManager.getExtensions(clazz);
+ }
+
+ @Override
+ public PluginWrapper whichPlugin(Class<?> clazz) {
+ return pluginManager.whichPlugin(clazz);
+ }
+
+ @Override
+ public PluginState startPlugin(String pluginId) {
+ return pluginManager.startPlugin(pluginId);
+ }
+
+ @Override
+ public PluginState stopPlugin(String pluginId) {
+ return pluginManager.stopPlugin(pluginId);
+ }
+
+ @Override
+ public boolean disablePlugin(String pluginId) {
+ return pluginManager.disablePlugin(pluginId);
+ }
+
+ @Override
+ public boolean enablePlugin(String pluginId) {
+ return pluginManager.enablePlugin(pluginId);
+ }
+
+ @Override
+ public boolean uninstallPlugin(String pluginId) {
+ return pluginManager.uninstallPlugin(pluginId);
+ }
+
+ @Override
+ public boolean refreshRegistry(boolean verifyChecksum) {
+ return pluginManager.refreshRegistry(verifyChecksum);
+ }
+
+ @Override
+ public boolean installPlugin(String url, boolean verifyChecksum) throws IOException {
+ return pluginManager.installPlugin(url, verifyChecksum);
+ }
+
+ @Override
+ public boolean upgradePlugin(String pluginId, String url, boolean verifyChecksum) throws IOException {
+ return pluginManager.upgradePlugin(pluginId, url, verifyChecksum);
+ }
+
+ @Override
+ public List<PluginRegistration> getRegisteredPlugins() {
+ return pluginManager.getRegisteredPlugins();
+ }
+
+ @Override
+ public List<PluginRegistration> getRegisteredPlugins(InstallState state) {
+ return pluginManager.getRegisteredPlugins(state);
+ }
+
+ @Override
+ public PluginRegistration lookupPlugin(String pluginId) {
+ return pluginManager.lookupPlugin(pluginId);
+ }
+
+ @Override
+ public PluginRelease lookupRelease(String pluginId, String version) {
+ return pluginManager.lookupRelease(pluginId, version);
}
}
--
Gitblit v1.9.1