From b8e1fa94f3f28a94b466c79b1a4b24c6fd755df1 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 12 Mar 2014 21:44:36 -0400 Subject: [PATCH] Improve logging of received patchset command --- src/main/java/com/gitblit/git/GitblitUploadPackFactory.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java index 180e8b5..d4e3ca1 100644 --- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java @@ -23,8 +23,7 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.eclipse.jgit.transport.resolver.UploadPackFactory; -import com.gitblit.GitBlit; -import com.gitblit.manager.ISessionManager; +import com.gitblit.manager.IAuthenticationManager; import com.gitblit.models.UserModel; /** @@ -37,17 +36,22 @@ */ 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 { - ISessionManager sessionManager = GitBlit.getManager(ISessionManager.class); UserModel user = UserModel.ANONYMOUS; int timeout = 0; if (req instanceof HttpServletRequest) { // http/https request may or may not be authenticated - user = sessionManager.authenticate((HttpServletRequest) req); + user = authenticationManager.authenticate((HttpServletRequest) req); if (user == null) { user = UserModel.ANONYMOUS; } -- Gitblit v1.9.1