The Unified and Autonomous Development Platform
fix: Secret may be written to server/agent log with debug logging (OD-2391)
Robin Shened20316366a3
diff --git a/pom.xml b/pom.xmlindex 8dc3dbd805..5e324cdcf4 100644--- a/pom.xml+++ b/pom.xml@@ -636,8 +636,8 @@</repository></repositories><properties>- <commons.version>3.0.8</commons.version>- <agent.version>2.2.8</agent.version>+ <commons.version>3.0.9</commons.version>+ <agent.version>2.2.9</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>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 c42d2abd1f..a36ea67b95 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@@ -1,9 +1,31 @@package io.onedev.server.buildspec.step;+import static com.google.common.collect.Maps.difference;+import static io.onedev.server.git.GitUtils.getReachableCommits;+import static java.util.stream.Collectors.toList;+import static org.eclipse.jgit.lib.Constants.R_HEADS;++import java.io.File;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.atomic.AtomicReference;++import javax.annotation.Nullable;+import javax.validation.constraints.NotEmpty;++import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.Repository;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Splitter;import com.google.common.collect.MapDifference;import com.google.common.collect.MapDifference.ValueDifference;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;@@ -11,6 +33,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.k8shelper.ServerStepResult;import io.onedev.server.OneDev;import io.onedev.server.annotation.ChoiceProvider;@@ -30,25 +53,6 @@ import io.onedev.server.git.command.LfsFetchCommand;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.SecurityUtils;-import io.onedev.commons.utils.match.WildcardUtils;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.ObjectId;-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.HashMap;-import java.util.List;-import java.util.Map;-import java.util.concurrent.atomic.AtomicReference;--import static com.google.common.collect.Maps.difference;-import static io.onedev.server.git.GitUtils.getReachableCommits;-import static java.util.stream.Collectors.toList;-import static org.eclipse.jgit.lib.Constants.R_HEADS;@Editable(order=1070, name="Pull from Remote", group=StepGroup.REPOSITORY_SYNC, description=""+ "This step pulls specified refs from remote. For security reason, it is only allowed "@@ -154,7 +158,7 @@ public class PullRepository extends SyncRepository {String remoteUrl = getRemoteUrlWithCredential(build);Long targetProjectId = targetProject.getId();- var task = new PullTask(targetProjectId, remoteUrl, getCertificate(), getRefs(), isForce(), isWithLfs(), getProxy());+ var task = new PullTask(targetProjectId, remoteUrl, getCertificate(), getRefs(), isForce(), isWithLfs(), getProxy(), build.getSecretMasker());getProjectManager().runOnActiveServer(targetProjectId, task);return new ServerStepResult(true);});@@ -179,9 +183,12 @@ public class PullRepository extends SyncRepository {private final boolean withLfs;private final String proxy;++ private final SecretMasker secretMasker;PullTask(Long projectId, String remoteUrl, @Nullable String certificate,- String refs, boolean force, boolean withLfs, @Nullable String proxy) {+ String refs, boolean force, boolean withLfs, @Nullable String proxy,+ SecretMasker secretMasker) {this.projectId = projectId;this.remoteUrl = remoteUrl;this.certificate = certificate;@@ -189,6 +196,7 @@ public class PullRepository extends SyncRepository {this.force = force;this.withLfs = withLfs;this.proxy = proxy;+ this.secretMasker = secretMasker;}private Map<String, ObjectId> getBranchCommits(Repository repository) {@@ -210,6 +218,7 @@ public class PullRepository extends SyncRepository {@Overridepublic Void call() throws Exception {var certificateFile = writeCertificate(certificate);+ SecretMasker.push(secretMasker);try {Repository repository = getProjectManager().getRepository(projectId);@@ -363,6 +372,7 @@ public class PullRepository extends SyncRepository {return null;} finally {+ SecretMasker.pop();if (certificateFile != null)FileUtils.deleteFile(certificateFile);}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 b882423214..7ee3ed1aea 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@@ -1,5 +1,14 @@package io.onedev.server.buildspec.step;+import java.io.ByteArrayInputStream;+import java.io.File;+import java.nio.charset.StandardCharsets;+import java.util.concurrent.atomic.AtomicReference;++import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.Repository;++import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;@@ -13,13 +22,6 @@ import io.onedev.server.git.CommandUtils;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Repository;--import java.io.ByteArrayInputStream;-import java.io.File;-import java.nio.charset.StandardCharsets;-import java.util.concurrent.atomic.AtomicReference;@Editable(order=1080, name="Push to Remote", group=StepGroup.REPOSITORY_SYNC,description="This step pushes current commit to same ref on remote")@@ -30,9 +32,10 @@ public class PushRepository extends SyncRepository {@Overridepublic ServerStepResult run(Long buildId, File inputDir, TaskLogger logger) {return OneDev.getInstance(SessionManager.class).call(() -> {+ var build = OneDev.getInstance(BuildManager.class).load(buildId);var certificateFile = writeCertificate(getCertificate());+ SecretMasker.push(build.getSecretMasker());try {- var build = OneDev.getInstance(BuildManager.class).load(buildId);if (OneDev.getInstance(ProjectManager.class).hasLfsObjects(build.getProject().getId())) {Project project = build.getProject();Commandline git = CommandUtils.newGit();@@ -163,6 +166,7 @@ public class PushRepository extends SyncRepository {}).checkReturnCode();} finally {+ SecretMasker.pop();if (certificateFile != null)FileUtils.deleteFile(certificateFile);}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 947d62b9d4..dfddf68ba2 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,7 +1,7 @@package io.onedev.server.git;import io.onedev.agent.Agent;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;@@ -48,7 +48,7 @@ public class CommandUtils {File homeDir = FileUtils.createTempDir("githome");ClusterManager clusterManager = OneDev.getInstance(ClusterManager.class);- SensitiveMasker.push(text -> StringUtils.replace(text, clusterManager.getCredential(), "******"));+ SecretMasker.push(text -> StringUtils.replace(text, clusterManager.getCredential(), "******"));try {Commandline git = newGit();git.environments().put("HOME", homeDir.getAbsolutePath());@@ -77,7 +77,7 @@ public class CommandUtils {} catch (IOException e) {throw new RuntimeException(e);} finally {- SensitiveMasker.pop();+ SecretMasker.pop();FileUtils.deleteDir(homeDir);}}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex bf3a0899fb..01a5a04e80 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -160,7 +160,7 @@ public class GitFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.load(projectId);- if (!SecurityUtils.canAccessProject(project))+ if (!canAccessProject(request, project))reportProjectNotFoundOrInaccessible(projectPath);if (upload) {checkPullPermission(request, project);@@ -276,6 +276,18 @@ public class GitFilter implements Filter {throw new UnauthorizedException("You do not have permission to pull from this project.");}}++ private boolean canAccessProject(HttpServletRequest request, Project project) {+ if (!SecurityUtils.canAccessProject(project)) {+ for (CodePullAuthorizationSource source: codePullAuthorizationSources) {+ if (source.canPullCode(request, project))+ return true;+ }+ return false;+ } else {+ return true;+ }+ }protected void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {boolean clusterAccess = SecurityUtils.isSystem();@@ -294,7 +306,7 @@ public class GitFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.load(projectId);- if (!SecurityUtils.canAccessProject(project))+ if (!canAccessProject(request, project))reportProjectNotFoundOrInaccessible(projectPath);if (upload) {checkPullPermission(request, project);diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.javaindex c943de05dc..4bf21cc5a9 100644--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java@@ -133,6 +133,18 @@ public class GitLfsFilter implements Filter {}}+ private boolean canAccessProject(HttpServletRequest request, Project project) {+ if (!SecurityUtils.canAccessProject(project)) {+ for (CodePullAuthorizationSource source: codePullAuthorizationSources) {+ if (source.canPullCode(request, project))+ return true;+ }+ return false;+ } else {+ return true;+ }+ }+private String getObjectUrl(HttpServletRequest request, String projectPath, String objectId) {var serverUrl = settingManager.getSystemSetting().getServerUrl();return String.format("%s/%s.git/lfs/objects/%s?lfs-objects=true",@@ -177,7 +189,7 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(projectPath);- if (project == null || !SecurityUtils.canAccessProject(project))+ if (project == null || !canAccessProject(httpRequest, project))reportProjectNotFoundOrInaccessible(httpResponse, projectPath);else if (canReadCode(httpRequest, project))lfsObject = new LfsObject(project.getId(), objectId);@@ -228,7 +240,7 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(getProjectPath(pathInfo));- if (project == null || !SecurityUtils.canAccessProject(project))+ if (project == null || !canAccessProject(httpRequest, project))reportProjectNotFoundOrInaccessible(httpResponse, projectPath);else if (SecurityUtils.canWriteCode(project))lfsObject = new LfsObject(project.getId(), objectId);@@ -318,7 +330,7 @@ public class GitLfsFilter implements Filter {sessionManager.openSession();try {Project project = projectManager.findByPath(projectPath);- if (project == null || !SecurityUtils.canAccessProject(project)) {+ if (project == null || !canAccessProject(httpRequest, project)) {reportProjectNotFoundOrInaccessible(httpResponse, projectPath);} else {httpResponse.setContentType(CONTENT_TYPE);diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 3d4c131bbc..b77aa6487e 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -1,12 +1,87 @@package io.onedev.server.job;+import static com.google.common.base.Preconditions.checkNotNull;+import static io.onedev.commons.utils.ExceptionUtils.find;+import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;+import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;+import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;+import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;+import static org.eclipse.jgit.lib.Constants.R_HEADS;++import java.io.File;+import java.io.IOException;+import java.io.InputStream;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.nio.file.Paths;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Objects;+import java.util.Optional;+import java.util.UUID;+import java.util.concurrent.CancellationException;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.ExecutionException;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Future;+import java.util.concurrent.TimeUnit;+import java.util.concurrent.TimeoutException;+import java.util.concurrent.atomic.AtomicReference;+import java.util.concurrent.locks.Lock;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import javax.servlet.http.HttpServletRequest;+import javax.validation.ConstraintViolation;+import javax.validation.ValidationException;+import javax.validation.Validator;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.HttpHeaders;+import javax.ws.rs.core.Response;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.shiro.subject.Subject;+import org.eclipse.jgit.lib.ObjectId;+import org.joda.time.DateTime;+import org.quartz.CronExpression;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.quartz.SimpleScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Throwables;import com.google.common.collect.Lists;-import com.google.common.collect.Sets;import com.hazelcast.map.IMap;+import io.onedev.commons.loader.ManagedSerializedForm;-import io.onedev.commons.utils.*;-import io.onedev.k8shelper.*;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.TarUtils;+import io.onedev.commons.utils.TaskLogger;+import io.onedev.k8shelper.Action;+import io.onedev.k8shelper.CheckoutFacade;+import io.onedev.k8shelper.CompositeFacade;+import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.k8shelper.LeafFacade;+import io.onedev.k8shelper.LeafVisitor;+import io.onedev.k8shelper.ServerSideFacade;+import io.onedev.k8shelper.ServerStepResult;+import io.onedev.k8shelper.ServiceFacade;import io.onedev.server.OneDev;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;@@ -29,14 +104,25 @@ import io.onedev.server.buildspec.step.ServerSideStep;import io.onedev.server.buildspec.step.Step;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.AccessTokenManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.Listen;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.event.project.ScheduledTimeReaches;-import io.onedev.server.event.project.build.*;+import io.onedev.server.event.project.build.BuildFinished;+import io.onedev.server.event.project.build.BuildPending;+import io.onedev.server.event.project.build.BuildRetrying;+import io.onedev.server.event.project.build.BuildSubmitted;+import io.onedev.server.event.project.build.BuildUpdated;import io.onedev.server.event.project.pullrequest.PullRequestEvent;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStarting;@@ -48,8 +134,14 @@ import io.onedev.server.job.log.LogManager;import io.onedev.server.job.log.ServerJobLogger;import io.onedev.server.job.match.JobMatch;import io.onedev.server.job.match.JobMatchContext;-import io.onedev.server.model.*;+import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;@@ -73,45 +165,6 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.EditableStringTransformer;import io.onedev.server.web.editable.EditableUtils;import nl.altindag.ssl.SSLFactory;-import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.subject.Subject;-import org.eclipse.jgit.lib.ObjectId;-import org.joda.time.DateTime;-import org.quartz.CronExpression;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.quartz.SimpleScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.http.HttpServletRequest;-import javax.validation.ConstraintViolation;-import javax.validation.ValidationException;-import javax.validation.Validator;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;-import java.io.*;-import java.nio.file.Paths;-import java.util.*;-import java.util.concurrent.*;-import java.util.concurrent.atomic.AtomicReference;-import java.util.concurrent.locks.Lock;--import static com.google.common.base.Preconditions.checkNotNull;-import static io.onedev.commons.utils.ExceptionUtils.find;-import static io.onedev.k8shelper.KubernetesHelper.BUILD_VERSION;-import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;-import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;-import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;-import static org.eclipse.jgit.lib.Constants.R_HEADS;@Singletonpublic class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource, Serializable {@@ -520,8 +573,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizString jobToken = build.getJobToken();VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());- Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken, clusterManager.getCredential());- TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);+ TaskLogger jobLogger = logManager.newLogger(build);String jobExecutorName = interpolator.interpolate(build.getJob().getJobExecutor());JobExecutor jobExecutor = interpolator.interpolateProperties(getJobExecutor(build, jobExecutorName, jobLogger));String sequentialGroup = interpolator.interpolate(build.getJob().getSequentialGroup());@@ -568,7 +620,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizJobContext jobContext = new JobContext(jobToken, jobExecutor, projectId, projectPath,projectGitDir, buildId, buildNumber, buildSequence, actions, refName, commitId,- services, timeout);+ services, timeout, build.getSecretMasker());return executorService.submit(() -> {int retried = 0;diff --git a/server-core/src/main/java/io/onedev/server/job/JobContext.java b/server-core/src/main/java/io/onedev/server/job/JobContext.javaindex df0e750ffc..7e5e6d1cdb 100644--- a/server-core/src/main/java/io/onedev/server/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/job/JobContext.java@@ -1,5 +1,11 @@package io.onedev.server.job;+import java.io.Serializable;+import java.util.List;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.k8shelper.Action;import io.onedev.k8shelper.LeafFacade;import io.onedev.k8shelper.ServiceFacade;@@ -7,10 +13,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;-import org.eclipse.jgit.lib.ObjectId;--import java.io.Serializable;-import java.util.List;public class JobContext implements Serializable {@@ -42,10 +44,12 @@ public class JobContext implements Serializable {private final long timeout;+ private final SecretMasker secretMasker;+public JobContext(String jobToken, JobExecutor jobExecutor, Long projectId, String projectPath,String projectGitDir, Long buildId, Long buildNumber, Long submitSequence,List<Action> actions, String refName, ObjectId commitId, List<ServiceFacade> services,- long timeout) {+ long timeout, SecretMasker secretMasker) {this.jobToken = jobToken;this.jobExecutor = jobExecutor;this.projectId = projectId;@@ -59,6 +63,7 @@ public class JobContext implements Serializable {this.commitId = commitId;this.services = services;this.timeout = timeout;+ this.secretMasker = secretMasker;}public String getJobToken() {@@ -122,5 +127,9 @@ public class JobContext implements Serializable {return project.isCommitOnBranch(commitId, project.getDefaultBranch())&& project.isSelfOrAncestorOf(targetProject);}++ public SecretMasker getSecretMasker() {+ return secretMasker;+ }}diff --git a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.javaindex 67a85f52e5..4c83568baf 100644--- a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java+++ b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java@@ -1,6 +1,48 @@package io.onedev.server.job.log;+import static io.onedev.commons.utils.LockUtils.getReadWriteLock;+import static io.onedev.commons.utils.LockUtils.read;+import static io.onedev.commons.utils.LockUtils.write;+import static io.onedev.server.model.Build.getLogLockName;+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;++import java.io.BufferedInputStream;+import java.io.BufferedOutputStream;+import java.io.EOFException;+import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.ObjectInputStream;+import java.io.ObjectOutputStream;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.locks.Lock;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;+import java.util.regex.Pattern;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.antlr.v4.runtime.tree.TerminalNode;+import org.apache.commons.lang3.StringUtils;+import org.joda.time.DateTime;+import org.joda.time.format.DateTimeFormat;+import org.joda.time.format.DateTimeFormatter;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Splitter;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.TaskLogger;@@ -22,28 +64,6 @@ import io.onedev.server.model.Project;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.web.websocket.WebSocketManager;-import org.antlr.v4.runtime.tree.TerminalNode;-import org.apache.commons.lang3.StringUtils;-import org.joda.time.DateTime;-import org.joda.time.format.DateTimeFormat;-import org.joda.time.format.DateTimeFormatter;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.io.*;-import java.nio.charset.StandardCharsets;-import java.util.*;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.locks.Lock;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;-import java.util.regex.Pattern;--import static io.onedev.commons.utils.LockUtils.*;-import static io.onedev.server.model.Build.getLogLockName;-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;@Singletonpublic class DefaultLogManager implements LogManager, Serializable {@@ -90,12 +110,7 @@ public class DefaultLogManager implements LogManager, Serializable {public Object writeReplace() throws ObjectStreamException {return new ManagedSerializedForm(LogManager.class);}-- @Override- public TaskLogger newLogger(Build build) {- return newLogger(build, new ArrayList<>());- }-+private void notifyListeners(Long buildId) {clusterManager.submitToAllServers(() -> {var lock = logListenersLock.readLock();@@ -111,19 +126,18 @@ public class DefaultLogManager implements LogManager, Serializable {}@Override- public TaskLogger newLogger(Build build, Collection<String> jobSecretsToMask) {+ public TaskLogger newLogger(Build build) {Long projectId = build.getProject().getId();Long buildId = build.getId();Long buildNumber = build.getNumber();- Collection<String> secretValuesToMask = build.getSecretValuesToMask();- secretValuesToMask.addAll(jobSecretsToMask);+ Collection<String> secretsToMask = build.getMaskSecrets();return new TaskLogger() {private final Map<String, StyleBuilder> styleBuilders = new ConcurrentHashMap<>();private void doLog(String message, StyleBuilder styleBuilder) {message = Project.decodeFullRepoNameAsPath(message);- for (String maskSecret: secretValuesToMask)+ for (String maskSecret: secretsToMask)message = StringUtils.replace(message, maskSecret, SecretInput.MASK);String maskedMessage = message;diff --git a/server-core/src/main/java/io/onedev/server/job/log/LogManager.java b/server-core/src/main/java/io/onedev/server/job/log/LogManager.javaindex fcbcbda0a0..8571ed675c 100644--- a/server-core/src/main/java/io/onedev/server/job/log/LogManager.java+++ b/server-core/src/main/java/io/onedev/server/job/log/LogManager.java@@ -1,7 +1,6 @@package io.onedev.server.job.log;import java.io.InputStream;-import java.util.Collection;import java.util.List;import java.util.regex.Pattern;@@ -12,9 +11,7 @@ import io.onedev.server.buildspec.job.log.JobLogEntryEx;import io.onedev.server.model.Build;public interface LogManager {-- TaskLogger newLogger(Build build, Collection<String> jobSecrets);-+TaskLogger newLogger(Build build);/**diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex ee96c52765..1adbbf0823 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -65,6 +65,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;@@ -77,6 +78,7 @@ import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspecmodel.inputspec.SecretInput;+import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.AccessTokenManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entityreference.BuildReference;@@ -909,21 +911,28 @@ public class Build extends ProjectBelongingpublic JobAuthorizationContext getJobSecretAuthorizationContext() {return getJobAuthorizationContext();}++ public SecretMasker getSecretMasker() {+ return SecretMasker.create(getMaskSecrets(), SecretInput.MASK);+ }- public Collection<String> getSecretValuesToMask() {- Collection<String> secretValuesToMask = new HashSet<>();+ public Collection<String> getMaskSecrets() {+ Collection<String> maskSecrets = new HashSet<>();+ maskSecrets.add(getJobToken());+ maskSecrets.add(OneDev.getInstance(ClusterManager.class).getCredential());+for (JobSecret secret: getProject().getHierarchyJobSecrets())- secretValuesToMask.add(secret.getValue());+ maskSecrets.add(secret.getValue());for (BuildParam param: getParams()) {if (param.getType().equals(ParamSpec.SECRET) && param.getValue() != null) {if (param.getValue().startsWith(SecretInput.LITERAL_VALUE_PREFIX))- secretValuesToMask.add(param.getValue().substring(SecretInput.LITERAL_VALUE_PREFIX.length()));+ maskSecrets.add(param.getValue().substring(SecretInput.LITERAL_VALUE_PREFIX.length()));}}- secretValuesToMask.removeIf(s -> s.length() < SecretInput.MASK.length());- return secretValuesToMask;+ maskSecrets.removeIf(s -> s.length() < SecretInput.MASK.length());+ return maskSecrets;}@Nullablediff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex ddc023abcc..ee92aaa7bc 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -108,7 +108,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions(),jobContext.getServices(), registryLogins, isMountDockerSock(), getDockerSockPath(),getDockerBuilder(), getCpuLimit(), getMemoryLimit(), getRunOptions(),- getNetworkOptions(), isAlwaysPullImage());+ getNetworkOptions(), isAlwaysPullImage(), jobContext.getSecretMasker());try {return call(agentSession, jobData, jobContext.getTimeout()*1000L);diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex d0a9739db3..0e461dac7f 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -98,7 +98,8 @@ public class RemoteShellExecutor extends ServerShellExecutor {String jobToken = jobContext.getJobToken();ShellJobData jobData = new ShellJobData(jobToken, getName(), jobContext.getProjectPath(),jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),- jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions());+ jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions(),+ jobContext.getSecretMasker());try {return call(agentSession, jobData, jobContext.getTimeout()*1000L);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.javaindex 1c21aa4002..642ee91523 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@@ -45,6 +45,7 @@ import com.google.common.base.Preconditions;import io.onedev.agent.DockerExecutorUtils;import io.onedev.agent.ExecutorUtils;import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;@@ -311,7 +312,8 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwhostBuildHome = new File(Bootstrap.getTempDir(),"onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence());- FileUtils.createDir(hostBuildHome);+ FileUtils.createDir(hostBuildHome);+ SecretMasker.push(jobContext.getSecretMasker());try {String network = getName() + "-" + jobContext.getProjectId() + "-"+ jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence();@@ -608,6 +610,7 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwdeleteNetwork(newDocker(), network, jobLogger);}} finally {+ SecretMasker.pop();synchronized (hostBuildHome) {deleteDir(hostBuildHome, newDocker(), Bootstrap.isInDocker());}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.javaindex d6d5e175dc..9aa74ae228 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@@ -1,13 +1,47 @@package io.onedev.server.plugin.executor.servershell;+import static io.onedev.agent.ExecutorUtils.newInfoLogger;+import static io.onedev.agent.ExecutorUtils.newWarningLogger;+import static io.onedev.agent.ShellExecutorUtils.testCommands;+import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;+import static io.onedev.k8shelper.KubernetesHelper.installGitCert;+import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;+import static io.onedev.k8shelper.KubernetesHelper.stringifyStepPosition;++import java.io.File;+import java.io.IOException;+import java.io.Serializable;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.validation.constraints.NotEmpty;++import org.apache.commons.lang.SystemUtils;+import io.onedev.agent.ExecutorUtils;import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;-import io.onedev.k8shelper.*;+import io.onedev.k8shelper.BuildImageFacade;+import io.onedev.k8shelper.CheckoutFacade;+import io.onedev.k8shelper.CloneInfo;+import io.onedev.k8shelper.CommandFacade;+import io.onedev.k8shelper.CompositeFacade;+import io.onedev.k8shelper.LeafFacade;+import io.onedev.k8shelper.LeafHandler;+import io.onedev.k8shelper.PruneBuilderCacheFacade;+import io.onedev.k8shelper.RunContainerFacade;+import io.onedev.k8shelper.RunImagetoolsFacade;+import io.onedev.k8shelper.ServerSideFacade;+import io.onedev.k8shelper.ServerStepResult;+import io.onedev.k8shelper.SetupCacheFacade;import io.onedev.server.OneDev;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;@@ -16,29 +50,17 @@ import io.onedev.server.annotation.OmitName;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.git.location.GitLocation;-import io.onedev.server.job.*;+import io.onedev.server.job.JobContext;+import io.onedev.server.job.JobManager;+import io.onedev.server.job.JobRunnable;+import io.onedev.server.job.ResourceAllocator;+import io.onedev.server.job.ServerCacheHelper;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.plugin.executor.servershell.ServerShellExecutor.TestData;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;import io.onedev.server.web.util.Testable;-import org.apache.commons.lang.SystemUtils;--import javax.validation.constraints.NotEmpty;-import java.io.File;-import java.io.IOException;-import java.io.Serializable;-import java.nio.charset.StandardCharsets;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import static io.onedev.agent.ExecutorUtils.newInfoLogger;-import static io.onedev.agent.ExecutorUtils.newWarningLogger;-import static io.onedev.agent.ShellExecutorUtils.testCommands;-import static io.onedev.k8shelper.KubernetesHelper.*;@Editable(order=ServerShellExecutor.ORDER, name="Server Shell Executor", description="" +"This executor runs build jobs with OneDev server's shell facility.<br>" +@@ -101,6 +123,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat"onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence());FileUtils.createDir(buildHome);File workspaceDir = new File(buildHome, "workspace");+ SecretMasker.push(jobContext.getSecretMasker());try {String localServer = getClusterManager().getLocalServerAddress();jobLogger.log(String.format("Executing job (executor: %s, server: %s)...",@@ -241,6 +264,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatreturn successful;} finally {+ SecretMasker.pop();// Fix https://code.onedev.io/onedev/server/~issues/597if (SystemUtils.IS_OS_WINDOWS && workspaceDir.exists())FileUtils.deleteDir(workspaceDir);diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.javaindex 3c77277f40..96aefc4854 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java@@ -1,7 +1,7 @@package io.onedev.server.plugin.imports.bitbucketcloud;import com.fasterxml.jackson.databind.JsonNode;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -223,7 +223,7 @@ public class ImportServer implements Serializable, Validatable {URIBuilder builder = new URIBuilder(cloneUrl);builder.setUserInfo(getUserName(), getAppPassword());- SensitiveMasker.push(text -> StringUtils.replace(text, getAppPassword(), "******"));+ SecretMasker.push(text -> StringUtils.replace(text, getAppPassword(), "******"));try {if (dryRun) {new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();@@ -233,7 +233,7 @@ public class ImportServer implements Serializable, Validatable {projectManager.clone(project, builder.build().toString());}} finally {- SensitiveMasker.pop();+ SecretMasker.pop();}} else {logger.warning("Skipping code clone as the project already has code");diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex a0eb2f5d89..47c4b4faa3 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -40,7 +40,7 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -539,7 +539,7 @@ public class ImportServer implements Serializable, Validatable {URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());builder.setUserInfo("git", getAccessToken());- SensitiveMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));+ SecretMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));try {if (dryRun) {new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();@@ -549,7 +549,7 @@ public class ImportServer implements Serializable, Validatable {projectManager.clone(project, builder.build().toString());}} finally {- SensitiveMasker.pop();+ SecretMasker.pop();}} else {logger.warning("Skipping code clone as the project already has code");diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex 65b9706b20..a6bf5b16a1 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -37,7 +37,7 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -587,7 +587,7 @@ public class ImportServer implements Serializable, Validatable {URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());builder.setUserInfo("git", getAccessToken());- SensitiveMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));+ SecretMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));try {if (dryRun) {new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();@@ -597,7 +597,7 @@ public class ImportServer implements Serializable, Validatable {projectManager.clone(project, builder.build().toString());}} finally {- SensitiveMasker.pop();+ SecretMasker.pop();}} else {logger.warning("Skipping code clone as the project already has code");diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex bb590bb735..fbeaf9cd1f 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -40,7 +40,7 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.JsonNode;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -318,7 +318,7 @@ public class ImportServer implements Serializable, Validatable {URIBuilder builder = new URIBuilder(projectNode.get("http_url_to_repo").asText());builder.setUserInfo("git", getAccessToken());- SensitiveMasker.push(new SensitiveMasker() {+ SecretMasker.push(new SecretMasker() {@Overridepublic String mask(String text) {@@ -335,7 +335,7 @@ public class ImportServer implements Serializable, Validatable {projectManager.clone(project, builder.build().toString());}} finally {- SensitiveMasker.pop();+ SecretMasker.pop();}} else {logger.warning("Skipping code clone as the project already has code");diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.javaindex 16469a14d1..db2a9a0936 100644--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.imports.url;-import io.onedev.commons.bootstrap.SensitiveMasker;+import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -113,7 +113,7 @@ public class ImportServer implements Serializable, Validatable {if (authentication != null)builder.setUserInfo(authentication.getUserName(), authentication.getPassword());- SensitiveMasker.push(text -> {+ SecretMasker.push(text -> {if (authentication != null)return StringUtils.replace(text, authentication.getPassword(), "******");else@@ -129,7 +129,7 @@ public class ImportServer implements Serializable, Validatable {getProjectManager().clone(project, builder.build().toString());}} finally {- SensitiveMasker.pop();+ SecretMasker.pop();}return new TaskResult(true, new PlainMessage("project imported successfully"));} else {