diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-02-22 21:17:03 +0100 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-04-10 18:58:07 -0400 |
| commit | e3b636e7fa2a823cfe90ea75e88034a60f7e59e6 (patch) | |
| tree | 8341fe1dba50ec2ed4bb780c1944f91ac52d7528 /src/main/java/com/gitblit/git/RepositoryResolver.java | |
| parent | a3de33e71a22268105714e01d09c1c2e28bfe2c3 (diff) | |
| download | gitblit-e3b636e7fa2a823cfe90ea75e88034a60f7e59e6.tar.gz gitblit-e3b636e7fa2a823cfe90ea75e88034a60f7e59e6.zip | |
SSHD: Add support for git pack commands
Add git-upload-pack and git-receive-pack commands.
Conflicts:
src/main/java/com/gitblit/manager/ServicesManager.java
src/main/java/com/gitblit/transport/ssh/CommandDispatcher.java
src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
Change-Id: I8c057b41f1dfad6d004e6aa91f96c8c673be9be2
Diffstat (limited to 'src/main/java/com/gitblit/git/RepositoryResolver.java')
| -rw-r--r-- | src/main/java/com/gitblit/git/RepositoryResolver.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java index 208c1ae1..c859f6f6 100644 --- a/src/main/java/com/gitblit/git/RepositoryResolver.java +++ b/src/main/java/com/gitblit/git/RepositoryResolver.java @@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory; import com.gitblit.manager.IGitblit; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; +import com.gitblit.transport.ssh.SshSession; /** * Resolves repositories and grants export access. @@ -67,6 +68,9 @@ public class RepositoryResolver<X> extends FileResolver<X> { // git request GitDaemonClient client = (GitDaemonClient) req; client.setRepositoryName(name); + } else if (req instanceof SshSession) { + SshSession s = (SshSession)req; + s.setRepositoryName(name); } return repo; } @@ -98,6 +102,12 @@ public class RepositoryResolver<X> extends FileResolver<X> { if (user == null) { user = UserModel.ANONYMOUS; } + } else if (req instanceof SshSession) { + SshSession s = (SshSession) req; + user = gitblit.authenticate(s); + if (user == null) { + throw new IOException(String.format("User %s not found", s.getRemoteUser())); + } } if (user.canClone(model)) { |