Allow logging in at /login
Prior to this change, login was only /login/ and logout was only
/logout. We don't need to serve /logout/ necessarily, but we should
serve /login for at least some consistency.
Change-Id: I3f1b7e84f20187548cd9cf905cc2631350f7cc1a
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountModule.java
index 0afc83f..5e2a425 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountModule.java
@@ -19,6 +19,6 @@
public class BecomeAnyAccountModule extends ServletModule {
@Override
protected void configureServlets() {
- serve("/login/*").with(BecomeAnyAccountLoginServlet.class);
+ serve("/login", "/login/*").with(BecomeAnyAccountLoginServlet.class);
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
index 553b1f4..daaa7e2 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java
@@ -21,6 +21,6 @@
@Override
protected void configureServlets() {
filter("/").through(HttpAuthFilter.class);
- serve("/login/*").with(HttpLoginServlet.class);
+ serve("/login", "/login/*").with(HttpLoginServlet.class);
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertModule.java
index 7d32ac8..edf501b 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertModule.java
@@ -21,6 +21,6 @@
@Override
protected void configureServlets() {
filter("/").through(HttpsClientSslCertAuthFilter.class);
- serve("/login/*").with(HttpsClientSslCertLoginServlet.class);
+ serve("/login", "/login/*").with(HttpsClientSslCertLoginServlet.class);
}
}
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java
index 8690a03..e7663bb 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java
@@ -20,6 +20,6 @@
public class LdapAuthModule extends ServletModule {
@Override
protected void configureServlets() {
- serve("/login/*").with(LdapLoginServlet.class);
+ serve("/login", "/login/*").with(LdapLoginServlet.class);
}
}
diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java
index 9db0e52..c87a0cf 100644
--- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java
+++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java
@@ -20,7 +20,7 @@
public class OpenIdModule extends ServletModule {
@Override
protected void configureServlets() {
- serve("/login/*").with(LoginForm.class);
+ serve("/login", "/login/*").with(LoginForm.class);
serve("/" + OpenIdServiceImpl.RETURN_URL).with(OpenIdLoginServlet.class);
serve("/" + XrdsServlet.LOCATION).with(XrdsServlet.class);
filter("/").through(XrdsFilter.class);
