The Unified and Autonomous Development Platform
Improved validation logic
Andrea Del Bene616a3c63ebe3
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 02f2a4a0aa..0cd6d3afbd 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@@ -1,7 +1,6 @@package io.onedev.server.web.page.my.sshkeys;import java.time.LocalDateTime;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;@@ -11,7 +10,6 @@ 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;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;@@ -49,6 +47,8 @@ public abstract class InsertSshKeyPanel extends Panel {FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");feedbackPanel.setOutputMarkupId(true);++ Dao dao = OneDev.getInstance(Dao.class);form.add(new AjaxLink<Void>("cancel") {@@ -63,7 +63,6 @@ public abstract class InsertSshKeyPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {super.onSubmit(target, myform);SshKey sshKey = form.getModelObject();- Dao dao = OneDev.getInstance(Dao.class);sshKey.setOwner(user);sshKey.setTimestamp(LocalDateTime.now());@@ -84,7 +83,7 @@ public abstract class InsertSshKeyPanel extends Panel {TextArea<String> textArea = new TextArea<String>("content");form.add(new TextField<>("name").setRequired(true));- form.add(textArea.add(new SshValidator(model)).setRequired(true));+ form.add(textArea.add(new SshValidator(model, dao)).setRequired(true));form.add(feedbackPanel);add(form);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 5ca26fd53e..36d90aa1c1 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,14 +3,15 @@ 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.git.ssh.SshKeyUtils;import io.onedev.server.model.SshKey;+import io.onedev.server.persistence.dao.Dao;public class SshValidator implements IValidator<String> {@@ -19,10 +20,12 @@ public class SshValidator implements IValidator<String> {**/private static final long serialVersionUID = 1L;+ private Dao dao;- public SshValidator(IModel<SshKey> formModel) {+ public SshValidator(IModel<SshKey> formModel, Dao dao) {super();this.formModel = formModel;+ this.dao = dao;}@Override@@ -31,11 +34,21 @@ public class SshValidator implements IValidator<String> {PublicKey pubEntry = SshKeyUtils.loadPublicKey(validatable.getValue());String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);- formModel.getObject().setDigest(fingerPrint);+ boolean alreadyInUse = SshKeyUtils.isKeyAlreadyInUse(fingerPrint, dao);- } catch (IOException | GeneralSecurityException e) {+ 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);+ }}}