// Copyright (C) 2014 The Android Open Source Project
//
// 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
//
// 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.

package com.google.gerrit.sshd;

import com.google.inject.Inject;
import com.google.inject.Singleton;

@Singleton
public class CachingPublicKeyAuthenticator
    extends org.apache.sshd.server.auth.CachingPublicKeyAuthenticator {

  @Inject
  public CachingPublicKeyAuthenticator(DatabasePubKeyAuth authenticator) {
    super(authenticator);
  }
}

@@ -709,46 +709,131 @@
 n;%0A%0A
-@Singleton%0Apublic class Caching
+import org.apache.sshd.common.Session;%0Aimport org.apache.sshd.common.SessionListener;%0Aimport org.apache.sshd.server.
 Public
-K
+k
 eyAu
@@ -847,20 +847,16 @@
 ator
-%0A    extends
+;%0Aimport
  org
@@ -879,154 +879,1268 @@
 ver.
-auth.CachingPublicKeyAuthenticator %7B%0A%0A  @Inject%0A  public CachingPublicKeyAuthenticator(DatabasePubKeyAuth authenticator) %7B%0A    super(authenticator
+session.ServerSession;%0A%0Aimport java.security.PublicKey;%0Aimport java.util.HashMap;%0Aimport java.util.Map;%0Aimport java.util.concurrent.ConcurrentHashMap;%0A%0A@Singleton%0Apublic class CachingPublicKeyAuthenticator implements PublickeyAuthenticator,%0A    SessionListener %7B%0A%0A  private final PublickeyAuthenticator authenticator;%0A  private final Map%3CServerSession, Map%3CPublicKey, Boolean%3E%3E sessionCache;%0A%0A  @Inject%0A  public CachingPublicKeyAuthenticator(DatabasePubKeyAuth authenticator) %7B%0A    this.authenticator = authenticator;%0A    this.sessionCache = new ConcurrentHashMap%3C%3E();%0A  %7D%0A%0A  @Override%0A  public boolean authenticate(String username, PublicKey key,%0A      ServerSession session) %7B%0A    Map%3CPublicKey, Boolean%3E m = sessionCache.get(session);%0A    if (m == null) %7B%0A      m = new HashMap%3C%3E();%0A      sessionCache.put(session, m);%0A      session.addListener(this);%0A    %7D%0A    if (m.containsKey(key)) %7B%0A      return m.get(key);%0A    %7D%0A    boolean r = authenticator.authenticate(username, key, session);%0A    m.put(key, r);%0A    return r;%0A  %7D%0A%0A  @Override%0A  public void sessionCreated(Session session) %7B%0A  %7D%0A%0A  @Override%0A  public void sessionEvent(Session sesssion, Event event) %7B%0A  %7D%0A%0A  @Override%0A  public void sessionClosed(Session session) %7B%0A    sessionCache.remove(session
 );%0A 

Revert "SSH: Simplify CachingPublicKeyAuthenticator implementation"