The Unified and Autonomous Development Platform
Fix issue #1331 - Able to specify proxy when using Repository Sync / Push to Remote
Robin Shen843924eff33a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex aa6b43cbe8..a835de84e8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -36,6 +36,7 @@ import org.eclipse.jgit.lib.Repository;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import javax.annotation.Nullable;import javax.validation.constraints.NotEmpty;import java.io.File;import java.util.ArrayList;@@ -146,7 +147,7 @@ public class PullRepository extends SyncRepository {String remoteUrl = getRemoteUrlWithCredential(build);Long projectId = getTargetProject(build).getId();- var task = new PullTask(projectId, remoteUrl, getRefs(), isForce(), isWithLfs());+ var task = new PullTask(projectId, remoteUrl, getRefs(), isForce(), isWithLfs(), getProxy());getProjectManager().runOnActiveServer(projectId, task);return null;@@ -181,12 +182,16 @@ public class PullRepository extends SyncRepository {private final boolean withLfs;- PullTask(Long projectId, String remoteUrl, String refs, boolean force, boolean withLfs) {+ private final String proxy;++ PullTask(Long projectId, String remoteUrl, String refs, boolean force,+ boolean withLfs, @Nullable String proxy) {this.projectId = projectId;this.remoteUrl = remoteUrl;this.refs = refs;this.force = force;this.withLfs = withLfs;+ this.proxy = proxy;}private Map<String, ObjectId> getRefCommits(Repository repository) {@@ -213,7 +218,9 @@ public class PullRepository extends SyncRepository {Map<String, ObjectId> oldCommitIds = getRefCommits(repository);Commandline git = CommandUtils.newGit();+ configureProxy(git, proxy);git.workingDir(repository.getDirectory());+git.addArgs("fetch");git.addArgs(remoteUrl);if (force)@@ -247,6 +254,7 @@ public class PullRepository extends SyncRepository {logger.debug("Determining remote head branch...");git.clearArgs();+ configureProxy(git, proxy);git.addArgs("remote", "show", remoteUrl);AtomicReference<String> headBranch = new AtomicReference<>(null);@@ -302,10 +310,16 @@ public class PullRepository extends SyncRepository {}if (withLfs) {+ git.clearArgs();+ configureProxy(git, proxy);var sinceCommitIds = getProjectManager().readLfsSinceCommits(projectId);if (sinceCommitIds.isEmpty()) {- new LfsFetchAllCommand(git.workingDir(), remoteUrl).run();+ new LfsFetchAllCommand(git.workingDir(), remoteUrl) {+ protected Commandline newGit() {+ return git;+ }+ }.run();} else {var fetchCommitIds = new ArrayList<>(getReachableCommits(repository, sinceCommitIds, newCommitIds.values()));new LfsFetchCommand(git.workingDir(), remoteUrl, fetchCommitIds) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.javaindex 44dc0eb006..74611d9ebc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java@@ -31,6 +31,7 @@ public class PushRepository extends SyncRepository {Project project = build.getProject();Commandline git = CommandUtils.newGit();git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(project.getId()));+ configureProxy(git, getProxy());String remoteUrl = getRemoteUrlWithCredential(build);AtomicReference<String> remoteCommitId = new AtomicReference<>(null);@@ -59,6 +60,7 @@ public class PushRepository extends SyncRepository {if (remoteCommitId.get() != null) {git.clearArgs();+ configureProxy(git, getProxy());git.addArgs("fetch", remoteUrl, remoteCommitId.get());git.execute(new LineConsumer() {@@ -85,6 +87,7 @@ public class PushRepository extends SyncRepository {String input = String.format("%s %s %s %s\n", build.getRefName(), build.getCommitHash(),build.getRefName(), remoteCommitId.get());git.clearArgs();+ configureProxy(git, getProxy());git.addArgs("lfs", "pre-push", remoteUrl, remoteUrl);git.execute(new LineConsumer() {@@ -104,6 +107,7 @@ public class PushRepository extends SyncRepository {}} else {git.clearArgs();+ configureProxy(git, getProxy());git.addArgs("lfs", "push", "--all", remoteUrl, build.getCommitHash());git.execute(new LineConsumer() {@@ -129,6 +133,7 @@ public class PushRepository extends SyncRepository {private void push(Build build, TaskLogger logger) {Commandline git = CommandUtils.newGit();+ configureProxy(git, getProxy());git.workingDir(OneDev.getInstance(ProjectManager.class).getGitDir(build.getProject().getId()));git.addArgs("push");if (isForce())diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.javaindex 305e0d7272..b53a533872 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java@@ -3,6 +3,7 @@ package io.onedev.server.buildspec.step;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.command.Commandline;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;@@ -11,7 +12,9 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import javax.annotation.Nullable;import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.Null;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;@@ -30,6 +33,8 @@ public abstract class SyncRepository extends ServerSideStep {private String passwordSecret;private boolean force;++ private String proxy;@Editable(order=100, name="Remote URL", description="Specify URL of remote git repository. "+ "Only http/https protocol is supported")@@ -95,6 +100,16 @@ public abstract class SyncRepository extends ServerSideStep {this.force = force;}+ @Editable(order=600, placeholder = "No proxy", description = "Optionally configure proxy for this step. Proxy " ++ "should be in the format of <proxy host>:<proxy port>")+ public String getProxy() {+ return proxy;+ }++ public void setProxy(String proxy) {+ this.proxy = proxy;+ }+public String getRemoteUrlWithCredential(Build build) {String encodedPassword = null;if (getPasswordSecret() != null) {@@ -123,4 +138,9 @@ public abstract class SyncRepository extends ServerSideStep {return remoteUrlWithCredentials;}+ protected static void configureProxy(Commandline git, @Nullable String proxy) {+ if (proxy != null)+ git.addArgs("-c", "http.proxy=" + proxy, "-c", "https.proxy=" + proxy);+ }+}