The Unified and Autonomous Development Platform
Improve ssh key list/insert UI
Robin Shen8535e91de497
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.javaindex c29c6e0cd6..1044dc3303 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java@@ -12,6 +12,6 @@ public interface SshKeyManager extends EntityManager<SshKey> {@NullableSshKey findByDigest(String digest);-+void syncUserKeys(User user, Collection<SshKey> keys);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex eeeee15838..cd98e457fb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -19,7 +19,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.administration.SecuritySetting;-import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -58,12 +57,6 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsprotection.onRenameGroup(oldName, group.getName());}- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- authenticator.onRenameGroup(oldName, group.getName());- settingManager.saveAuthenticator(authenticator);- }-issueFieldManager.onRenameGroup(oldName, group.getName());settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());settingManager.getSecuritySetting().onRenameGroup(oldName, group.getName());@@ -87,10 +80,6 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsusage.add(settingManager.getIssueSetting().onDeleteGroup(group.getName()).prefix("administration"));- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null)- usage.add(authenticator.onDeleteGroup(group.getName()).prefix("administration"));-usage.add(settingManager.getSecuritySetting().onDeleteGroup(group.getName()).prefix("administration"));usage.checkInUse("Group '" + group.getName() + "'");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.javaindex f9cf3481c4..2ea1bd90f7 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java@@ -1,7 +1,7 @@package io.onedev.server.entitymanager.impl;-import java.time.LocalDateTime;import java.util.Collection;+import java.util.Date;import java.util.HashMap;import java.util.Map;@@ -60,7 +60,7 @@ public class DefaultSshKeyManager extends AbstractEntityManager<SshKey> implemendiff.entriesOnlyOnRight().values().forEach((key) -> {if (findByDigest(key.getDigest()) != null) {- key.setTimestamp(LocalDateTime.now());+ key.setDate(new Date());key.setOwner(user);save(key);} else {diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex 487faf4fd9..a395b36444 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -1,7 +1,6 @@package io.onedev.server.model;-import java.security.PublicKey;-import java.time.LocalDateTime;+import java.util.Date;import javax.persistence.Column;import javax.persistence.Entity;@@ -14,11 +13,8 @@ import javax.persistence.UniqueConstraint;import javax.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.KeyUtils;-import org.apache.wicket.util.string.Strings;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;@@ -26,7 +22,6 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;@Editable-@ClassValidating@Entity@Table(indexes={@Index(columnList="o_owner_id"), @Index(columnList="name"), @Index(columnList="digest")},@@ -34,6 +29,7 @@ import io.onedev.server.web.editable.annotation.Multiline;@UniqueConstraint(columnNames={"o_owner_id", "name"}),@UniqueConstraint(columnNames={"digest"})})+@ClassValidatingpublic class SshKey extends AbstractEntity implements Validatable {private static final long serialVersionUID = 1L;@@ -48,13 +44,13 @@ public class SshKey extends AbstractEntity implements Validatable {private String digest;@Column(nullable=false)- private LocalDateTime timestamp;+ private Date createdAt;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private User owner;- @Editable(name = "Name")+ @Editable(description="Specify a name to identify the key")@NotEmptypublic String getName() {return name;@@ -64,7 +60,8 @@ public class SshKey extends AbstractEntity implements Validatable {this.name = name;}- @Editable(name = "Key Value")+ @Editable(name = "Key", description="Provide a SSH public key. Begins with 'ssh-rsa', 'ssh-ed25519', "+ + "'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'")@NotEmpty@Multilinepublic String getContent() {@@ -91,47 +88,29 @@ public class SshKey extends AbstractEntity implements Validatable {this.owner = owner;}- public LocalDateTime getTimestamp() {- return timestamp;+ public Date getCreatedAt() {+ return createdAt;}- public void setTimestamp(LocalDateTime timestamp) {- this.timestamp = timestamp;+ public void setDate(Date createdAt) {+ this.createdAt = createdAt;}++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (content == null) {+ return true;+ } else {+ try {+ KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, SshKeyUtils.decodeSshPublicKey(content));+ return true;+ } catch (Exception exception) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Invalid SSH public key")+ .addPropertyNode("content").addConstraintViolation();+ return false;+ }+ }+ }- @Override- public boolean isValid(ConstraintValidatorContext context) {- String propertyNode = "content";- boolean hasErrors = false;- String errorMessage = "";-- if (Strings.isEmpty(content)) {- return false;- }-- try {- SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);- PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(content);- String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);-- boolean alreadyInUse = sshKeyManager.findByDigest(fingerPrint) != null;-- if (alreadyInUse) {- errorMessage = "The provided key is already in use. Please use another one.";- hasErrors = true;- }-- } catch (Exception exception) {- errorMessage = "The value provided as key is invalid. Please checkit and try again.";- hasErrors = true;- }-- if (hasErrors) {- context.buildConstraintViolationWithTemplate(errorMessage)- .addPropertyNode(propertyNode).addConstraintViolation()- .disableDefaultConstraintViolation();- return false;- }- return true;- }}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.javaindex 30ba7ef78e..30e953547f 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@@ -29,8 +29,11 @@ import org.hibernate.validator.constraints.NotEmpty;import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.MoreObjects;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;@@ -511,5 +514,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setSshKeys(Collection<SshKey> sshKeys) {this.sshKeys = sshKeys;}-++ public boolean isSshKeyExternalManaged() {+ if (isExternalManaged()) {+ Authenticator authenticator = OneDev.getInstance(SettingManager.class).getAuthenticator();+ return authenticator != null && authenticator.isManagingSshKeys();+ } else {+ return false;+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.javaindex 7f608f2c91..44d7898191 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java@@ -35,7 +35,7 @@ public class SshSetting implements Serializable, Validatable {}@Editable(name="Server Private Key", order=100, description="Specify the private key (in PEM format) used "- + "by ssh server to establish connections with ssh client")+ + "by ssh server to establish connections with client")@Multiline@NotEmptypublic String getPrivateKey() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.javaindex 8419f3e04d..bd5f7fde87 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java@@ -5,18 +5,13 @@ import java.io.Serializable;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.UsernamePasswordToken;-import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editablepublic abstract class Authenticator implements Serializable {private static final long serialVersionUID = 1L;- private String defaultGroup;-private int timeout = 300;@Editable(order=10000, description="Specify network timeout in seconds when authenticate through this system")@@ -28,30 +23,10 @@ public abstract class Authenticator implements Serializable {this.timeout = timeout;}- @Editable(order=20000, description="Optionally add newly authenticated user to specified group if group "- + "information is not available in external authentication system")- @GroupChoice- @NameOfEmptyValue("No default group")- public String getDefaultGroup() {- return defaultGroup;- }-- public void setDefaultGroup(String defaultGroup) {- this.defaultGroup = defaultGroup;- }-- public void onRenameGroup(String oldName, String newName) {- if (oldName.equals(defaultGroup))- defaultGroup = newName;- }+ public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;- public Usage onDeleteGroup(String groupName) {- Usage usage = new Usage();- if (groupName.equals(defaultGroup))- usage.add("default group");- return usage.prefix("external authenticator");- }+ public abstract boolean isManagingMemberships();- public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;+ public abstract boolean isManagingSshKeys();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.javaindex df61415bf0..4555412fd5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java@@ -62,7 +62,7 @@ public class LdapAuthenticator extends Authenticator {private String userEmailAttribute = "mail";- private String userSSHPublicKey;+ private String userSshKeyAttribute;private GroupRetrieval groupRetrieval = new DoNotRetrieveGroups();@@ -152,12 +152,12 @@ public class LdapAuthenticator extends Authenticator {@Editable(order=850, description=""+ "Specifies name of the attributes inside the user LDAP entry whose values will be taken as user "+ "SSH public keys. If this field is set SSH public keys are managed by LDAP only")- public String getUserSSHPublicKey() {- return userSSHPublicKey;+ public String getUserSshKeyAttribute() {+ return userSshKeyAttribute;}- public void setUserSSHPublicKey(String userSSHPublicKey) {- this.userSSHPublicKey = userSSHPublicKey;+ public void setUserSshKeyAttribute(String userSshKeyAttribute) {+ this.userSshKeyAttribute = userSshKeyAttribute;}@Editable(order=900, description="Specify the strategy to retrieve group membership information. "@@ -195,7 +195,7 @@ public class LdapAuthenticator extends Authenticator {if (getUserFullNameAttribute() != null)attributeNames.add(getUserFullNameAttribute());- String userSSHPublicKey = getUserSSHPublicKey();+ String userSSHPublicKey = getUserSshKeyAttribute();if (userSSHPublicKey != null)attributeNames.add(userSSHPublicKey);@@ -399,7 +399,7 @@ public class LdapAuthenticator extends Authenticator {private Collection<SshKey> retrieveSSHPublicKeys(Attributes searchResultAttributes) throws NamingException, IOException, GeneralSecurityException {Collection<SshKey> sshKeys = new ArrayList<SshKey>();- Attribute attributeValue = searchResultAttributes.get(getUserSSHPublicKey());+ Attribute attributeValue = searchResultAttributes.get(getUserSshKeyAttribute());if (attributeValue == null) {// no values for the user stored in LDAP@@ -416,7 +416,7 @@ public class LdapAuthenticator extends Authenticator {String content = (String) value;try {- SshKey sshKey = parseSSHPublicKey(keyIndex, content);+ SshKey sshKey = parseSshPublicKey(keyIndex, content);sshKeys.add(sshKey);} catch (Exception err) {logger.warn("Error parsing SSH public key", err);@@ -432,7 +432,7 @@ public class LdapAuthenticator extends Authenticator {return sshKeys;}- private SshKey parseSSHPublicKey(int keyIndex, String content) throws IOException, GeneralSecurityException {+ private SshKey parseSshPublicKey(int keyIndex, String content) throws IOException, GeneralSecurityException {PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(content);String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);@@ -449,5 +449,15 @@ public class LdapAuthenticator extends Authenticator {return sshKey;}++ @Override+ public boolean isManagingMemberships() {+ return !(groupRetrieval instanceof DoNotRetrieveGroups);+ }++ @Override+ public boolean isManagingSshKeys() {+ return userSshKeyAttribute != null;+ }}diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 951b275c0b..533788c5fc 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -218,7 +218,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {Collection<String> existingGroupNames = new HashSet<>();for (Membership membership: user.getMemberships())existingGroupNames.add(membership.getGroup().getName());- if (!authenticated.getGroupNames().isEmpty()) {+ if (authenticated.getGroupNames() != null) {Collection<String> retrievedGroupNames = new HashSet<>();for (String groupName: authenticated.getGroupNames()) {Group group = groupManager.find(groupName);@@ -253,19 +253,6 @@ public class OneAuthorizingRealm extends AuthorizingRealm {if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.save(user);- if (authenticated.getGroupNames().isEmpty() && authenticator.getDefaultGroup() != null) {- Group group = groupManager.find(authenticator.getDefaultGroup());- if (group != null) {- Membership membership = new Membership();- membership.setGroup(group);- membership.setUser(user);- user.getMemberships().add(membership);- membershipManager.save(membership);- } else {- logger.error("Default group '{}' of external authenticator is not defined",- authenticator.getDefaultGroup());- }- }}if (authenticated.getSSHPublicKeys() != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex cb5b30760e..8754d6d746 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -33,6 +33,7 @@ import io.onedev.server.web.page.admin.role.RoleListPage;import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;+import io.onedev.server.web.page.admin.ssh.SshSettingPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;@@ -41,12 +42,14 @@ import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.issues.IssueListPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -120,6 +123,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("my/profile", MyProfilePage.class));add(new OnePageMapper("my/avatar", MyAvatarPage.class));add(new OnePageMapper("my/password", MyPasswordPage.class));+ add(new OnePageMapper("my/ssh-keys", MySshKeysPage.class));}private void addResources() {@@ -149,6 +153,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));+ add(new OnePageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));add(new OnePageMapper("administration/roles", RoleListPage.class));add(new OnePageMapper("administration/roles/new", NewRolePage.class));@@ -167,6 +172,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));+ add(new OnePageMapper("administration/settings/ssh", SshSettingPage.class));add(new OnePageMapper("administration/settings/job-executors", JobExecutorsPage.class));add(new OnePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.htmlsimilarity index 61%rename from server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.htmlindex f0b40550ac..d0b84a8166 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.html@@ -1,18 +1,16 @@<wicket:panel>- <div class="confirm">+ <div class="insert-ssh-key"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>- <h4 class="modal-title">Add a ssh key</h4>+ <h4 class="modal-title">Add a SSH key</h4></div><form wicket:id="form"><div class="modal-body"><div wicket:id="editor"></div></div><div class="modal-footer">- <input wicket:id="add" type="submit" class="btn btn-primary"- value="Add">- <button wicket:id="cancel" type="button" class="btn btn-default"- data-dismiss="modal">Cancel</button>+ <input wicket:id="add" type="submit" class="btn btn-primary dirty-aware" value="Add">+ <button wicket:id="cancel" type="button" class="btn btn-default">Cancel</button></div></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.javaindex 55a83c866a..2dd99ff0d9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java@@ -1,14 +1,16 @@-package io.onedev.server.web.page.my.sshkeys;+package io.onedev.server.web.component.user.sshkey;import java.io.IOException;import java.security.GeneralSecurityException;import java.security.PublicKey;-import java.time.LocalDateTime;+import java.util.Date;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;@@ -17,18 +19,17 @@ import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;import io.onedev.server.ssh.SshKeyUtils;-import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@SuppressWarnings("serial")public abstract class InsertSshKeyPanel extends Panel {- private ModalPanel modal;-- public InsertSshKeyPanel(String id, ModalPanel modal) {+ public InsertSshKeyPanel(String id) {super(id);- this.modal = modal;}@Override@@ -39,18 +40,22 @@ public abstract class InsertSshKeyPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- modal.close();+ onCancel(target);}+});Form<?> form = new Form<Void>("form");BeanEditor editor = BeanContext.edit("editor", new SshKey());form.add(editor);- form.add(new AjaxSubmitLink("add") {++ form.add(new AjaxButton("add") {+@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> myform) {super.onSubmit(target, myform);+SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);SshKey sshKey = (SshKey) editor.getModelObject();@@ -62,13 +67,24 @@ public abstract class InsertSshKeyPanel extends Panel {throw new RuntimeException(e);}- sshKey.setOwner(getUser());- sshKey.setTimestamp(LocalDateTime.now());-- sshKeyManager.save(sshKey);-- modal.close();- onSave(target);+ if (getUser().getSshKeys().stream().anyMatch(it->it.getName().equals(sshKey.getName()))) {+ String message;+ if (SecurityUtils.getUser().equals(getUser()))+ message = "You have another key with the same name";+ else+ message = "This name is already used by another key of user '" + getUser().getDisplayName() + "'";+ editor.error(new Path(new PathNode.Named("name")), message);+ target.add(form);+ } else if (sshKeyManager.findByDigest(sshKey.getDigest()) != null) {+ editor.error(new Path(new PathNode.Named("content")), "This key is already in use");+ target.add(form);+ } else {+ sshKey.setOwner(getUser());+ sshKey.setDate(new Date());+ sshKeyManager.save(sshKey);+ getUser().getSshKeys().add(sshKey);+ onSave(target);+ }}@Override@@ -76,13 +92,16 @@ public abstract class InsertSshKeyPanel extends Panel {super.onError(target, form);target.add(form);}+});form.add(new AjaxLink<Void>("cancel") {- @Override++ @Overridepublic void onClick(AjaxRequestTarget target) {- modal.close();+ onCancel(target);}+});add(form.setOutputMarkupId(true));@@ -91,4 +110,13 @@ public abstract class InsertSshKeyPanel extends Panel {protected abstract User getUser();protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new SshKeyCssResourceReference()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyCssResourceReference.javanew file mode 100644index 0000000000..9a15d85ba2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.user.sshkey;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class SshKeyCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public SshKeyCssResourceReference() {+ super(SshKeyCssResourceReference.class, "ssh-key.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.htmlnew file mode 100644index 0000000000..fc8db7eefd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.html@@ -0,0 +1,6 @@+<wicket:panel>+ <table wicket:id="keys" class="ssh-key-list table table-hover no-autosize"></table>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="delete" title="Delete this key"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.javanew file mode 100644index 0000000000..3f1f2a0446--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/SshKeyListPanel.java@@ -0,0 +1,161 @@+package io.onedev.server.web.component.user.sshkey;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SshKeyManager;+import io.onedev.server.model.SshKey;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;++@SuppressWarnings("serial")+public class SshKeyListPanel extends GenericPanel<List<SshKey>> {++ private DataTable<SshKey, Void> sshKeysTable;++ public SshKeyListPanel(String id, IModel<List<SshKey>> model) {+ super(id, model);+ }++ private List<SshKey> getKeys() {+ return getModelObject();+ }++ @Override+ public void onInitialize() {+ super.onInitialize();++ List<IColumn<SshKey, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<SshKey, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<SshKey>> cellItem, String componentId,+ IModel<SshKey> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));+ }++ });++ columns.add(new AbstractColumn<SshKey, Void>(Model.of("Digest")) {++ @Override+ public void populateItem(Item<ICellPopulator<SshKey>> cellItem, String componentId,+ IModel<SshKey> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getDigest()));+ }++ });++ columns.add(new AbstractColumn<SshKey, Void>(Model.of("Created At")) {++ @Override+ public String getCssClass() {+ return "expanded";+ }++ @Override+ public void populateItem(Item<ICellPopulator<SshKey>> cellItem, String componentId,+ IModel<SshKey> rowModel) {+ cellItem.add(new Label(componentId, DateUtils.formatDateTime(rowModel.getObject().getCreatedAt())));+ }++ });++ columns.add(new AbstractColumn<SshKey, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<SshKey>> cellItem, String componentId,+ IModel<SshKey> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", SshKeyListPanel.this);++ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ SshKey sshKey = rowModel.getObject();+ OneDev.getInstance(SshKeyManager.class).delete(sshKey);+ Session.get().success("SSH key '" + sshKey.getName() + "' deleted");+ target.add(sshKeysTable);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);++ String message = "Do you really want to delete SSH key '" + rowModel.getObject().getName() + "'?";+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));+ }++ }.setVisible(!rowModel.getObject().getOwner().isSshKeyExternalManaged()));++ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ SortableDataProvider<SshKey, Void> dataProvider = new LoadableDetachableDataProvider<SshKey, Void>() {++ @Override+ public Iterator<? extends SshKey> iterator(long first, long count) {+ return getKeys().iterator();+ }++ @Override+ public long calcSize() {+ return getKeys().size();+ }++ @Override+ public IModel<SshKey> model(SshKey sshKey) {+ Long id = sshKey.getId();+ return new LoadableDetachableModel<SshKey>() {++ @Override+ protected SshKey load() {+ return OneDev.getInstance(SshKeyManager.class).load(id);+ }++ };+ }+ };++ add(sshKeysTable = new DefaultDataTable<SshKey, Void>("keys", columns, dataProvider,+ Integer.MAX_VALUE, null));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new SshKeyCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/ssh-key.css b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/ssh-key.cssnew file mode 100644index 0000000000..30f1e6ff82--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/ssh-key.css@@ -0,0 +1,10 @@+@media(max-width: 767px) {+ .ssh-key-list .expanded {+ display: none;+ }+}++.insert-ssh-key textarea {+ font-family: monospace;+ height: 200px !important;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.cssindex 042fce9f59..c8d45e1bc6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css@@ -48,3 +48,7 @@margin-right: 8px;}+#ssh-setting textarea {+ height: 300px;+ font-family: monospace;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.htmlindex 9a06146d09..a8a91764c0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html@@ -3,7 +3,7 @@<form wicket:id="authenticator" class="authenticator leave-confirm"><div wicket:id="editor"></div><div class="actions">- <button wicket:id="save" class="btn btn-primary dirty-aware">Save setting</button>+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save Setting</button><input wicket:id="test" type="submit" class="btn btn-primary" value="Test setting"></div></form>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.htmlindex ddbea32501..2bfa80e742 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html@@ -4,7 +4,7 @@<form wicket:id="backupSetting" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting"><a wicket:id="backupNow" class="btn btn-primary">Backup now</a></div></form>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.htmlindex 4988469d54..1f91ac48f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html@@ -2,7 +2,7 @@<div class="page-title">Groovy Scripts</div><div class="help-block">All Groovy scripts used across the system should be defined here and reviewedby the site administrator for security reasons</div>- <div class="groovy-scripts def-list list">+ <div class="groovy-script-list def-list list"><div class="head clearfix"><div class="pull-left"><a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.htmlindex 1b32d11b4c..f6cad3ab4f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Group Administration</div>- <div class="group list">+ <div class="group-list list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterGroups" class="form-control search" placeholder="Filter groups">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.htmlindex bf043019a8..63aaae8654 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Project Authorizations</div>- <form wicket:id="form" class="authorization list">+ <form wicket:id="form" class="authorization-list list"><div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.cssindex eda1be8ee8..3a09c3f296 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css@@ -37,10 +37,10 @@left: 44px;}-#group .authorization.list .select2-container,-#group .membership.list .head .select2-container {+#group .authorization-list.list .select2-container,+#group .membership-list.list .head .select2-container {width: 240px;}-#group .authorization.list .property-roleName .select2-container {+#group .authorization-list.list .property-roleName .select2-container {width: 360px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.htmlindex 3cbfc704f5..5730c70f9f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Group Memberships</div>- <div class="membership list">+ <div class="membership-list list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.htmlindex 271a40176d..9a873d97f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html@@ -3,8 +3,8 @@<form wicket:id="mailSetting" class="mail-setting leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">- <input wicket:id="sendingTestMail" type="submit" class="btn btn-primary" value="Send test mail">+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save Setting">+ <input wicket:id="sendingTestMail" type="submit" class="btn btn-primary" value="Send Test Mail"></div></form></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.htmlindex a742c3a6f5..3ea417a0da 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Role Detail</div>- <div class="role">+ <div id="role"><form wicket:id="form" class="leave-confirm"><div class="alert alert-info manager-note">This built-in role has full permissions over a project</div><div wicket:id="editor"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.htmlindex 4eb569121d..133eb9afe6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Role Administration</div>- <div class="role list">+ <div class="role-list list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterRoles" class="form-control search" placeholder="Filter roles">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.cssindex 3ea2532035..34ed2dc1b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css@@ -1,6 +1,6 @@-.role>form>.manager-note, .role>form.manager .help-block {+#role>form>.manager-note, #role>form.manager .help-block {display: none;}-.role>form.manager>.manager-note {+#role>form.manager>.manager-note {display: block;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.htmlindex 6a37f8f7c5..d360e8f57f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html@@ -4,7 +4,7 @@<form wicket:id="securitySetting" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting"></div></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.htmlindex bd06d164e8..f5b359f006 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html@@ -1,9 +1,12 @@<wicket:extend>- <div class="page-title">SSH Setting</div>- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Update setting">- </div>- </form>+ <div id="ssh-setting">+ <div class="page-title">SSH Setting</div>+ <form wicket:id="form" class="leave-confirm no-autosize">+ <div wicket:id="editor"></div>+ <div class="actions">+ <a wicket:id="rekey" class="btn btn-primary">Regenerate Private Key</a>+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">+ </div>+ </form>+ </div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.javaindex 6bc532de19..67e8e34900 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java@@ -1,21 +1,23 @@package io.onedev.server.web.page.admin.ssh;-import java.util.Collection;-import java.util.HashSet;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.SshSetting;+import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;+@SuppressWarnings("serial")public class SshSettingPage extends AdministrationPage {- /**- *- */- private static final long serialVersionUID = 1L;public SshSettingPage(PageParameters params) {super(params);@@ -24,7 +26,6 @@ public class SshSettingPage extends AdministrationPage {throw new OneException("This page requires SSH support to be enabled. "+ " You need to specify ssh_port parameter in server.properties");}-}@Override@@ -41,15 +42,35 @@ public class SshSettingPage extends AdministrationPage {protected void onSubmit() {super.onSubmit();OneDev.getInstance(SettingManager.class).saveSshSetting(sshSetting);- getSession().success("SSH setting has been updated");+ getSession().success("SSH setting has been saved");setResponsePage(SshSettingPage.class);}};- Collection<String> excludedProps = new HashSet<>();- form.add(BeanContext.edit("editor", sshSetting, excludedProps, true));+ form.add(BeanContext.edit("editor", sshSetting));+ form.add(new AjaxLink<Void>("rekey") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ form.visitChildren(TextArea.class, new IVisitor<TextArea<String>, Void>() {++ @Override+ public void component(TextArea<String> component, IVisit<Void> visit) {+ component.setModelObject(SshKeyUtils.generatePEMPrivateKey());+ visit.stop();+ }++ });+ target.add(form);+ target.appendJavaScript(String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId()));+ getSession().success("Private key regenerated");+ }++ });+ form.setOutputMarkupId(true);add(form);}+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.htmlindex 135e9a6c03..d8e84f15db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html@@ -3,7 +3,7 @@<form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Update setting">+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting"></div></form></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.javaindex ea4d91956c..f36b05f590 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java@@ -33,7 +33,7 @@ public class SystemSettingPage extends AdministrationPage {protected void onSubmit() {super.onSubmit();OneDev.getInstance(SettingManager.class).saveSystemSetting(systemSetting);- getSession().success("System setting has been updated");+ getSession().success("System setting has been saved");setResponsePage(SystemSettingPage.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex d32150dbf0..9da6f3eb3e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">User Administration</div>- <div class="user list">+ <div class="user-list list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterUsers" class="form-control search" placeholder="Filter users">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.htmlindex bf043019a8..63aaae8654 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Project Authorizations</div>- <form wicket:id="form" class="authorization list">+ <form wicket:id="form" class="authorization-list list"><div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.htmlindex 181809dcb5..d84eb8d4bc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">Belonging Groups</div>- <div class="membership list">+ <div class="membership-list list"><div class="head clearfix"><div class="pull-left clearable-wrapper"><input wicket:id="filterGroups" class="form-control search" placeholder="Filter by group name">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.htmlindex 9db3549d21..6907d03c31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html@@ -1,13 +1,15 @@<wicket:extend><div class="page-title">Ssh Keys</div>- <div class="head">- <a class="add-new btn btn-success" wicket:id="newKey"><i- class="fa fa-plus"></i> New Ssh Key</a>- <div wicket:id="sshKeyNote" class="alert alert-info">- SSH keys are managed by an external authentication provider+ <div class="user-ssh-key-list list">+ <div class="head">+ <a class="add-new btn btn-success" wicket:id="newKey"><i+ class="fa fa-plus"></i> New Ssh Key</a>+ <div wicket:id="sshKeyNote" class="alert alert-info">+ SSH keys are managed by an external authentication provider+ </div>+ </div>+ <div class="body">+ <div wicket:id="keyList"></div></div>- </div>- <div class="key list">- <div wicket:id="keyList"></div></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.javaindex 6de018a683..3bfb2ccec3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java@@ -18,9 +18,9 @@ import io.onedev.server.model.support.administration.authenticator.Authenticatorimport io.onedev.server.model.support.administration.authenticator.ldap.LdapAuthenticator;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.sshkey.InsertSshKeyPanel;+import io.onedev.server.web.component.user.sshkey.SshKeyListPanel;import io.onedev.server.web.page.admin.user.UserPage;-import io.onedev.server.web.page.my.sshkeys.InsertSshKeyPanel;-import io.onedev.server.web.page.my.sshkeys.SshKeysListPanel;@SuppressWarnings("serial")public class UserSshKeysPage extends UserPage {@@ -47,23 +47,30 @@ public class UserSshKeysPage extends UserPage {};- SshKeysListPanel keyList = new SshKeysListPanel("keyList", detachableModel);+ SshKeyListPanel keyList = new SshKeyListPanel("keyList", detachableModel);add(new ModalLink("newKey") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new InsertSshKeyPanel(id, modal) {+ return new InsertSshKeyPanel(id) {++ @Override+ protected User getUser() {+ return UserSshKeysPage.this.getUser();+ }@Overrideprotected void onSave(AjaxRequestTarget target) {target.add(keyList);+ modal.close();}@Override- protected User getUser() {- return UserSshKeysPage.this.getUser();+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();}+};}@@ -102,7 +109,7 @@ public class UserSshKeysPage extends UserPage {return true;}- if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {+ if (((LdapAuthenticator) auth).getUserSshKeyAttribute() != null) {return false;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex b1f75e9c9d..a5a74c3165 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -5,7 +5,7 @@#user>.sidebar+.content {padding-left: 0;}- .user.list .expanded {+ .user-list.list .expanded {display: none;}}@@ -47,15 +47,15 @@left: 44px;}-#user .membership.list .head .select2-container,-#user .authorization.list .select2-container {+#user .membership-list .head .select2-container,+#user .authorization-list .select2-container {width: 240px;}-#user .authorization.list .property-roleNames .select2-container {+#user .authorization-list .property-roleNames .select2-container {width: 360px;}-.user.list .checkbox {+.user-list.list .checkbox {margin: 0;}.new-user .actions .btn {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.htmlindex 73c9226f7d..de34c45f69 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html@@ -1,10 +1,10 @@<wicket:extend>- <div class="page-title">Ssh Keys</div>- <div class="key list">+ <div class="page-title">SSH Keys</div>+ <div class="my-ssh-key-list list"><div class="head">- <a class="add-new btn btn-success" wicket:id="newKey"><i class="fa fa-plus"></i> New Ssh Key</a>+ <a class="add-new btn btn-success" wicket:id="newKey"><i class="fa fa-plus"></i> New SSH Key</a><div wicket:id="sshKeyNote" class="alert alert-info">- SSH keys are managed by an external authentication provider+ SSH keys are managed by external authentication provider</div></div><div class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex da5737f3e5..6a900a8e81 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -9,15 +9,13 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.authenticator.ldap.LdapAuthenticator;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.user.sshkey.InsertSshKeyPanel;+import io.onedev.server.web.component.user.sshkey.SshKeyListPanel;import io.onedev.server.web.page.my.MyPage;@SuppressWarnings("serial")@@ -36,74 +34,57 @@ public class MySshKeysPage extends MyPage {protected void onInitialize() {super.onInitialize();- LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {+ SshKeyListPanel keyList = new SshKeyListPanel("keyList", new LoadableDetachableModel<List<SshKey>>() {@Overrideprotected List<SshKey> load() {return new ArrayList<>(getLoginUser().getSshKeys());}- };-- SshKeysListPanel keyList = new SshKeysListPanel("keyList", detachableModel);+ });add(new ModalLink("newKey") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new InsertSshKeyPanel(id, modal) {+ return new InsertSshKeyPanel(id) {@Overrideprotected void onSave(AjaxRequestTarget target) {target.add(keyList);+ modal.close();}@Overrideprotected User getUser() {return getLoginUser();}++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }+};}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(determineNewSSHKeyVisibility());+ setVisible(!getLoginUser().isSshKeyExternalManaged());}+});add(new WebMarkupContainer("sshKeyNote") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(determineSSHKeyNoteVisibility());+ setVisible(getLoginUser().isSshKeyExternalManaged());}});add(keyList.setOutputMarkupId(true));-}- private boolean determineSSHKeyNoteVisibility() {- return !determineNewSSHKeyVisibility();- }-- private boolean determineNewSSHKeyVisibility() {- if (!getLoginUser().isExternalManaged()) {- return true;- }-- Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();-- if (auth == null || !(auth instanceof LdapAuthenticator)) {- return true;- }-- if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {- return false;- }-- return true;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.htmldeleted file mode 100644index eec3ed19aa..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.html+++ /dev/null@@ -1,33 +0,0 @@-<!DOCTYPE html>-<html>-<head>-<meta charset="UTF-8">-<title>Insert title here</title>-</head>-<body>- <wicket:panel>- <div wicket:id="keyList">- <table class="table">- <thead>- <tr><th>Name</th><th>Digest</th><th>Creation time</th><th></th></tr>- </thead>- <tbody>- <tr wicket:id="keys" class="even">- <td class="vertical-middle"><span wicket:id="name">Test ID</span></td>- <td class="vertical-middle"><span wicket:id="digest">Test ID</span></td>- <td class="vertical-middle"><span wicket:id="timestamp">Test ID</span></td>- <td class="vertical-middle"><a class="btn btn-danger" wicket:id="delete">Delete</a></td>- </tr>- <wicket:enclosure>- <tr class="norecords-tr" >- <td class="norecords-td" colspan="4">- <div wicket:id="msg">No records found</div>- </td>- </tr>- </wicket:enclosure>- </tbody>- </table>- </div>- </wicket:panel>-</body>-</html>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.javadeleted file mode 100644index 42e016bf9e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java+++ /dev/null@@ -1,105 +0,0 @@-package io.onedev.server.web.page.my.sshkeys;--import java.time.format.DateTimeFormatter;-import java.util.List;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.ResourceModel;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.SshKey;-import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.authenticator.ldap.LdapAuthenticator;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.web.component.modal.confirm.ConfirmModal;--@SuppressWarnings("serial")-public class SshKeysListPanel extends Panel {-- private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");-- public SshKeysListPanel(String id, IModel<List<SshKey>> model) {- super(id);-- WebMarkupContainer keyList = new WebMarkupContainer("keyList");-- keyList.add(new ListView<SshKey>("keys", model)- {- public void populateItem(final ListItem<SshKey> item)- {- final SshKey sshKey = item.getModelObject();- item.add(new Label("name", sshKey.getName()));- item.add(new Label("digest", sshKey.getDigest()));- item.add(new Label("timestamp", sshKey.getTimestamp().format(formatter)));- item.add(new AjaxLink<Void>("delete") {- @Override- public void onClick(AjaxRequestTarget target) {-- new ConfirmModal(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- Dao dao = OneDev.getInstance(Dao.class);- dao.remove(sshKey);- target.add(keyList);- }-- @Override- protected String getConfirmInput() {- return null;- }-- @Override- protected String getConfirmMessage() {- return "Are you sure you want to delete key '" + sshKey.getName() + "'?";- }- };- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(determineDeleteSSHKeyVisibility());- }-- public boolean determineDeleteSSHKeyVisibility() {- if (!item.getModelObject().getOwner().isExternalManaged()) {- return true;- }-- Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();-- if (auth == null || !(auth instanceof LdapAuthenticator)) {- return true;- }-- if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {- return false;- }-- return true;- }- });- }- }).setOutputMarkupId(true);-- Label noRecordsMsg = new Label("msg", new ResourceModel("datatable.no-records-found")) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(model.getObject().size() == 0);- }- };-- keyList.add(noRecordsMsg);-- add(keyList);-- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.javadeleted file mode 100644index 6588c8cf60..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.java+++ /dev/null@@ -1,51 +0,0 @@-package io.onedev.server.web.page.my.sshkeys;--import java.io.IOException;-import java.security.GeneralSecurityException;-import java.security.PublicKey;--import org.apache.sshd.common.config.keys.KeyUtils;-import org.apache.wicket.model.IModel;-import org.apache.wicket.validation.IValidatable;-import org.apache.wicket.validation.IValidationError;-import org.apache.wicket.validation.IValidator;-import org.apache.wicket.validation.ValidationError;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SshKeyManager;-import io.onedev.server.model.SshKey;-import io.onedev.server.ssh.SshKeyUtils;--@SuppressWarnings("serial")-public class SshValidator implements IValidator<String> {-- private IModel<SshKey> formModel;-- public SshValidator(IModel<SshKey> formModel) {- this.formModel = formModel;- }-- @Override- public void validate(IValidatable<String> validatable) {- try {- SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);- PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(validatable.getValue());- String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);-- boolean alreadyInUse = sshKeyManager.findByDigest(fingerPrint) != null;-- if (alreadyInUse) {- IValidationError keyAlreadyInUse = new ValidationError("The key you want to add is already in use.");- validatable.error(keyAlreadyInUse);-- return;- }-- formModel.getObject().setDigest(fingerPrint);-- } catch (IOException | GeneralSecurityException exception) {- IValidationError badContent = new ValidationError("The value provided as key is invalid. Please checkit and try again");- validatable.error(badContent);- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmlindex 420cf69bba..a993dae695 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="page-title">User Authorizations</div>- <form wicket:id="form" class="authorization list">+ <form wicket:id="form" class="authorization-list list"><div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.htmlindex e313686b40..2ec20c32ec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="help-block">Define rules to authorize build actions. A build action will be allowedas long as one rule allows it. All build actions will be allowed if no rules defined</div>- <div class="action-authorizations">+ <div class="action-authorization-list list"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.htmlindex a7300b57d1..559c0e2c27 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.All builds will be preserved if no rules are defined</div>- <div class="build-preservations">+ <div class="build-preservation-list list"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.htmlindex 0482beac68..5be71c975e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html@@ -1,6 +1,6 @@<wicket:extend><div wicket:id="note" class="help-block"></div>- <div class="job-secrets">+ <div class="job-secret-list list"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex a4cc7634e7..abaedaa99d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -43,19 +43,7 @@ body.BranchProtectionsPage, body.TagProtectionsPage, body.WebHooksPage {margin-right: 0;}-#project-setting .commit-message-transform>label {- float: left;- margin-right: 4px;-}-#project-setting .commit-message-transform>.help-block {- margin-top: 20px;-}-#project-setting .authorization.list a.other-sources {- margin-left: 4px;- color: #DCB508;- vertical-align: middle;-}-#project-setting .authorization.list .head .select2-container {+#project-setting .authorization-list .head .select2-container {width: 240px;}#project-setting .avatar-edit .title {@@ -79,18 +67,18 @@ body.BranchProtectionsPage, body.TagProtectionsPage, body.WebHooksPage {#project-setting .avatar-edit form>button {margin-top: 20px;}-#project-setting .authorization.list .select2-container,-#project-setting .authorization.list .property-roleName .select2-container {+#project-setting .authorization-list .select2-container,+#project-setting .authorization-list .property-roleName .select2-container {width: 360px;}-#project-setting .web-hooks table thead th {+#project-setting .web-hook-list table thead th {font-weight: bold !important;}-#project-setting .web-hooks table thead th.property-eventTypes {+#project-setting .web-hook-list table thead th.property-eventTypes {width: 25%;}-#project-setting .web-hooks table .select2-container {+#project-setting .web-hook-list table .select2-container {width: 100%;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlindex 41b8827b18..b587d56f22 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html@@ -3,7 +3,7 @@<div class="help-block">OneDev will post event data in JSON format to specified URLs when subscribed events happen</div>- <div class="web-hooks">+ <div class="web-hook-list list"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>