The Unified and Autonomous Development Platform
Implemented user administration page to manage user's ssh keys
Andrea Del Bene459b97de9ba6
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 24001c3453..83149c5aac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.admin.user;import java.util.ArrayList;import java.util.List;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;@@ -14,7 +13,6 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;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.UserManager;@@ -35,6 +33,7 @@ import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;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.UserSshKeys;import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;@SuppressWarnings("serial")@@ -98,6 +97,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));+ tabs.add(new UserTab("Ssh Keys", "fa fa-fw fa-shield", UserSshKeys.class));tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.htmlnew file mode 100644index 0000000000..eea12be8d0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.html@@ -0,0 +1,5 @@+<wicket:extend>+ <div class="page-title">Ssh Keys</div>+ <div wicket:id="keyList">+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.javanew file mode 100644index 0000000000..c22af209ae--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeys.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.admin.user.ssh;++import java.util.List;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SshKeyManager;+import io.onedev.server.model.SshKey;+import io.onedev.server.model.User;+import io.onedev.server.web.page.admin.user.UserPage;+import io.onedev.server.web.page.my.sshkeys.SshKeysListPanel;++@SuppressWarnings("serial")+public class UserSshKeys extends UserPage {++ public UserSshKeys(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ User user = getUser();++ LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {+ @Override+ protected List<SshKey> load() {+ SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);+ return sshKeyManager.loadUserKeys(user);+ }++ };++ SshKeysListPanel keyList = new SshKeysListPanel("keyList", detachableModel);+ add(keyList.setOutputMarkupId(true));+ }+}diff --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.javaindex bf3b06b756..89d58cdc43 100644--- 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.java@@ -17,12 +17,9 @@ import io.onedev.server.OneDev;import io.onedev.server.model.SshKey;import io.onedev.server.persistence.dao.Dao;+@SuppressWarnings("serial")public class SshKeysListPanel extends Panel {- /**- *- */- private static final long serialVersionUID = 1L;private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");public SshKeysListPanel(String id, IModel<List<SshKey>> model) {@@ -31,11 +28,6 @@ public class SshKeysListPanel extends Panel {keyList.add(new ListView<SshKey>("keys", model){- /**- *- */- private static final long serialVersionUID = 1L;-public void populateItem(final ListItem<SshKey> item){final SshKey sshKey = item.getModelObject();@@ -44,11 +36,6 @@ public class SshKeysListPanel extends Panel {item.add(new Label("digest", sshKey.getDigest()));item.add(new Label("timestamp", sshKey.getTimestamp().format(formatter)));item.add(new AjaxLink<Void>("delete") {- /**- *- */- private static final long serialVersionUID = 1L;-@Overridepublic void onClick(AjaxRequestTarget target) {Dao dao = OneDev.getInstance(Dao.class);@@ -60,12 +47,6 @@ public class SshKeysListPanel extends Panel {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);AjaxCallListener myAjaxCallListener = new AjaxCallListener() {-- /**- *- */- private static final long serialVersionUID = 1L;-@Overridepublic CharSequence getPrecondition(Component component) {return "return confirm(\"Are you sure you want to delete key \'"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.javaindex 568956d834..a011e36864 100644--- 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.java@@ -3,26 +3,21 @@ 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.git.ssh.SshKeyUtils;import io.onedev.server.model.SshKey;+@SuppressWarnings("serial")public class SshValidator implements IValidator<String> {private IModel<SshKey> formModel;- /**- *- */- private static final long serialVersionUID = 1L;public SshValidator(IModel<SshKey> formModel) {this.formModel = formModel;@@ -51,5 +46,4 @@ public class SshValidator implements IValidator<String> {validatable.error(badContent);}}-}