From b4f946d4c964612d5398fd6450f63618c327b7dd Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 24 Oct 2013 14:59:29 -0400 Subject: Remove upload pack ref filtering Change-Id: I7ffcbf00e70eea68803eb6c046d5ddca55503b8b --- .../com/gitblit/git/GitblitUploadPackFactory.java | 43 ---------------------- 1 file changed, 43 deletions(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java index 01dfc08b..90875b59 100644 --- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java @@ -15,21 +15,14 @@ */ package com.gitblit.git; -import java.util.ArrayList; -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.RefFilter; import org.eclipse.jgit.transport.UploadPack; import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.eclipse.jgit.transport.resolver.UploadPackFactory; -import com.gitblit.Constants; import com.gitblit.GitBlit; import com.gitblit.models.UserModel; @@ -63,45 +56,9 @@ public class GitblitUploadPackFactory implements UploadPackFactory { timeout = client.getDaemon().getTimeout(); } - RefFilter refFilter = new UserRefFilter(user); UploadPack up = new UploadPack(db); - up.setRefFilter(refFilter); up.setTimeout(timeout); return up; } - - /** - * Restricts advertisement of certain refs based on the permission of the - * requesting user. - */ - public static class UserRefFilter implements RefFilter { - - final UserModel user; - - public UserRefFilter(UserModel user) { - this.user = user; - } - - @Override - public Map filter(Map refs) { - if (user.canAdmin()) { - // admins can see all refs - return refs; - } - - // normal users can not clone any gitblit refs - // JGit's RefMap is custom and does not support iterator removal :( - List toRemove = new ArrayList(); - for (String ref : refs.keySet()) { - if (ref.startsWith(Constants.R_GITBLIT)) { - toRemove.add(ref); - } - } - for (String ref : toRemove) { - refs.remove(ref); - } - return refs; - } - } } \ No newline at end of file -- cgit v1.2.3