opendev/gerrit
Code Issues Proposed changes

Remove unnecessary /login/* URLs when auth.type = LDAP

Browse Source 
Under auth.type LDAP we are doing username/password authentication
via an RPC.  There is no need for the browser to redirect through
our /login/ subdirectory in order to perform the login process.

Change-Id: I13a61229ccd9c43d62309d357c2fdb8df4b95c10
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-12-24 16:25:59 -08:00
parent 58b898cff4
commit 23e0987350
2 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java
View File

@@ -22,7 +22,6 @@ import com.google.inject.servlet.ServletModule;
public class LdapAuthModule extends ServletModule {
@Override
protected void configureServlets() {
serve("/login/*").with(LoginRedirectServlet.class);
install(new RpcServletModule(UiRpcModule.PREFIX) {
@Override
protected void configureServlets() {

78
gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java
View File

@@ -1,78 +0,0 @@
// Copyright (C) 2009 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.httpd.auth.ldap;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.auth.SignInMode;
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.config.Nullable;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Singleton
class LoginRedirectServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private final Provider<WebSession> webSession;
private final Provider<String> urlProvider;
@Inject
LoginRedirectServlet(final Provider<WebSession> webSession,
@CanonicalWebUrl @Nullable final Provider<String> urlProvider) {
this.webSession = webSession;
this.urlProvider = urlProvider;
}
@Override
protected void doGet(final HttpServletRequest req,
final HttpServletResponse rsp) throws IOException {
final String token;
if (webSession.get().isSignedIn()) {
token = getToken(req);
} else {
final String msg = "Session cookie not available.";
token = "SignInFailure," + SignInMode.SIGN_IN + "," + msg;
}
final StringBuilder rdr = new StringBuilder();
rdr.append(urlProvider.get());
rdr.append('#');
rdr.append(token);
rsp.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
rsp.setHeader("Pragma", "no-cache");
rsp.setHeader("Cache-Control", "no-cache, must-revalidate");
rsp.sendRedirect(rdr.toString());
}
private String getToken(final HttpServletRequest req) {
String token = req.getPathInfo();
if (token != null && token.startsWith("/")) {
token = token.substring(1);
}
if (token == null || token.isEmpty()) {
token = PageLinks.MINE;
}
return token;
}
}