The Unified and Autonomous Development Platform
Fix issue #1213 - Unable clone any external repos in CI
Robin Shen9029d8dc0450
diff --git a/server-core/src/main/java/io/onedev/server/git/CommandUtils.java b/server-core/src/main/java/io/onedev/server/git/CommandUtils.javaindex b3dd31fea4..edd6646b21 100644--- a/server-core/src/main/java/io/onedev/server/git/CommandUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/CommandUtils.java@@ -1,20 +1,5 @@package io.onedev.server.git;-import java.io.File;-import java.io.InputStream;-import java.io.OutputStream;-import java.nio.charset.StandardCharsets;-import java.util.Map;-import java.util.StringTokenizer;-import java.util.concurrent.atomic.AtomicBoolean;--import javax.ws.rs.core.HttpHeaders;--import org.apache.commons.lang3.SystemUtils;-import org.eclipse.jgit.util.QuotedString;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.agent.Agent;import io.onedev.commons.bootstrap.SensitiveMasker;import io.onedev.commons.utils.FileUtils;@@ -30,6 +15,18 @@ import io.onedev.server.git.command.FileChange;import io.onedev.server.git.command.ReceivePackCommand;import io.onedev.server.git.command.UploadPackCommand;import io.onedev.server.git.location.GitLocation;+import org.apache.commons.lang3.SystemUtils;+import org.eclipse.jgit.util.QuotedString;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import java.io.File;+import java.io.InputStream;+import java.io.OutputStream;+import java.nio.charset.StandardCharsets;+import java.util.Map;+import java.util.StringTokenizer;+import java.util.concurrent.atomic.AtomicBoolean;public class CommandUtils {@@ -61,7 +58,7 @@ public class CommandUtils {try {Commandline git = newGit();git.environments().put("HOME", homeDir.getAbsolutePath());- String extraHeader = HttpHeaders.AUTHORIZATION + ": "+ String extraHeader = KubernetesHelper.AUTHORIZATION + ": "+ KubernetesHelper.BEARER + " " + clusterManager.getCredentialValue();git.addArgs("config", "--global", "http.extraHeader", extraHeader);git.execute(new LineConsumer() {diff --git a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.javaindex fec9ef37ae..33b144f11d 100644--- a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java@@ -9,7 +9,9 @@ import javax.servlet.ServletRequest;import javax.servlet.ServletResponse;import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;+import javax.ws.rs.core.HttpHeaders;+import io.onedev.k8shelper.KubernetesHelper;import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.authc.UsernamePasswordToken;import org.apache.shiro.codec.Base64;@@ -17,8 +19,6 @@ import org.apache.shiro.subject.Subject;import org.apache.shiro.web.filter.PathMatchingFilter;import org.apache.shiro.web.util.WebUtils;-import com.google.common.net.HttpHeaders;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;@@ -41,7 +41,9 @@ public class BasicAuthenticationFilter extends PathMatchingFilter {Subject subject = SecurityUtils.getSubject();if (!subject.isAuthenticated()) {HttpServletRequest httpRequest = WebUtils.toHttp(request);- String authzHeader = httpRequest.getHeader(HttpHeaders.AUTHORIZATION);+ String authzHeader = httpRequest.getHeader(KubernetesHelper.AUTHORIZATION);+ if (authzHeader == null)+ authzHeader = httpRequest.getHeader(HttpHeaders.AUTHORIZATION);if (authzHeader != null && authzHeader.toLowerCase().startsWith("basic ")) {String authValue = StringUtils.substringAfter(authzHeader, " ");String decoded = Base64.decodeToString(authValue);diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex f5def8b7d3..a56305bb97 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -377,7 +377,9 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {@Nullablepublic static String getBearerToken(HttpServletRequest request) {- String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);+ String authHeader = request.getHeader(KubernetesHelper.AUTHORIZATION);+ if (authHeader == null)+ authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);if (authHeader != null && authHeader.startsWith(KubernetesHelper.BEARER + " "))return authHeader.substring(KubernetesHelper.BEARER.length() + 1);else