From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/git/GitblitUploadPackFactory.java | 66 +++++++--------------------------
1 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index 85750f8..ec85628 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -15,85 +15,47 @@
*/
package com.gitblit.git;
-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;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.transport.resolver.UploadPackFactory;
-import com.gitblit.GitBlit;
-import com.gitblit.models.UserModel;
-import com.gitblit.utils.IssueUtils;
-import com.gitblit.utils.PushLogUtils;
+import com.gitblit.manager.IAuthenticationManager;
+import com.gitblit.transport.git.GitDaemonClient;
/**
* The upload pack factory creates an upload pack which controls what refs are
* advertised to cloning/pulling clients.
- *
+ *
* @author James Moger
- *
+ *
* @param <X> the connection type
*/
public class GitblitUploadPackFactory<X> implements UploadPackFactory<X> {
+
+ private final IAuthenticationManager authenticationManager;
+
+ public GitblitUploadPackFactory(IAuthenticationManager authenticationManager) {
+ this.authenticationManager = authenticationManager;
+ }
@Override
public UploadPack create(X req, Repository db)
throws ServiceNotEnabledException, ServiceNotAuthorizedException {
- UserModel user = UserModel.ANONYMOUS;
int timeout = 0;
- if (req instanceof HttpServletRequest) {
- // http/https request may or may not be authenticated
- user = GitBlit.self().authenticate((HttpServletRequest) req);
- if (user == null) {
- user = UserModel.ANONYMOUS;
- }
- } else if (req instanceof DaemonClient) {
+ 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();
}
- 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<String, Ref> filter(Map<String, Ref> refs) {
- if (user.canAdmin()) {
- // admins can see all refs
- return refs;
- }
-
- // normal users can not clone gitblit refs
- refs.remove(IssueUtils.GB_ISSUES);
- refs.remove(PushLogUtils.GB_PUSHES);
- return refs;
- }
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1