Skip to content

The Unified and Autonomous Development Platform

Fix issue #889 - Security: login dialog

Robin Shenb8428366f7d5
diff --git a/server-core/src/main/java/io/onedev/server/rest/exception/IncorrectCredentialsExceptionHandler.java b/server-core/src/main/java/io/onedev/server/rest/exception/IncorrectCredentialsExceptionHandler.java
index 3c0c08e820..fb7d844deb 100644
--- a/server-core/src/main/java/io/onedev/server/rest/exception/IncorrectCredentialsExceptionHandler.java
+++ b/server-core/src/main/java/io/onedev/server/rest/exception/IncorrectCredentialsExceptionHandler.java
@@ -15,7 +15,7 @@ public class IncorrectCredentialsExceptionHandler extends AbstractExceptionHandl
public Response getResponse(IncorrectCredentialsException exception) {
return Response
.status(Response.Status.UNAUTHORIZED)
- .entity("Incorrect credentials")
+ .entity("Invalid credentials")
.type(MediaType.TEXT_PLAIN)
.build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/exception/UnknownUserExceptionHandler.java b/server-core/src/main/java/io/onedev/server/rest/exception/UnknownUserExceptionHandler.java
index 8837f8d087..0abb8a11cf 100644
--- a/server-core/src/main/java/io/onedev/server/rest/exception/UnknownUserExceptionHandler.java
+++ b/server-core/src/main/java/io/onedev/server/rest/exception/UnknownUserExceptionHandler.java
@@ -15,7 +15,7 @@ public class UnknownUserExceptionHandler extends AbstractExceptionHandler<Unknow
public Response getResponse(UnknownAccountException exception) {
return Response
.status(Response.Status.UNAUTHORIZED)
- .entity("Unknown user")
+ .entity("Invalid credentials")
.type(MediaType.TEXT_PLAIN)
.build();
}
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 2cf4963b69..196802bdc8 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
@@ -227,7 +227,7 @@ public class LdapAuthenticator extends Authenticator {
}
NamingEnumeration<SearchResult> results = ctx.search(userSearchBase, userSearchFilter, searchControls);
if (results == null || !results.hasMore())
- throw new UnknownAccountException("Unknown account");
+ throw new UnknownAccountException("Invalid credentials");
SearchResult searchResult = (SearchResult) results.next();
String userDN = searchResult.getNameInNamespace();
@@ -251,10 +251,10 @@ public class LdapAuthenticator extends Authenticator {
ldapEnv.put(Context.SECURITY_CREDENTIALS, new String(token.getPassword()));
DirContext userCtx = null;
try {
- logger.debug("Authenticating user by binding as '" + userDN + "'...");
userCtx = new InitialDirContext(ldapEnv);
} catch (AuthenticationException e) {
- throw new org.apache.shiro.authc.AuthenticationException("Unable to bind as '" + userDN + "'", e);
+ logger.error("Unable to bind as '" + userDN + "'", e);
+ throw new org.apache.shiro.authc.AuthenticationException("Invalid credentials");
} finally {
if (userCtx != null) {
try {