The Unified and Autonomous Development Platform
Do not allow secrets to be accessed by pull requests originating from other projects.
Robin Shen85cb37836540
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 37e5610f9c..3641410a75 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -284,7 +284,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthrow new OneException("Unable to access dependency project '"+ dependency.getProjectName() + "': user not found");}- String password = project.getBuildSetting().getSecretValue(project, dependency.getAuthentication().getPasswordSecret(), commitId);+ String password = build.getSecretValue(dependency.getAuthentication().getPasswordSecret());if (!passwordService.passwordsMatch(password, user.getPassword())) {throw new OneException("Unable to access dependency project '"+ dependency.getProjectName() + "': password incorrect");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 b2408048c6..272e245b8f 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@@ -50,6 +50,7 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.VariableInterpolator;@@ -72,6 +73,7 @@ import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;@@ -643,7 +645,7 @@ public class Build extends AbstractEntity implements Referenceable {public Collection<String> getSecretValuesToMask() {Collection<String> secretValuesToMask = new HashSet<>();for (JobSecret secret: getProject().getBuildSetting().getJobSecrets()) {- if (secret.isAuthorized(getProject(), getCommitId()))+ if (isOnBranches(secret.getAuthorizedBranches()))secretValuesToMask.add(secret.getValue());}@@ -683,10 +685,19 @@ public class Build extends AbstractEntity implements Referenceable {}public String getSecretValue(String secretName) {- if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX))+ if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());- else- return project.getBuildSetting().getSecretValue(project, secretName, ObjectId.fromString(getCommitHash()));+ } else {+ for (JobSecret secret: getProject().getBuildSetting().getJobSecrets()) {+ if (secret.getName().equals(secretName)) {+ if (isOnBranches(secret.getAuthorizedBranches()))+ return secret.getValue();+ else+ throw new OneException("Job secret not authorized: " + secretName);+ }+ }+ throw new OneException("No job secret found: " + secretName);+ }}public BuildSpec getSpec() {@@ -938,5 +949,25 @@ public class Build extends AbstractEntity implements Referenceable {return null;}}++ public boolean isOnBranches(@Nullable String branches) {+ if (branches == null)+ branches = "**";+ if (project.isCommitOnBranches(getCommitId(), branches)) {+ return true;+ } else {+ PatternSet patternSet = PatternSet.parse(branches);+ PathMatcher matcher = new PathMatcher();+ for (PullRequestVerification verification: getVerifications()) {+ PullRequest request = verification.getRequest();+ if (project.equals(request.getSourceProject())+ && patternSet.matches(matcher, request.getTargetBranch())+ && patternSet.matches(matcher, request.getSourceBranch())) {+ return true;+ }+ }+ return false;+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 2e8ee9a991..7e30f02530 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;@@ -12,8 +11,6 @@ import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.LinearRange;import io.onedev.server.model.Project;-import io.onedev.server.util.match.PathMatcher;-import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.validation.annotation.SecretName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -97,13 +94,4 @@ public class JobSecret implements Serializable {return new ArrayList<>();}- public boolean isAuthorized(Project project, ObjectId commitId) {- return authorizedBranches == null || project.isCommitOnBranches(commitId, authorizedBranches);- }-- public boolean isAuthorized(Project project, String branch) {- return authorizedBranches == null- || PatternSet.parse(authorizedBranches).matches(new PathMatcher(), branch);- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex bc350e584f..e23ee8eb85 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -6,14 +6,10 @@ import java.util.List;import javax.annotation.Nullable;-import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;-import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;import io.onedev.server.web.editable.annotation.Editable;@@ -98,18 +94,6 @@ public class ProjectBuildSetting implements Serializable {return null;}- public String getSecretValue(Project project, String secretName, ObjectId commitId) {- for (JobSecret secret: getJobSecrets()) {- if (secret.getName().equals(secretName)) {- if (secret.isAuthorized(project, commitId))- return secret.getValue();- else- throw new OneException("Job secret not authorized: " + secretName);- }- }- throw new OneException("No job secret found: " + secretName);- }-public boolean isActionAuthorized(Build build, PostBuildAction action) {List<ActionAuthorization> authorizations = getActionAuthorizations();if (!authorizations.isEmpty()) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.javaindex 1cbc2ad646..5dcb398a42 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java@@ -43,7 +43,7 @@ public abstract class ActionAuthorization implements Serializable {}public boolean isAuthorized(Build build, PostBuildAction postBuildAction) {- return matches(postBuildAction) && (authorizedBranches == null || build.getProject().isCommitOnBranches(build.getCommitId(), authorizedBranches));+ return matches(postBuildAction) && build.isOnBranches(getAuthorizedBranches());}protected abstract boolean matches(PostBuildAction postBuildAction);