Skip to content

Commit

Permalink
fix: Unable to pull docker image anonymously even if permission allow…
Browse files Browse the repository at this point in the history
…s (OD-1970)
  • Loading branch information
robinshine committed Jun 28, 2024
1 parent dd1599c commit 8ef4776
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,10 @@ protected boolean onPreHandle(ServletRequest request, ServletResponse response,
request.setAttribute(ATTR_BUILD_ID, jobContext.getBuildId());
var bearerToken = substringAfter(authValue, ":");
var accessToken = accessTokenManager.findByValue(bearerToken);
if (accessToken != null) {
// Do not throw IncorrectCredentialException if no access token found
// as the bearer token can be a faked token for anonymous access
if (accessToken != null)
ThreadContext.bind(accessToken.asSubject());
} else {
throw new ClientException(SC_UNAUTHORIZED, ErrorCode.UNAUTHORIZED,
"Unknown user name or incorrect credentials");
}
} else {
throw new ClientException(SC_UNAUTHORIZED, ErrorCode.UNAUTHORIZED,
"Unsupported authorization: " + substringBefore(authHeader, " "));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public class ContainerServlet extends HttpServlet {

private final SessionManager sessionManager;

private final AccessTokenManager accessTokenManager;

private final ProjectManager projectManager;

private final PackBlobManager packBlobManager;
Expand All @@ -69,11 +67,10 @@ public class ContainerServlet extends HttpServlet {
@Inject
public ContainerServlet(SettingManager settingManager, BuildManager buildManager,
ObjectMapper objectMapper, SessionManager sessionManager,
AccessTokenManager accessTokenManager, ProjectManager projectManager,
PackBlobManager packBlobManager, PackManager packManager) {
ProjectManager projectManager, PackBlobManager packBlobManager,
PackManager packManager) {
this.settingManager = settingManager;
this.sessionManager = sessionManager;
this.accessTokenManager = accessTokenManager;
this.projectManager = projectManager;
this.packBlobManager = packBlobManager;
this.packManager = packManager;
Expand Down

0 comments on commit 8ef4776

Please sign in to comment.