From 39ffede55f79395d6d1298f24ce201dbae262a32 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Simplify version command and output

---
 src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java |   90 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
index 4c97c58..f1bff4f 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
@@ -1,26 +1,35 @@
 /*
  * Copyright 2014 gitblit.com.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.gitblit.transport.ssh;
 
 import java.security.PublicKey;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.sshd.server.PublickeyAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 
-import com.gitblit.manager.IGitblit;
+import com.gitblit.manager.IAuthenticationManager;
+import com.gitblit.models.UserModel;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 
 /**
  *
@@ -29,15 +38,66 @@
  */
 public class SshKeyAuthenticator implements PublickeyAuthenticator {
 
-	protected final IGitblit gitblit;
+	protected final IKeyManager keyManager;
+	
+	protected final IAuthenticationManager authManager;
 
-	public SshKeyAuthenticator(IGitblit gitblit) {
-		this.gitblit = gitblit;
+	LoadingCache<String, List<PublicKey>> sshKeyCache = CacheBuilder
+			.newBuilder().
+			expireAfterAccess(15, TimeUnit.MINUTES).
+			maximumSize(100)
+			.build(new CacheLoader<String, List<PublicKey>>() {
+				public List<PublicKey> load(String username) {
+					return keyManager.getKeys(username);
+				}
+			});
+
+	public SshKeyAuthenticator(IKeyManager keyManager, IAuthenticationManager authManager) {
+		this.keyManager = keyManager;
+		this.authManager = authManager;
 	}
 
 	@Override
-	public boolean authenticate(String username, PublicKey key, ServerSession session) {
-		// TODO actually authenticate
-		return true;
+	public boolean authenticate(String username, final PublicKey suppliedKey,
+			final ServerSession session) {
+		final SshSession sd = session.getAttribute(SshSession.KEY);
+
+		username = username.toLowerCase(Locale.US);
+		try {
+			List<PublicKey> keys = sshKeyCache.get(username);
+			if (keys == null || keys.isEmpty()) {
+				sd.authenticationError(username, "no-matching-key");
+				return false;
+			}
+			for (PublicKey key : keys) {
+				if (key.equals(suppliedKey)) {
+					return validate(username, sd);
+				}
+			}
+			return false;
+		} catch (ExecutionException e) {
+			sd.authenticationError(username, "user-not-found");
+			return false;
+		}
+	}
+
+	boolean validate(String username, SshSession sd) {
+		// now that the key has been validated, check with the authentication
+		// manager to ensure that this user exists and can authenticate
+		sd.authenticationSuccess(username);
+		UserModel user = authManager.authenticate(sd);
+		if (user != null) {
+			return true;
+		}
+		sd.authenticationError(username, "user-not-found");
+		return false;
+	}
+
+	public IKeyManager getKeyManager() {
+		return keyManager;
+	}
+	
+	public Cache<String, List<PublicKey>> getKeyCache() {
+		return sshKeyCache;
 	}
 }

--
Gitblit v1.9.1