Skip to content

The Unified and Autonomous Development Platform

chore: Secret display refactoring

Robin Shen386ac31a0556
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Secret.java b/server-core/src/main/java/io/onedev/server/annotation/Password.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/annotation/Secret.java
rename to server-core/src/main/java/io/onedev/server/annotation/Password.java
index 9f801c7669..c01d7527a2 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/Secret.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/Password.java
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-public @interface Secret {
+public @interface Password {
boolean needConfirm() default false;
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index edf1c84c1c..ad7de458c4 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -6,7 +6,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.UserName;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -512,7 +512,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
}
@Editable(order=150)
- @Secret(needConfirm=true, autoComplete="new-password")
+ @Password(needConfirm=true, autoComplete="new-password")
@NotEmpty
public String getPassword() {
return password;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java
index cfc37db72e..d54998e878 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLogin.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.agent.job.RegistryLoginFacade;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@Editable
public class RegistryLogin implements Serializable {
@@ -41,7 +41,7 @@ public class RegistryLogin implements Serializable {
@Editable(order=300)
@NotEmpty
- @Secret
+ @Password
public String getPassword() {
return password;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
index 0b73808264..002dd330dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
@@ -1,18 +1,15 @@
package io.onedev.server.web.component.user.accesstoken;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Multiline;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.ShowCondition;
import io.onedev.server.model.AccessToken;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
-import io.onedev.server.web.page.my.MyPage;
import io.onedev.server.web.util.UserAware;
import io.onedev.server.web.util.WicketUtils;
-import javax.annotation.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size;
import java.io.Serializable;
@@ -46,7 +43,7 @@ public class AccessTokenEditBean implements Serializable {
}
@Editable(order=200)
- @Secret(copyable = true)
+ @Password(copyable = true)
@NotEmpty
public String getValue() {
return value;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
index 2542e3b23e..da1b1d6f41 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.annotation.CurrentPassword;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@Editable
public class PasswordEditBean implements Serializable {
@@ -19,7 +19,7 @@ public class PasswordEditBean implements Serializable {
@Editable(order=100)
@CurrentPassword
- @Secret
+ @Password
@NotEmpty
public String getOldPassword() {
return oldPassword;
@@ -30,7 +30,7 @@ public class PasswordEditBean implements Serializable {
}
@Editable(order=200)
- @Secret(needConfirm=true)
+ @Password(needConfirm=true)
@NotEmpty
public String getNewPassword() {
return newPassword;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
index 44e4ed9be3..15799f74a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.editable.buildspec.param.instance;
import com.google.common.collect.Lists;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.annotation.ParamSpecProvider;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.VariableOption;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamUtils;
@@ -141,7 +141,7 @@ class ParamMapEditPanel extends PropertyEditor<List<Serializable>> {
container.add(new Label("required", required).setEscapeModelStrings(false));
- boolean isSecret = property.getPropertyGetter().getAnnotation(Secret.class) != null;
+ boolean isSecret = property.getPropertyGetter().getAnnotation(Password.class) != null;
List<String> choices = new ArrayList<>();
if (isSecret) {
@@ -252,7 +252,7 @@ class ParamMapEditPanel extends PropertyEditor<List<Serializable>> {
logger.error("Error setting property value", e);
}
- if (property.getPropertyGetter().getAnnotation(Secret.class) == null) {
+ if (property.getPropertyGetter().getAnnotation(Password.class) == null) {
PropertyEditor<?> propertyEditor = PropertyContext.edit(componentId, paramBean, property.getPropertyName());
if (propertyEditor instanceof StringPropertyEditor) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
index a7a1df6f97..a85db326a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.editable.buildspec.param.instance;
import com.google.common.collect.Lists;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.annotation.ParamSpecProvider;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.VariableOption;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
@@ -140,7 +140,7 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {
container.add(new Label("required", required).setEscapeModelStrings(false));
- boolean isSecret = property.getPropertyGetter().getAnnotation(Secret.class) != null;
+ boolean isSecret = property.getPropertyGetter().getAnnotation(Password.class) != null;
List<String> choices = new ArrayList<>();
if (isSecret) {
@@ -281,7 +281,7 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {
logger.error("Error setting property value", e);
}
- if (property.getPropertyGetter().getAnnotation(Secret.class) == null) {
+ if (property.getPropertyGetter().getAnnotation(Password.class) == null) {
PropertyEditor<?> propertyEditor = PropertyContext.edit("value", paramBean, property.getPropertyName());
item.add(propertyEditor);
if (propertyEditor instanceof StringPropertyEditor) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java
index 8a233f70b2..846cae4d37 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldinstance/FieldListEditPanel.java
@@ -45,7 +45,7 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.annotation.FieldNamesProvider;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@SuppressWarnings("serial")
class FieldListEditPanel extends PropertyEditor<List<Serializable>> {
@@ -131,7 +131,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {
container.add(new Label("required", required).setEscapeModelStrings(false));
- boolean isSecret = property.getPropertyGetter().getAnnotation(Secret.class) != null;
+ boolean isSecret = property.getPropertyGetter().getAnnotation(Password.class) != null;
List<String> choices = new ArrayList<>();
if (isSecret) {
@@ -247,7 +247,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {
logger.error("Error setting property value", e);
}
- if (property.getPropertyGetter().getAnnotation(Secret.class) == null) {
+ if (property.getPropertyGetter().getAnnotation(Password.class) == null) {
return PropertyContext.edit("value", fieldBean, property.getPropertyName());
} else {
JobSecretEditBean bean = new JobSecretEditBean();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/ConfirmativeSecretPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/secret/ConfirmativeSecretPropertyEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/ConfirmativeSecretPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/editable/secret/ConfirmativeSecretPropertyEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
index 13b98d9104..cf6ca63cd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/ConfirmativeSecretPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.secret;
+package io.onedev.server.web.editable.password;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -11,16 +11,16 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@SuppressWarnings("serial")
-public class ConfirmativeSecretPropertyEditor extends PropertyEditor<String> {
+public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
private PasswordTextField input;
private PasswordTextField inputAgain;
- public ConfirmativeSecretPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ public ConfirmativePasswordPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
@@ -40,7 +40,7 @@ public class ConfirmativeSecretPropertyEditor extends PropertyEditor<String> {
inputAgain.setLabel(Model.of(getDescriptor().getDisplayName()));
add(inputAgain);
- Secret password = getDescriptor().getPropertyGetter().getAnnotation(Secret.class);
+ Password password = getDescriptor().getPropertyGetter().getAnnotation(Password.class);
String autoComplete = password.autoComplete();
if (StringUtils.isNotBlank(autoComplete)) {
input.add(AttributeAppender.append("autocomplete", autoComplete));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java
index bd4acc8c34..f33e3443c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java
@@ -1,22 +1,21 @@
-package io.onedev.server.web.editable.secret;
+package io.onedev.server.web.editable.password;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.web.editable.*;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import java.lang.reflect.AnnotatedElement;
@SuppressWarnings("serial")
-public class SecretEditSupport implements EditSupport {
+public class PasswordEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (descriptor.getPropertyClass() == String.class) {
- Secret secret = descriptor.getPropertyGetter().getAnnotation(Secret.class);
- if (secret != null) {
- if (secret.needConfirm()) {
+ Password password = descriptor.getPropertyGetter().getAnnotation(Password.class);
+ if (password != null) {
+ if (password.needConfirm()) {
return new PropertyContext<String>(descriptor) {
@Override
@@ -26,10 +25,7 @@ public class SecretEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- if (secret.copyable())
- return new CopyableSecretPanel(id, model.getObject());
- else
- return new Label(id, "************");
+ return new PasswordPropertyViewer(id, model.getObject(), password.copyable());
} else {
return new EmptyValueLabel(id) {
@@ -47,7 +43,7 @@ public class SecretEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new ConfirmativeSecretPropertyEditor(componentId, descriptor, model);
+ return new ConfirmativePasswordPropertyEditor(componentId, descriptor, model);
}
};
@@ -61,10 +57,7 @@ public class SecretEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- if (secret.copyable())
- return new CopyableSecretPanel(id, model.getObject());
- else
- return new Label(id, "************");
+ return new PasswordPropertyViewer(id, model.getObject(), password.copyable());
} else {
return new EmptyValueLabel(id) {
@@ -82,7 +75,7 @@ public class SecretEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new SecretPropertyEditor(componentId, descriptor, model);
+ return new PasswordPropertyEditor(componentId, descriptor, model);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
index d90d327950..315c91c5b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.secret;
+package io.onedev.server.web.editable.password;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -11,14 +11,14 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@SuppressWarnings("serial")
-public class SecretPropertyEditor extends PropertyEditor<String> {
+public class PasswordPropertyEditor extends PropertyEditor<String> {
private PasswordTextField input;
- public SecretPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ public PasswordPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
@@ -32,7 +32,7 @@ public class SecretPropertyEditor extends PropertyEditor<String> {
input.setLabel(Model.of(getDescriptor().getDisplayName()));
add(input);
- Secret password = getDescriptor().getPropertyGetter().getAnnotation(Secret.class);
+ Password password = getDescriptor().getPropertyGetter().getAnnotation(Password.class);
String autoComplete = password.autoComplete();
if (StringUtils.isNotBlank(autoComplete))
input.add(AttributeAppender.append("autocomplete", autoComplete));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.html
new file mode 100644
index 0000000000..856f8ec521
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="d-flex align-items-center">
+ <div class="mr-2 pt-1 rounded bg-light px-2">************</div>
+ <a wicket:id="copy" title="Copy to clipboard"><wicket:svg href="copy" class="icon"/></a>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.java
new file mode 100644
index 0000000000..5183a6fbff
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyViewer.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.editable.password;
+
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+@SuppressWarnings("serial")
+public class PasswordPropertyViewer extends Panel {
+
+ private final String password;
+
+ private final boolean copyable;
+
+ public PasswordPropertyViewer(String id, String password, boolean copyable) {
+ super(id);
+ this.password = password;
+ this.copyable = copyable;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new CopyToClipboardLink("copy", Model.of(password)).setVisible(copyable));
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.html
deleted file mode 100644
index ed7cd0cafd..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <span>************</span> <a wicket:id="copy" title="Copy to clipboard"><wicket:svg href="copy" class="icon"/></a>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.java
deleted file mode 100644
index c2a5bae738..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/CopyableSecretPanel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.web.editable.secret;
-
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
-
-@SuppressWarnings("serial")
-public class CopyableSecretPanel extends Panel {
-
- private final String secret;
-
- public CopyableSecretPanel(String id, String secret) {
- super(id);
- this.secret = secret;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new CopyToClipboardLink("copy", Model.of(secret)));
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java
index c3e2d53eb4..d2b931fcf4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
@Editable
public class AuthenticationToken implements Serializable {
@@ -27,7 +27,7 @@ public class AuthenticationToken implements Serializable {
}
@Editable(order=200, description="Specify password to authenticate with")
- @Secret
+ @Password
@NotEmpty
public String getPassword() {
return password;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
index 6d5bc4b8de..fe577ef878 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretEditPanel.java
@@ -19,7 +19,7 @@ import java.util.List;
@SuppressWarnings("serial")
public abstract class JobSecretEditPanel extends Panel {
- private static final String MASK = "******";
+ private static final String MASK = "************";
private final int index;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetBean.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetBean.java
index 812faff033..5fe292afc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetBean.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.simple.security;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
@@ -16,7 +16,7 @@ public class PasswordResetBean implements Serializable {
@Editable(order=200)
@OmitName
- @Secret(needConfirm=true)
+ @Password(needConfirm=true)
@NotEmpty
public String getNewPassword() {
return newPassword;
diff --git a/server-ee b/server-ee
index aa4a150619..4820cdd16f 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit aa4a15061931dcf1c64b72e772d565a15963ef6e
+Subproject commit 4820cdd16f8eee5150c3bf62451a78f4a8c4aeab
diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
index 8850037a09..793085957a 100644
--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
@@ -3,7 +3,7 @@ package io.onedev.server.plugin.authenticator.ldap;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.ShowCondition;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
@@ -92,7 +92,7 @@ public class LdapAuthenticator extends Authenticator {
}
@Editable(order=400, description="Specifies password of above manager DN")
- @Secret
+ @Password
@ShowCondition("isAuthenticationRequiredEnabled")
@NotEmpty
public String getManagerPassword() {
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.java
index a43e943ce3..3c77277f40 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
@@ -8,7 +8,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.Project;
@@ -68,7 +68,7 @@ public class ImportServer implements Serializable, Validatable {
@Editable(order=100, name="Bitbucket App Password", description="Bitbucket app password should be generated with "
+ "permission <b>account/read</b>, <b>repositories/read</b> and <b>issues:read</b>")
- @Secret
+ @Password
@NotEmpty
public String getAppPassword() {
return appPassword;
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.java
index fbbec4ea5d..141c1caf07 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
@@ -9,7 +9,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.ReferenceMigrator;
@@ -84,7 +84,7 @@ public class ImportServer implements Serializable, Validatable {
}
@Editable(order=100, name="Gitea Personal Access Token")
- @Secret
+ @Password
@NotEmpty
public String getAccessToken() {
return accessToken;
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.java
index 49a5853d29..435c5c4b2f 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
@@ -9,7 +9,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.ReferenceMigrator;
@@ -82,7 +82,7 @@ public class ImportServer implements Serializable, Validatable {
@Editable(order=100, name="GitHub Personal Access Token", description="GitHub personal access token should be generated with "
+ "scope <b>repo</b> and <b>read:org</b>")
- @Secret
+ @Password
@NotEmpty
public String getAccessToken() {
return accessToken;
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.java
index 7bea9765e0..254359a800 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
@@ -9,7 +9,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.attachment.AttachmentManager;
import io.onedev.server.attachment.AttachmentTooLargeException;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
@@ -91,7 +91,7 @@ public class ImportServer implements Serializable, Validatable {
@Editable(order=100, name="GitLab Personal Access Token", description="GitLab personal access token should be generated with "
+ "scope <b>read_api</b>, <b>read_user</b> and <b>read_repository</b>. Note that only groups/projects owned by " +
"user of specified access token will be listed")
- @Secret
+ @Password
@NotEmpty
public String getAccessToken() {
return accessToken;
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
index 64f46c7df2..417041d3b0 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
@@ -9,7 +9,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.attachment.AttachmentManager;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.IssueManager;
@@ -103,7 +103,7 @@ public class ImportServer implements Serializable, Validatable {
}
@Editable(order=100)
- @Secret
+ @Password
@NotEmpty
public String getApiToken() {
return apiToken;
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.java
index 6113614a81..2b58b50630 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
@@ -7,7 +7,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.Project;
@@ -177,7 +177,7 @@ public class ImportServer implements Serializable, Validatable {
}
@Editable(order=200)
- @Secret
+ @Password
@NotEmpty
public String getPassword() {
return password;
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index c314794960..da4385a19b 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -7,7 +7,7 @@ import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.attachment.AttachmentManager;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.*;
@@ -101,7 +101,7 @@ public class ImportServer implements Serializable, Validatable {
}
@Editable(order = 300, name = "YouTrack Password or Access Token", description = "Specify YouTrack password or access token for above user")
- @Secret
+ @Password
@NotEmpty
public String getPassword() {
return password;
diff --git a/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java b/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
index 5c8768a94a..c0f929f026 100644
--- a/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
+++ b/server-plugin/server-plugin-mailservice-gmail/src/main/java/io/onedev/server/plugin/mailservice/gmail/GmailMailService.java
@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.RefreshToken;
import io.onedev.server.mail.*;
import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;
@@ -60,7 +60,7 @@ public class GmailMailService implements MailService {
}
@Editable(order=200, description="Client secret of this OneDev instance registered in Google cloud")
- @Secret
+ @Password
@NotEmpty
public String getClientSecret() {
return clientSecret;
diff --git a/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java b/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
index 14cefc71c6..64324286c4 100644
--- a/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
+++ b/server-plugin/server-plugin-mailservice-office365/src/main/java/io/onedev/server/plugin/mailservice/office365/Office365MailService.java
@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.RefreshToken;
import io.onedev.server.mail.*;
import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;
@@ -68,7 +68,7 @@ public class Office365MailService implements MailService {
}
@Editable(order=200, description="Specify client secret of the app registered in Entra ID")
- @Secret
+ @Password
@NotEmpty
public String getClientSecret() {
return clientSecret;
diff --git a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/InboxPollSetting.java b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/InboxPollSetting.java
index 0cbf4bac5e..fb1b34ec28 100644
--- a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/InboxPollSetting.java
+++ b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/InboxPollSetting.java
@@ -1,7 +1,7 @@
package io.onedev.server.plugin.mailservice.smtpimap;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.model.support.administration.mailservice.ImapImplicitSsl;
import io.onedev.server.model.support.administration.mailservice.ImapSslSetting;
@@ -62,7 +62,7 @@ public class InboxPollSetting implements Serializable {
}
@Editable(order=400, name="IMAP Password")
- @Secret(autoComplete="new-password")
+ @Password(autoComplete="new-password")
@NotEmpty
public String getImapPassword() {
return imapPassword;
diff --git a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
index efde98065d..f131082244 100644
--- a/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
+++ b/server-plugin/server-plugin-mailservice-smtpimap/src/main/java/io/onedev/server/plugin/mailservice/smtpimap/SmtpImapMailService.java
@@ -2,7 +2,7 @@ package io.onedev.server.plugin.mailservice.smtpimap;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.mail.*;
import io.onedev.server.model.support.administration.mailservice.MailService;
import io.onedev.server.model.support.administration.mailservice.SmtpExplicitSsl;
@@ -70,7 +70,7 @@ public class SmtpImapMailService implements MailService {
}
@Editable(order=400, name="SMTP Password")
- @Secret(autoComplete="new-password")
+ @Password(autoComplete="new-password")
public String getSmtpPassword() {
return smtpPassword;
}
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
index bab528060b..301560f6de 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
@@ -27,7 +27,7 @@ import io.onedev.server.plugin.sso.discord.oauth2.Request;
import io.onedev.server.plugin.sso.discord.oauth2.UserGuildsResponse;
import io.onedev.server.plugin.sso.discord.oauth2.UserInfoResponse;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
@Editable(name="Discord", order=150, description="Single sign on via discord.com")
@@ -55,7 +55,7 @@ public class DiscordConnector extends SsoConnector {
}
@Editable(order=1100, description="OAuth2 Client information | CLIENT SECRET")
- @Secret
+ @Password
@NotEmpty
public String getClientSecret() {
return clientSecret;
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java
index 0beb548c6a..03bc5c7695 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java
@@ -8,7 +8,7 @@ import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import org.apache.shiro.authc.AuthenticationException;
@@ -59,7 +59,7 @@ public class EntraIdConnector extends OpenIdConnector {
}
@Editable(order=1100, description="Specify client secret of the app registered in Entra ID")
- @Secret
+ @Password
@NotEmpty
public String getClientSecret() {
return super.getClientSecret();
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index 1787d1d731..1c8d5a3eb5 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -18,7 +18,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Secret;
+import io.onedev.server.annotation.Password;
import io.onedev.server.annotation.UrlSegment;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
@@ -124,7 +124,7 @@ public class OpenIdConnector extends SsoConnector {
@Editable(order=1100, description="OpenID client secret will be generated by your OpenID "
+ "provider when registering this OneDev instance as client application")
- @Secret
+ @Password
@NotEmpty
public String getClientSecret() {
return clientSecret;