From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/GitServlet.java | 86 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java
index b2ee1c7..3b60e9f 100644
--- a/src/com/gitblit/GitServlet.java
+++ b/src/com/gitblit/GitServlet.java
@@ -26,9 +26,12 @@
import java.io.OutputStreamWriter;
import java.text.MessageFormat;
import java.util.Collection;
-import java.util.List;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -68,24 +71,13 @@
private GroovyScriptEngine gse;
- /**
- * Configure the servlet from Gitblit's configuration.
- */
- @Override
- public String getInitParameter(String name) {
- if (name.equals("base-path")) {
- return GitBlit.getRepositoriesFolder().getAbsolutePath();
- } else if (name.equals("export-all")) {
- return "1";
- }
- return super.getInitParameter(name);
- }
+ private File groovyDir;
@Override
public void init(ServletConfig config) throws ServletException {
- String groovyRoot = GitBlit.getString(Keys.groovy.scriptsFolder, "groovy");
+ groovyDir = GitBlit.getGroovyScriptsFolder();
try {
- gse = new GroovyScriptEngine(groovyRoot);
+ gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());
} catch (IOException e) {
throw new ServletException("Failed to instantiate Groovy Script Engine!", e);
}
@@ -103,7 +95,48 @@
return rp;
}
});
- super.init(config);
+ super.init(new GitblitServletConfig(config));
+ }
+
+ /**
+ * Transitional wrapper class to configure the JGit 1.2 GitFilter. This
+ * GitServlet will probably be replaced by a GitFilter so that Gitblit can
+ * serve Git repositories on the root URL and not a /git sub-url.
+ *
+ * @author James Moger
+ *
+ */
+ private class GitblitServletConfig implements ServletConfig {
+ final ServletConfig config;
+
+ GitblitServletConfig(ServletConfig config) {
+ this.config = config;
+ }
+
+ @Override
+ public String getServletName() {
+ return config.getServletName();
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return config.getServletContext();
+ }
+
+ @Override
+ public String getInitParameter(String name) {
+ if (name.equals("base-path")) {
+ return GitBlit.getRepositoriesFolder().getAbsolutePath();
+ } else if (name.equals("export-all")) {
+ return "1";
+ }
+ return config.getInitParameter(name);
+ }
+
+ @Override
+ public Enumeration<String> getInitParameterNames() {
+ return config.getInitParameterNames();
+ }
}
/**
@@ -127,8 +160,9 @@
*/
@Override
public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
- List<String> scripts = GitBlit.getStrings(Keys.groovy.preReceiveScripts);
RepositoryModel repository = getRepositoryModel(rp);
+ Set<String> scripts = new LinkedHashSet<String>();
+ scripts.addAll(GitBlit.self().getPreReceiveScriptsInherited(repository));
scripts.addAll(repository.preReceiveScripts);
UserModel user = getUserModel(rp);
runGroovy(repository, user, commands, scripts);
@@ -154,8 +188,9 @@
logger.info("skipping post-receive hooks, no refs created, updated, or removed");
return;
}
- List<String> scripts = GitBlit.getStrings(Keys.groovy.postReceiveScripts);
RepositoryModel repository = getRepositoryModel(rp);
+ Set<String> scripts = new LinkedHashSet<String>();
+ scripts.addAll(GitBlit.self().getPostReceiveScriptsInherited(repository));
scripts.addAll(repository.postReceiveScripts);
UserModel user = getUserModel(rp);
runGroovy(repository, user, commands, scripts);
@@ -173,8 +208,8 @@
protected RepositoryModel getRepositoryModel(ReceivePack rp) {
Repository repository = rp.getRepository();
String rootPath = GitBlit.getRepositoriesFolder().getAbsolutePath();
- String repositoryName = repository.getDirectory().getAbsolutePath();
- repositoryName = repositoryName.substring(rootPath.length() + 1);
+ String repositoryName = StringUtils.getRelativePath(rootPath, repository.getDirectory()
+ .getAbsolutePath());
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
return model;
}
@@ -204,7 +239,7 @@
* @param scripts
*/
protected void runGroovy(RepositoryModel repository, UserModel user,
- Collection<ReceiveCommand> commands, List<String> scripts) {
+ Collection<ReceiveCommand> commands, Set<String> scripts) {
if (scripts == null || scripts.size() == 0) {
// no Groovy scripts to execute
return;
@@ -221,6 +256,15 @@
if (StringUtils.isEmpty(script)) {
continue;
}
+ // allow script to be specified without .groovy extension
+ // this is easier to read in the settings
+ File file = new File(groovyDir, script);
+ if (!file.exists() && !script.toLowerCase().endsWith(".groovy")) {
+ file = new File(groovyDir, script + ".groovy");
+ if (file.exists()) {
+ script = file.getName();
+ }
+ }
try {
Object result = gse.run(script, binding);
if (result instanceof Boolean) {
--
Gitblit v1.9.1