Skip to content

The Unified and Autonomous Development Platform

Migration to bean editor for SshKey

Andrea Del Bene60767ebc87f3
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.java
index 616a91a248..356824fa44 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,5 +1,8 @@
package io.onedev.server.model;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -7,16 +10,30 @@ import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+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.git.ssh.SshKeyUtils;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Multiline;
+@Editable
+@ClassValidating
@Entity
@Table
-public class SshKey extends AbstractEntity {
+public class SshKey extends AbstractEntity implements Validatable {
/**
*
*/
private static final long serialVersionUID = 1L;
+ @NotEmpty
@Column(nullable=false)
private String name;
@@ -33,6 +50,8 @@ public class SshKey extends AbstractEntity {
@JoinColumn(nullable=false)
private User owner;
+ @Editable(name = "Name")
+ @NotEmpty
public String getName() {
return name;
}
@@ -41,6 +60,9 @@ public class SshKey extends AbstractEntity {
this.name = name;
}
+ @Editable(name = "Key Value")
+ @NotEmpty
+ @Multiline
public String getContent() {
return content;
}
@@ -72,4 +94,40 @@ public class SshKey extends AbstractEntity {
public void setTimestamp(LocalDateTime timestamp) {
this.timestamp = timestamp;
}
+
+ @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.isKeyAlreadyInUse(fingerPrint);
+
+ 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/web/page/my/sshkeys/InsertSshKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html
index 88c644a7a3..f0b40550ac 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
@@ -6,18 +6,7 @@
</div>
<form wicket:id="form">
<div class="modal-body">
- <div class="form-group">
- <label>Key name</label><span class="required">*</span> <input wicket:id="name"
- class="form-control">
- </div>
- <div wicket:id="feedbackName">
- </div>
- <div class="form-group">
- <label>Value</label><span class="required">*</span>
- <textarea wicket:id="content" rows="10" class="form-control"></textarea>
- </div>
- <div wicket:id="feedbackContent">
- </div>
+ <div wicket:id="editor"></div>
</div>
<div class="modal-footer">
<input wicket:id="add" type="submit" class="btn btn-primary"
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.java
index 8349eded68..9d10bb6117 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,21 +1,25 @@
package io.onedev.server.web.page.my.sshkeys;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.HashSet;
+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.feedback.ComponentFeedbackMessageFilter;
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;
import io.onedev.server.entitymanager.SshKeyManager;
+import io.onedev.server.git.ssh.SshKeyUtils;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
public abstract class InsertSshKeyPanel extends Panel {
@@ -40,32 +44,25 @@ public abstract class InsertSshKeyPanel extends Panel {
modal.close();
}
});
-
- Form<SshKey> form = new Form<SshKey>("form") ;
-
- CompoundPropertyModel<SshKey> model = new CompoundPropertyModel<SshKey>(new SshKey());
- form.setModel(model);
-
- FeedbackPanel feedbackContent = new FeedbackPanel("feedbackContent");
- feedbackContent.setOutputMarkupId(true);
-
- FeedbackPanel feedbackName = new FeedbackPanel("feedbackName");
- feedbackName.setOutputMarkupId(true);
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
- });
+ Form<?> form = new Form<Void>("form");
+ BeanEditor editor = BeanContext.edit("editor", new SshKey());
+ form.add(editor);
form.add(new AjaxSubmitLink("add") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> myform) {
super.onSubmit(target, myform);
- SshKey sshKey = form.getModelObject();
SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);
+ SshKey sshKey = (SshKey) editor.getModelObject();
+
+ try {
+ PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(sshKey.getContent());
+ String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);
+ sshKey.setDigest(fingerPrint);
+ } catch (IOException | GeneralSecurityException e) {
+ throw new RuntimeException(e);
+ }
sshKey.setOwner(user);
sshKey.setTimestamp(LocalDateTime.now());
@@ -79,23 +76,18 @@ public abstract class InsertSshKeyPanel extends Panel {
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
- target.add(feedbackContent, feedbackName);
+ target.add(form);
}
});
- TextArea<String> keyContent = new TextArea<String>("content");
-
- TextField<String> keyName = new TextField<>("name");
- form.add(keyName.setRequired(true));
- form.add(keyContent.add(new SshValidator(model)).setRequired(true));
-
- feedbackContent.setFilter(new ComponentFeedbackMessageFilter(keyContent));
- feedbackName.setFilter(new ComponentFeedbackMessageFilter(keyName));
-
- form.add(feedbackContent);
- form.add(feedbackName);
+ form.add(new AjaxLink<Void>("cancel") {
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+ });
- add(form);
+ add(form.setOutputMarkupId(true));
}
protected abstract void onSave(AjaxRequestTarget target);