diff options
Diffstat (limited to 'src/main/java/com/gitblit/git')
| -rw-r--r-- | src/main/java/com/gitblit/git/GitblitReceivePackFactory.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/git/RepositoryResolver.java | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java index 7976fe56..9911258c 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java @@ -31,6 +31,7 @@ import com.gitblit.Keys; import com.gitblit.manager.IGitblit; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; +import com.gitblit.transport.ssh.SshSession; import com.gitblit.utils.HttpUtils; import com.gitblit.utils.StringUtils; @@ -88,6 +89,13 @@ public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> { // set timeout from Git daemon timeout = client.getDaemon().getTimeout(); + } else if (req instanceof SshSession) { + // SSH request is always authenticated + SshSession s = (SshSession) req; + repositoryName = s.getRepositoryName(); + origin = s.getRemoteAddress().toString(); + String username = s.getRemoteUser(); + user = gitblit.getUserModel(username); } boolean allowAnonymousPushes = settings.getBoolean(Keys.git.allowAnonymousPushes, false); 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)) { |