Skip to content

Commit

Permalink
fix: fatal: could not read Username when Checking out code (OD-1980)
Browse files Browse the repository at this point in the history
  • Loading branch information
robinshine committed Jul 3, 2024
1 parent 9317e31 commit ecf0293
Showing 1 changed file with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
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;
Expand All @@ -24,13 +25,16 @@ public class BearerAuthenticationFilter extends ExceptionHandleFilter {

private final AgentTokenManager agentTokenManager;

private final JobManager jobManager;

private final ClusterManager clusterManager;

@Inject
public 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;
}
Expand All @@ -46,10 +50,12 @@ protected boolean onPreHandle(ServletRequest request, ServletResponse response,
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");
}
}
}
}
Expand Down

0 comments on commit ecf0293

Please sign in to comment.