Skip to content

The Unified and Autonomous Development Platform

Fix issue #354 - OneDev is unable to authenticate with other repository providers if checkout step is used

Robin Shen9fff7648ef9a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 5c595789a7..ef06159d62 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -32,6 +32,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.k8shelper.CloneInfo;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.BuildSpecAware;
@@ -443,9 +444,11 @@ public class Job implements NamedElement, Serializable, Validatable {
@Nullable
public static String getToken(HttpServletRequest request) {
- String bearer = request.getHeader(HttpHeaders.AUTHORIZATION);
- if (bearer != null && bearer.startsWith(KubernetesHelper.BEARER + " "))
- return bearer.substring(KubernetesHelper.BEARER.length() + 1);
+ String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
+ if (authHeader == null)
+ authHeader = request.getHeader(CloneInfo.ONEDEV_AUTHORIZATION);
+ if (authHeader != null && authHeader.startsWith(KubernetesHelper.BEARER + " "))
+ return authHeader.substring(KubernetesHelper.BEARER.length() + 1);
else
return null;
}
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.java
index 2787a16a89..8ba6865087 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
@@ -18,6 +18,7 @@ import org.apache.shiro.web.util.WebUtils;
import com.google.common.net.HttpHeaders;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.k8shelper.CloneInfo;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
@@ -39,6 +40,8 @@ public class BearerAuthenticationFilter extends PathMatchingFilter {
if (!subject.isAuthenticated()) {
HttpServletRequest httpRequest = WebUtils.toHttp(request);
String authzHeader = httpRequest.getHeader(HttpHeaders.AUTHORIZATION);
+ if (authzHeader == null)
+ authzHeader = httpRequest.getHeader(CloneInfo.ONEDEV_AUTHORIZATION);
if (authzHeader != null && authzHeader.startsWith(KubernetesHelper.BEARER + " ")) {
String tokenValue = StringUtils.substringAfter(authzHeader, " ");
User user = userManager.findByAccessToken(tokenValue);
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
index e0013cc26c..f2e8a27557 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
@@ -592,8 +592,9 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
docker.addArgs("-v", outerPath + ":/root/onedev");
}
}
-
+
docker.addArgs("-w", containerWorkspace, "--entrypoint=" + containerEntryPoint);
+
docker.addArgs(commandExecutable.getImage());
docker.addArgs(containerCommand);
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 44461e66e6..0547ee85d6 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -862,7 +862,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Map<Object, Object> stepContainerSpec = CollectionUtils.newHashMap(
"name", containerName,
"image", image);
-
+
String positionStr = stringifyPosition(position);
if (baselineOsInfo.isLinux()) {
stepContainerSpec.put("command", Lists.newArrayList("sh"));