opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10' into stable-2.11

Browse Source 
* stable-2.10:
  Revert "Revert "SSH: Simplify CachingPublicKeyAuthenticator implementation""
  Remove stripping # in login redirect

Change-Id: I052e45a3220b43923e1ee414c97f1bbfe845620a
This commit is contained in:
David Pursehouse
2015-04-07 19:33:26 +09:00
parent ff0c6367be c7f58ccbd8
commit 3d338f90ef
2 changed files with 4 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
View File

@@ -7,10 +7,7 @@
var p = href.indexOf('#'); var p = href.indexOf('#');
var token; var token;
if (p >= 0) { if (p >= 0) {
token = href.substring(p + 1); token = href.substring(p);
if (token.length != 0 && token.charAt(0) == '/') {
token = token.substring(1);
}
href = href.substring(0, p); href = href.substring(0, p);
} else { } else {
token = ''; token = '';

50
gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java
View File

@@ -17,56 +17,12 @@ package com.google.gerrit.sshd;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.apache.sshd.common.Session;
import org.apache.sshd.common.SessionListener;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.session.ServerSession;
import java.security.PublicKey;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Singleton @Singleton
public class CachingPublicKeyAuthenticator implements PublickeyAuthenticator, public class CachingPublicKeyAuthenticator
SessionListener { extends org.apache.sshd.server.auth.CachingPublicKeyAuthenticator {
private final PublickeyAuthenticator authenticator;
private final Map<ServerSession, Map<PublicKey, Boolean>> sessionCache;
@Inject @Inject
public CachingPublicKeyAuthenticator(DatabasePubKeyAuth authenticator) { public CachingPublicKeyAuthenticator(DatabasePubKeyAuth authenticator) {
this.authenticator = authenticator; super(authenticator);
this.sessionCache = new ConcurrentHashMap<>();
}
@Override
public boolean authenticate(String username, PublicKey key,
ServerSession session) {
Map<PublicKey, Boolean> m = sessionCache.get(session);
if (m == null) {
m = new HashMap<>();
sessionCache.put(session, m);
session.addListener(this);
}
if (m.containsKey(key)) {
return m.get(key);
}
boolean r = authenticator.authenticate(username, key, session);
m.put(key, r);
return r;
}
@Override
public void sessionCreated(Session session) {
}
@Override
public void sessionEvent(Session sesssion, Event event) {
}
@Override
public void sessionClosed(Session session) {
sessionCache.remove(session);
} }
} }