From 42e19382d28d06eda0ffbcda01fbfed5c3538dd8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 19 Jul 2013 10:47:56 -0400
Subject: [PATCH] Merge pull request #98 from simonharrer/close-resources-correctly
---
src/main/java/com/gitblit/git/GitblitUploadPackFactory.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index 85750f8..1756ac5 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -15,13 +15,15 @@
*/
package com.gitblit.git;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.DaemonClient;
import org.eclipse.jgit.transport.RefFilter;
import org.eclipse.jgit.transport.UploadPack;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
@@ -30,8 +32,6 @@
import com.gitblit.GitBlit;
import com.gitblit.models.UserModel;
-import com.gitblit.utils.IssueUtils;
-import com.gitblit.utils.PushLogUtils;
/**
* The upload pack factory creates an upload pack which controls what refs are
@@ -56,9 +56,9 @@
if (user == null) {
user = UserModel.ANONYMOUS;
}
- } else if (req instanceof DaemonClient) {
+ } else if (req instanceof GitDaemonClient) {
// git daemon request is always anonymous
- DaemonClient client = (DaemonClient) req;
+ GitDaemonClient client = (GitDaemonClient) req;
// set timeout from Git daemon
timeout = client.getDaemon().getTimeout();
}
@@ -90,9 +90,17 @@
return refs;
}
- // normal users can not clone gitblit refs
- refs.remove(IssueUtils.GB_ISSUES);
- refs.remove(PushLogUtils.GB_PUSHES);
+ // normal users can not clone any gitblit refs
+ // JGit's RefMap is custom and does not support iterator removal :(
+ List<String> toRemove = new ArrayList<String>();
+ for (String ref : refs.keySet()) {
+ if (ref.startsWith("refs/gitblit/")) {
+ toRemove.add(ref);
+ }
+ }
+ for (String ref : toRemove) {
+ refs.remove(ref);
+ }
return refs;
}
}
--
Gitblit v1.9.1