diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-14 12:10:25 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-04-10 18:58:08 -0400 |
| commit | 44e2ee1d05a9d455ae60dd64058b31f006d551b7 (patch) | |
| tree | e2ebf0e3602d4ffac049295f723f51b43e378efa /src/main/java/com/gitblit/manager/GitblitManager.java | |
| parent | 39ffede55f79395d6d1298f24ce201dbae262a32 (diff) | |
| download | gitblit-44e2ee1d05a9d455ae60dd64058b31f006d551b7.tar.gz gitblit-44e2ee1d05a9d455ae60dd64058b31f006d551b7.zip | |
Revise SSH public key integration with AuthenticationManager
Diffstat (limited to 'src/main/java/com/gitblit/manager/GitblitManager.java')
| -rw-r--r-- | src/main/java/com/gitblit/manager/GitblitManager.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java index a5a26379..97e8efc9 100644 --- a/src/main/java/com/gitblit/manager/GitblitManager.java +++ b/src/main/java/com/gitblit/manager/GitblitManager.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.Type; +import java.security.PublicKey; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; @@ -68,7 +69,6 @@ import com.gitblit.models.SettingModel; import com.gitblit.models.TeamModel; import com.gitblit.models.UserModel; import com.gitblit.tickets.ITicketService; -import com.gitblit.transport.ssh.SshSession; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.HttpUtils; import com.gitblit.utils.JsonUtils; @@ -652,12 +652,12 @@ public class GitblitManager implements IGitblit { } return user; } - + @Override - public UserModel authenticate(SshSession sshSession) { - return authenticationManager.authenticate(sshSession); + public UserModel authenticate(String username, PublicKey key) { + return authenticationManager.authenticate(username, key); } - + @Override public UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate) { UserModel user = authenticationManager.authenticate(httpRequest, requiresCertificate); |