The Unified and Autonomous Development Platform
fix: Unable to pull docker image anonymously even if permission allows (OD-1970)
Robin Shen8ef4776919c1
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.javaindex 1a85f1b7a2..ade68b8295 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerAuthenticationFilter.java@@ -69,12 +69,10 @@ public class ContainerAuthenticationFilter extends ExceptionHandleFilter {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, " "));diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.javaindex e38cfa7bd2..85c445fb68 100644--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerServlet.java@@ -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;@@ -69,11 +67,10 @@ public class ContainerServlet extends HttpServlet {@Injectpublic 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;