The Unified and Autonomous Development Platform
Job spec can not use secrets defined in owner setting
Robin Shenc95ac5ea450d
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.javaindex 5240d5d5a4..f7de0d7ef1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java@@ -42,7 +42,8 @@ public class Authentication implements Serializable {@SuppressWarnings("unused")private static List<String> getPasswordSecretChoices() {- return Project.get().getBuildSetting().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());+ return Project.get().getBuildSetting().getHierarchySecrets(Project.get())+ .stream().map(it->it.getName()).collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.javaindex bdafa3f3b3..f4ec03243c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java@@ -12,7 +12,7 @@ public class SpecifiedValues implements ValuesProvider {public static final String DISPLAY_NAME = "Use specified values";- public static final String SECRET_DISPLAY_NAME = "Use specified project secrets";+ public static final String SECRET_DISPLAY_NAME = "Use specified job secrets";private List<List<String>> values = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex d729ec7af5..19d3649b25 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -547,7 +547,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsif (preservations.isEmpty()) {idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));} else {- for (BuildPreservation preservation: project.getBuildSetting().getBuildPreservations()) {+ for (BuildPreservation preservation: preservations) {try {BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);int count;diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.java b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.javaindex 9b390e0daf..6d86148e1d 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.java@@ -12,7 +12,7 @@ public class SpecifiedValue implements ValueProvider {public static final String DISPLAY_NAME = "Use specified value";- public static final String SECRET_DISPLAY_NAME = "Use specified project secret";+ public static final String SECRET_DISPLAY_NAME = "Use specified job secret";private List<String> value = new ArrayList<>();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 7736283b48..2843c62d9d 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@@ -12,6 +12,7 @@ import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -37,8 +38,6 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;@@ -48,7 +47,6 @@ 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;@@ -58,6 +56,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.model.support.JobSecret;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.BeanUtils;@@ -90,8 +89,6 @@ public class Build extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;- private static final Logger logger = LoggerFactory.getLogger(Build.class);-private static ThreadLocal<Stack<Build>> stack = new ThreadLocal<Stack<Build>>() {@Override@@ -497,17 +494,22 @@ public class Build extends AbstractEntity implements Referenceable {public Collection<String> getSecretValuesToMask() {Collection<String> secretValuesToMask = new HashSet<>();+ for (JobSecret secret: getProject().getBuildSetting().getHierarchySecrets(getProject())) {+ if (secret.isAuthorized(getProject(), getCommitId()))+ secretValuesToMask.add(secret.getValue());+ }+for (BuildParam param: getParams()) {if (param.getType().equals(ParamSpec.SECRET) && param.getValue() != null) {- try {- String value = getSecretValue(param.getValue());- if (value.length() >= SecretInput.MASK.length())- secretValuesToMask.add(value);- } catch (OneException e) {- logger.error("Error retrieving secret value", e);- }+ if (param.getValue().startsWith(SecretInput.LITERAL_VALUE_PREFIX))+ secretValuesToMask.add(param.getValue().substring(SecretInput.LITERAL_VALUE_PREFIX.length()));}}++ for (Iterator<String> it = secretValuesToMask.iterator(); it.hasNext();) {+ if (it.next().length() < SecretInput.MASK.length())+ it.remove();+ }return secretValuesToMask;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.javaindex a482ce6bfc..3f5fcf992f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java@@ -90,7 +90,11 @@ public class JobSecret implements Serializable {@SuppressWarnings("unused")private static List<InputSuggestion> suggestBranches(String matchWith) {- return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ Project project = Project.get();+ if (project != null)+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return new ArrayList<>();}public boolean isAuthorized(Project project, ObjectId commitId) {diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.javaindex 5acaf2e56a..7b42907be2 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java@@ -16,7 +16,6 @@ import javax.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.io.IOUtils;-import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;@@ -29,6 +28,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.util.ContentDetector;import io.onedev.server.util.SecurityUtils;public class ArtifactDownloadResource extends AbstractResource {@@ -94,7 +94,11 @@ public class ArtifactDownloadResource extends AbstractResource {}ResourceResponse response = new ResourceResponse();- response.setContentType(MimeTypes.OCTET_STREAM);+ try (InputStream is = new FileInputStream(artifactFile)) {+ response.setContentType(ContentDetector.detectMediaType(is, artifactPath).toString());+ } catch (Exception e) {+ throw new RuntimeException(e);+ }response.disableCaching();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 938ac6710c..86d8b408a0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -34,7 +34,7 @@ public class JobSecretEditBean implements Serializable {private static List<String> getSecretChoices() {List<String> secretNames = new ArrayList<>();ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- for (JobSecret secret: page.getProject().getBuildSetting().getSecrets()) {+ for (JobSecret secret: page.getProject().getBuildSetting().getHierarchySecrets(page.getProject())) {if (secret.isAuthorized(page.getProject(), page.getCommit()))secretNames.add(secret.getName());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.javaindex c33e7857dc..e1445e5298 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java@@ -180,7 +180,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {});container.add(valueProviderChoice);- container.add(new Label("description", property.getDescription()));+ container.add(new Label("description", property.getDescription()).setEscapeModelStrings(false));container.add(new FencedFeedbackPanel("feedback", container));container.setOutputMarkupId(true);fieldsView.add(container);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.javaindex 9b0795411a..277b7a9f3b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java@@ -182,7 +182,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {});container.add(valuesProviderChoice);- container.add(new Label("description", property.getDescription()));+ container.add(new Label("description", property.getDescription()).setEscapeModelStrings(false));container.add(new FencedFeedbackPanel("feedback", container));container.setOutputMarkupId(true);paramsView.add(container);diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 58531e2522..49b368d6ff 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -179,19 +179,6 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestJobSecrets(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- int numSuggestions = 0;- List<InputSuggestion> suggestions = new ArrayList<>();-- for (JobSecret secret: project.getBuildSetting().getSecrets()) {- int index = secret.getName().toLowerCase().indexOf(matchWith);- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)- suggestions.add(new InputSuggestion(secret.getName(), new LinearRange(index, index+matchWith.length())));- }- return suggestions;- }-public static List<InputSuggestion> suggestUsers(String matchWith) {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();