Skip to content

The Unified and Autonomous Development Platform

Refactor git ssh clone auth logic

Robin Shen6cc8a1aa8d7a
diff --git a/pom.xml b/pom.xml
index d6060f6002..bb6b7d1350 100644
--- a/pom.xml
+++ b/pom.xml
@@ -620,7 +620,7 @@
</repositories>
<properties>
<commons.version>2.7.9</commons.version>
- <agent.version>1.7.24</agent.version>
+ <agent.version>1.7.25</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index ba53dffa9a..7d86802ce4 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -34,7 +34,6 @@ import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.*;
import io.onedev.server.web.util.Testable;
import org.apache.commons.lang3.SystemUtils;
-import org.apache.tools.ant.Task;
import javax.annotation.Nullable;
import javax.validation.ConstraintValidatorContext;
@@ -435,29 +434,23 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
checkoutFacade.setupWorkingDir(git, hostWorkspace);
git.environments().put("HOME", hostAuthInfoHome.get().getAbsolutePath());
+ List<String> trustCertContent = getTrustCertContent();
+ if (!trustCertContent.isEmpty()) {
+ installGitCert(new File(hostAuthInfoHome.get(), "trust-cert.pem"), trustCertContent,
+ git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
+ }
+
CloneInfo cloneInfo = checkoutFacade.getCloneInfo();
+ cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, true,
+ ExecutorUtils.newInfoLogger(jobLogger),
+ ExecutorUtils.newWarningLogger(jobLogger));
- cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
- try {
- List<String> trustCertContent = getTrustCertContent();
- if (!trustCertContent.isEmpty()) {
- installGitCert(new File(hostAuthInfoHome.get(), "trust-cert.pem"), trustCertContent,
- git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
- }
+ int cloneDepth = checkoutFacade.getCloneDepth();
- int cloneDepth = checkoutFacade.getCloneDepth();
-
- cloneRepository(git, jobContext.getProjectGitDir(), cloneInfo.getCloneUrl(),
- jobContext.getRefName(), jobContext.getCommitId().name(),
- checkoutFacade.isWithLfs(), checkoutFacade.isWithSubmodules(),
- cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
- } finally {
- git.clearArgs();
- git.addArgs("config", "--global", "--unset", "core.sshCommand");
- ExecutionResult result = git.execute(ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
- if (result.getReturnCode() != 5 && result.getReturnCode() != 0)
- result.checkReturnCode();
- }
+ cloneRepository(git, jobContext.getProjectGitDir(), cloneInfo.getCloneUrl(),
+ jobContext.getRefName(), jobContext.getCommitId().name(),
+ checkoutFacade.isWithLfs(), checkoutFacade.isWithSubmodules(),
+ cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
} catch (Exception e) {
jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index e3f8141b3a..ab4dd7cd12 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -225,16 +225,17 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
environments.put("HOME", userDir.getAbsolutePath());
git.environments(environments);
- CloneInfo cloneInfo = checkoutFacade.getCloneInfo();
-
- cloneInfo.writeAuthData(userDir, git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
-
List<String> trustCertContent = getTrustCertContent();
if (!trustCertContent.isEmpty()) {
installGitCert(new File(userDir, "trust-cert.pem"), trustCertContent,
git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));
}
+ CloneInfo cloneInfo = checkoutFacade.getCloneInfo();
+ cloneInfo.writeAuthData(userDir, git, false,
+ ExecutorUtils.newInfoLogger(jobLogger),
+ ExecutorUtils.newWarningLogger(jobLogger));
+
int cloneDepth = checkoutFacade.getCloneDepth();
cloneRepository(git, jobContext.getProjectGitDir(), cloneInfo.getCloneUrl(), jobContext.getRefName(),