Skip to content

The Unified and Autonomous Development Platform

Do not display secret parameter in build page

Robin Shen8df3a7182cec
diff --git a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
index 25d7521518..9a6e7a1c2b 100644
--- a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
+++ b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
@@ -4,6 +4,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -149,7 +150,7 @@ public class DefaultCacheManager implements CacheManager {
for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))
userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());
- query = dao.getSessionManager().getSession().createQuery("select distinct name, type, value from BuildParam");
+ query = dao.getSessionManager().getSession().createQuery("select distinct name, type, value, id from BuildParam order by id");
for (Object[] fields: (List<Object[]>)query.list()) {
if (!fields[1].equals(InputSpec.SECRET))
addBuildParam((String) fields[0], (String) fields[2]);
@@ -275,11 +276,12 @@ public class DefaultCacheManager implements CacheManager {
private void addBuildParam(String name, String value) {
Set<String> values = buildParams.get(name);
if (values == null) {
- values = new HashSet<>();
+ values = new LinkedHashSet<>();
buildParams.put(name, values);
}
- if (values.size() < MAX_PARAM_VALUES)
- values.add(value);
+ values.add(value);
+ if (values.size() > MAX_PARAM_VALUES)
+ values.iterator().remove();
}
@Transactional
diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.java
index 513078944c..3a6b61b28e 100644
--- a/core/src/main/java/io/onedev/server/model/Build.java
+++ b/core/src/main/java/io/onedev/server/model/Build.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -334,6 +335,29 @@ public class Build extends AbstractEntity implements Referenceable {
public Map<String, Input> getParamInputs() {
Map<String, Input> inputs = new LinkedHashMap<>();
+ List<BuildParam> params = new ArrayList<>(getParams());
+ Collections.sort(params, new Comparator<BuildParam>() {
+
+ @Override
+ public int compare(BuildParam o1, BuildParam o2) {
+ if (o1.getName().equals(o2.getName())) {
+ if (o1.getValue() != null) {
+ if (o2.getValue() != null)
+ return o1.getValue().compareTo(o2.getValue());
+ else
+ return -1;
+ } else {
+ if (o2.getValue() != null)
+ return 1;
+ else
+ return 0;
+ }
+ } else {
+ return o1.getName().compareTo(o2.getName());
+ }
+ }
+
+ });
for (BuildParam param: getParams()) {
Input input = inputs.get(param.getName());
if (input == null) {
diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index dafc48646d..8716edf832 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -1,8 +1,8 @@
package io.onedev.server.web.component.build.side;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nullable;
@@ -35,7 +35,10 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.Input;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.secretinput.SecretInput;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -188,8 +191,26 @@ public abstract class BuildSidePanel extends Panel {
@Override
protected List<BuildParam> load() {
- List<BuildParam> params = new ArrayList<>(getBuild().getParams());
- params.sort(Comparator.comparing(BuildParam::getName));
+ List<BuildParam> params = new ArrayList<>();
+ for (Map.Entry<String, Input> entry: getBuild().getParamInputs().entrySet()) {
+ if (entry.getValue().getValues().size() > 1) {
+ int i = 1;
+ for (String value: entry.getValue().getValues()) {
+ BuildParam param = new BuildParam();
+ param.setName(entry.getKey() + "_" + (i++));
+ param.setType(entry.getValue().getType());
+ param.setValue(value);
+ params.add(param);
+ }
+ } else {
+ BuildParam param = new BuildParam();
+ param.setName(entry.getKey());
+ param.setType(entry.getValue().getType());
+ if (entry.getValue().getValues().size() == 1)
+ param.setValue(entry.getValue().getValues().iterator().next());
+ params.add(param);
+ }
+ }
return params;
}
@@ -199,7 +220,10 @@ public abstract class BuildSidePanel extends Panel {
protected void populateItem(ListItem<BuildParam> item) {
BuildParam param = item.getModelObject();
item.add(new Label("name", param.getName()));
- item.add(new Label("value", param.getValue()));
+ if (param.getType().equals(InputSpec.SECRET))
+ item.add(new Label("value", SecretInput.MASK));
+ else
+ item.add(new Label("value", param.getValue()));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 76977c703a..c503e91489 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -227,7 +227,6 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
protected void onConfigure() {
super.onConfigure();
- property.getDescriptor().getDependencyPropertyNames().clear();
setVisible(!property.getDescriptor().isPropertyExcluded()
&& property.getDescriptor().isPropertyVisible(new OneContext(this), descriptor));
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java
index b27e4f2c0d..fc853f85d3 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java
@@ -32,7 +32,7 @@ public class DependencyListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null)
- return new DependencyListViewPanel(id, elementClass, model.getObject());
+ return new DependencyListViewPanel(id, model.getObject());
else
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java
index b5169f3176..9ece80804d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java
@@ -36,7 +36,7 @@ class DependencyListViewPanel extends Panel {
private final List<JobDependency> dependencies = new ArrayList<>();
- public DependencyListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ public DependencyListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.java
index 605e27ae8f..26e1793dcb 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.java
@@ -32,7 +32,7 @@ public class OutcomeListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new OutcomeListViewPanel(id, elementClass, model.getObject());
+ return new OutcomeListViewPanel(id, model.getObject());
} else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.java
index 6073c6f48c..5e68a9b39e 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.java
@@ -33,7 +33,7 @@ class OutcomeListViewPanel extends Panel {
private final List<JobOutcome> outcomes = new ArrayList<>();
- public OutcomeListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ public OutcomeListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java
index 056e4acbd8..495919dbe8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java
@@ -27,13 +27,13 @@ public class ParamListEditSupport implements EditSupport {
return new PropertyContext<List<Serializable>>(descriptor) {
@Override
- public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ public PropertyViewer renderForView(String componentId, IModel<List<Serializable>> model) {
return new PropertyViewer(componentId, descriptor) {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null && !model.getObject().isEmpty())
- return new ParamListViewPanel(id, elementClass, model.getObject());
+ return new ParamListViewPanel(id, model.getObject());
else
return new WebMarkupContainer(id);
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
index 9f72b7ae9b..07f053faaf 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
@@ -22,7 +22,7 @@ class ParamListViewPanel extends Panel {
private final List<JobParam> params = new ArrayList<>();
- public ParamListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ public ParamListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)
@@ -45,10 +45,12 @@ class ParamListViewPanel extends Panel {
SpecifiedValues specifiedValues = (SpecifiedValues) param.getValuesProvider();
for (List<String> value: specifiedValues.getValues()) {
WebMarkupContainer valueItem = new WebMarkupContainer(valuesView.newChildId());
- if (!value.isEmpty())
- valueItem.add(new Label("value", value.toString()));
- else
+ if (value.size() == 0)
valueItem.add(new Label("value", "<i>Empty</i>").setEscapeModelStrings(false));
+ else if (value.size() == 1)
+ valueItem.add(new Label("value", value.iterator().next()));
+ else
+ valueItem.add(new Label("value", value.toString()));
valuesView.add(valueItem);
}
fragment.add(valuesView);
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java
index 5fb56b3a7d..2cebc24869 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java
@@ -32,7 +32,7 @@ public class TriggerListEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new TriggerListViewPanel(id, elementClass, model.getObject());
+ return new TriggerListViewPanel(id, model.getObject());
} else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java
index 37bb15d87e..3bdb64c162 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java
@@ -35,7 +35,7 @@ class TriggerListViewPanel extends Panel {
private final List<JobTrigger> triggers = new ArrayList<>();
- public TriggerListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ public TriggerListViewPanel(String id, List<Serializable> elements) {
super(id);
for (Serializable each: elements)