Skip to content

The Unified and Autonomous Development Platform

fix: OneDev returns HTTP 500 instead of HTTP 401 on expired/invalid HTTPS Git credentials (OD-2887)

Robin Shen47ffa648637d
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java
new file mode 100644
index 0000000000..8a41b86b0d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/AuthenticationExceptionHandler.java
@@ -0,0 +1,19 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authc.AuthenticationException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class AuthenticationExceptionHandler extends AbstractExceptionHandler<AuthenticationException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(AuthenticationException exception) {
+ return new HttpResponse(HttpServletResponse.SC_UNAUTHORIZED,
+ "User unknown or credential incorrect");
+ }
+
+}
diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
index 96a68f9199..a73640fd58 100644
--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
@@ -24,6 +24,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.Strings;
+import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.jspecify.annotations.Nullable;
@@ -278,7 +279,7 @@ public class LdapAuthenticator extends Authenticator {
userCtx = new InitialDirContext(ldapEnv);
} catch (AuthenticationException e) {
logger.error("Unable to bind as '" + userDN + "'", e);
- throw new org.apache.shiro.authc.AuthenticationException("Invalid credentials");
+ throw new IncorrectCredentialsException("Invalid credentials");
} finally {
if (userCtx != null) {
try {