The Unified and Autonomous Development Platform
fix: fatal: could not read Username when Checking out code (OD-1980)
Robin Shenecf0293d1509
diff --git a/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java b/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.javaindex 6d8318ab7c..90c8c8778a 100644--- a/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/BearerAuthenticationFilter.java@@ -4,6 +4,7 @@ import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.AccessTokenManager;import io.onedev.server.entitymanager.AgentTokenManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.job.JobManager;import io.onedev.server.persistence.annotation.Sessional;import org.apache.shiro.authc.IncorrectCredentialsException;import org.apache.shiro.subject.Subject;@@ -24,13 +25,16 @@ public class BearerAuthenticationFilter extends ExceptionHandleFilter {private final AgentTokenManager agentTokenManager;+ private final JobManager jobManager;+private final ClusterManager clusterManager;@Injectpublic BearerAuthenticationFilter(AccessTokenManager accessTokenManager, AgentTokenManager agentTokenManager,- UserManager userManager, ClusterManager clusterManager) {+ JobManager jobManager, UserManager userManager, ClusterManager clusterManager) {this.accessTokenManager = accessTokenManager;this.agentTokenManager = agentTokenManager;+ this.jobManager = jobManager;this.userManager = userManager;this.clusterManager = clusterManager;}@@ -46,10 +50,12 @@ public class BearerAuthenticationFilter extends ExceptionHandleFilter {ThreadContext.bind(userManager.getSystem().asSubject());} else {var accessToken = accessTokenManager.findByValue(bearerToken);- if (accessToken != null)+ if (accessToken != null) {ThreadContext.bind(accessToken.asSubject());- else if (agentTokenManager.find(bearerToken) == null)+ } else if (agentTokenManager.find(bearerToken) == null+ && jobManager.getJobContext(bearerToken, false) == null) {throw new IncorrectCredentialsException("Invalid or expired access token");+ }}}}