Skip to content

The Unified and Autonomous Development Platform

Added basic key information listed in MySshKeysPage

Andrea Del Bene9668eb9bb4cc
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 d108b3a6cb..aee82a2365 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,6 @@
package io.onedev.server.model;
+import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -20,6 +21,9 @@ public class SshKey extends AbstractEntity {
@Column(nullable=false)
private String digest;
+ @Column(nullable=false)
+ private LocalDateTime timestamp;
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private User owner;
@@ -55,4 +59,12 @@ public class SshKey extends AbstractEntity {
public void setOwner(User owner) {
this.owner = owner;
}
+
+ public LocalDateTime getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(LocalDateTime timestamp) {
+ this.timestamp = timestamp;
+ }
}
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 f7c4e17f7a..fd370e1d28 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,9 +1,8 @@
package io.onedev.server.web.page.my.sshkeys;
-import java.io.IOException;
import java.io.StringReader;
-import java.security.GeneralSecurityException;
import java.security.PublicKey;
+import java.time.LocalDateTime;
import java.util.List;
import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
import org.apache.sshd.common.config.keys.KeyUtils;
@@ -76,18 +75,13 @@ public abstract class InsertSshKeyPanel extends Panel {
PublicKey pubEntry = entry.resolvePublicKey(PublicKeyEntryResolver.FAILING);
String fingerPrint = KeyUtils.getFingerPrint(new BaseDigest("MD5", 512), pubEntry);
- System.out.println(fingerPrint);
sshKey.setDigest(fingerPrint);
- } catch (IOException e) {
- // TODO Auto-generated catch block
+ sshKey.setTimestamp(LocalDateTime.now());
+ } catch (Exception e) {
e.printStackTrace();
- } catch (GeneralSecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
+ return;
+ }
dao.persist(sshKey);
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.html
index e637c0cb74..f7a711798f 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
@@ -3,10 +3,12 @@
<div class="body">
<div wicket:id="keyList">
<table class="table">
- <tr><th>Name</th><th>Owner</th><th></th></tr>
+ <tr><th>Name</th><th>Owner</th><th>Digest</th><th>Creation time</th><th></th></tr>
<tr wicket:id="keys" class="even">
<td><span wicket:id="name">Test ID</span></td>
<td><span wicket:id="owner">Test ID</span></td>
+ <td><span wicket:id="digest">Test ID</span></td>
+ <td><span wicket:id="timestamp">Test ID</span></td>
<td><a class="btn btn-danger" wicket:id="delete">Delete</a></td>
</tr>
</table>
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.java
index 7cfaa8b7c6..33fceaafc4 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
@@ -1,7 +1,6 @@
package io.onedev.server.web.page.my.sshkeys;
import java.util.List;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -13,7 +12,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.SimpleExpression;
-
import io.onedev.server.OneDev;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
@@ -50,8 +48,6 @@ public class MySshKeysPage extends MyPage {
}
});
-
-
LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {
final SimpleExpression eq = Restrictions.eq("owner", user);
@@ -71,6 +67,8 @@ public class MySshKeysPage extends MyPage {
final SshKey sshKey = item.getModelObject();
item.add(new Label("name", sshKey.getName()));
item.add(new Label("owner", sshKey.getOwner().getName()));
+ item.add(new Label("digest", sshKey.getDigest()));
+ item.add(new Label("timestamp", sshKey.getTimestamp().toString()));
item.add(new AjaxLink<Void>("delete") {
@Override
public void onClick(AjaxRequestTarget target) {