The Unified and Autonomous Development Platform
Insert ssh key modal improved
Andrea Del Bene5e5edcbab35e
diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.javaindex 9b234cb95d..136478cb61 100644--- a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java+++ b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java@@ -45,7 +45,7 @@ public class SimpleGitSshServer {private Dao dao;- public static final BaseDigest MD5_DIGESTER = new BaseDigest("MD5", 512);;+ public static final BaseDigest MD5_DIGESTER = new BaseDigest("MD5", 512);@Injectpublic SimpleGitSshServer(ProjectManager projectManager,@@ -56,12 +56,11 @@ public class SimpleGitSshServer {this.dao = dao;this.repository = null;this.server = SshServer.setUpDefaultServer();-+this.server.setKeyPairProvider(keyPairProvider);this.server.setPort(40789);configureAuthentication();-this.server.setCommandFactory(command -> {if (command.startsWith(RemoteConfig.DEFAULT_UPLOAD_PACK)) {return new GitUploadPackCommand(command, executorService);@@ -83,8 +82,6 @@ public class SimpleGitSshServer {private boolean checkUserKeys(String userName, PublicKey publicKey) {String fingerPrint = KeyUtils.getFingerPrint(MD5_DIGESTER, publicKey);- System.out.println("key digest: " + fingerPrint);-User user = userManager.findByName(userName);List<SshKey> keys = SshUtils.loadUserKeys(user, dao);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/page/my/sshkeys/InsertSshKeyPanel.htmlindex 62c52d4e76..4d61214c16 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/page/my/sshkeys/InsertSshKeyPanel.html@@ -15,10 +15,10 @@class="form-control"></div><div class="form-group">- <label>Value </label>+ <label>Value *</label><textarea wicket:id="content" rows="10" class="form-control"></textarea></div>- <div class="alert alert-warning">+ <div wicket:id="feedback"><strong>Warning!</strong> Indicates a warning that might needattention.</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/page/my/sshkeys/InsertSshKeyPanel.javaindex e3f3cef371..b3751e0800 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/page/my/sshkeys/InsertSshKeyPanel.java@@ -13,6 +13,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.FeedbackPanel;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.CompoundPropertyModel;import io.onedev.server.OneDev;@@ -47,6 +48,9 @@ public abstract class InsertSshKeyPanel extends Panel {});Form<SshKey> form = new Form<>("form");+ FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");++ feedbackPanel.setOutputMarkupId(true);form.add(new AjaxLink<Void>("cancel") {@@ -80,6 +84,8 @@ public abstract class InsertSshKeyPanel extends Panel {sshKey.setTimestamp(LocalDateTime.now());} catch (Exception e) {e.printStackTrace();+ warn("The value inserted is not a valid key. Please check it and try again.");+ target.add(feedbackPanel);return;}@@ -89,10 +95,17 @@ public abstract class InsertSshKeyPanel extends Panel {onSave(target);}++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedbackPanel);+ }});- form.add(new TextField<>("name"));- form.add(new TextArea<>("content"));+ form.add(new TextField<>("name").setRequired(true));+ form.add(new TextArea<>("content").setRequired(true));+ form.add(feedbackPanel);form.setModel(new CompoundPropertyModel<SshKey>(new SshKey()));