Skip to content

The Unified and Autonomous Development Platform

chore: Report disabled account upon login to avoid confusion

Robin Shene69e6d0e337e
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java
index 2ac0313824..114d218431 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java
@@ -6,6 +6,8 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.shiro.authc.DisabledAccountException;
+
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
@@ -74,6 +76,12 @@ public class DefaultAccessTokenManager extends BaseEntityManager<AccessToken> im
}
}
+ private AccessToken checkDisabled(AccessToken accessToken) {
+ if (accessToken.getOwner().isDisabled())
+ throw new DisabledAccountException("Account is disabled");
+ return accessToken;
+ }
+
@Override
public final AccessToken findByValue(String value) {
return sessionManager.call(new Callable<AccessToken>() {
@@ -83,7 +91,7 @@ public class DefaultAccessTokenManager extends BaseEntityManager<AccessToken> im
if (cache != null) {
var facade = cache.findByValue(value);
if (facade != null) {
- return load(facade.getId());
+ return checkDisabled(load(facade.getId()));
} else {
Long userId = temporalAccessTokens.get(value);
if (userId != null) {
@@ -91,7 +99,7 @@ public class DefaultAccessTokenManager extends BaseEntityManager<AccessToken> im
accessToken.setOwner(userManager.load(userId));
accessToken.setHasOwnerPermissions(true);
accessToken.setValue(value);
- return accessToken;
+ return checkDisabled(accessToken);
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/DisabledAccountExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/DisabledAccountExceptionHandler.java
new file mode 100644
index 0000000000..0448b5fb42
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/DisabledAccountExceptionHandler.java
@@ -0,0 +1,19 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authc.DisabledAccountException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class DisabledAccountExceptionHandler extends AbstractExceptionHandler<DisabledAccountException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(DisabledAccountException exception) {
+ return new HttpResponse(HttpServletResponse.SC_UNAUTHORIZED,
+ "Account is disabled");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
index 44540a0b2c..f37c4da6e7 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
@@ -11,6 +11,7 @@ import javax.inject.Singleton;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.DisabledAccountException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.PasswordMatcher;
@@ -145,8 +146,10 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {
var userName = normalizeUserName((String) token.getPrincipal());
user = userManager.findByName(userName);
if (user != null) {
- if (user.isDisabled() || user.isServiceAccount())
- throw new UnknownAccountException("Invalid credentials");
+ if (user.isDisabled())
+ throw new DisabledAccountException("Account is disabled");
+ else if (user.isServiceAccount())
+ throw new DisabledAccountException("Service account not allowed to login");
if (user.getPassword() == null) {
var authenticator = settingManager.getAuthenticator();
if (authenticator != null) {