From 04a98505a4ab8f48aee22800fcac193d9367d0ae Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Refactor user services and separate authentication (issue-281)
---
src/main/java/com/gitblit/git/GitblitReceivePackFactory.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
index b2862f0..e24d119 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
@@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;
import com.gitblit.GitBlit;
+import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -43,6 +44,16 @@
public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> {
protected final Logger logger = LoggerFactory.getLogger(GitblitReceivePackFactory.class);
+
+ private final IStoredSettings settings;
+
+ private final GitBlit gitblit;
+
+ public GitblitReceivePackFactory(GitBlit gitblit) {
+ super();
+ this.settings = gitblit.getSettings();
+ this.gitblit = gitblit;
+ }
@Override
public ReceivePack create(X req, Repository db)
@@ -66,7 +77,7 @@
// determine pushing user
String username = request.getRemoteUser();
if (!StringUtils.isEmpty(username)) {
- UserModel u = GitBlit.self().getUserModel(username);
+ UserModel u = gitblit.getUserModel(username);
if (u != null) {
user = u;
}
@@ -81,15 +92,15 @@
timeout = client.getDaemon().getTimeout();
}
- boolean allowAnonymousPushes = GitBlit.getBoolean(Keys.git.allowAnonymousPushes, false);
+ boolean allowAnonymousPushes = settings.getBoolean(Keys.git.allowAnonymousPushes, false);
if (!allowAnonymousPushes && UserModel.ANONYMOUS.equals(user)) {
// prohibit anonymous pushes
throw new ServiceNotEnabledException();
}
- final RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);
+ final RepositoryModel repository = gitblit.getRepositoryModel(repositoryName);
- final GitblitReceivePack rp = new GitblitReceivePack(db, repository, user);
+ final GitblitReceivePack rp = new GitblitReceivePack(gitblit, db, repository, user);
rp.setGitblitUrl(gitblitUrl);
rp.setRepositoryUrl(repositoryUrl);
rp.setRefLogIdent(new PersonIdent(user.username, user.username + "@" + origin));
--
Gitblit v1.9.1