Add feedback to SSH Key Form. #1226

if key is empty of can not be parsed, form did provide any feedback to
user before

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 9c643d9263c52da37d6b63b7f7e6b42f638914d2..221878e1ef7b50e784e3339a236f32c17aa6d0c3 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -738,6 +738,8 @@ gb.emailAddressDescription = The primary email address for receiving notificatio
 gb.sshKeys = SSH Keys
 gb.sshKeysDescription = SSH public key authentication is a secure alternative to password authentication
 gb.addSshKey = Add SSH Key
+gb.addSshKeyErrorEmpty = SSH public key empty. Please provide a valid SSH public key
+gb.addSshKeyErrorFormat = Not a valid SSH public key format. Please provide a valid SSH public key
 gb.key = Key
 gb.sshKeyComment = Comment
 gb.sshKeyCommentDescription = Enter an optional comment. If blank, the comment will be extracted from the key data.

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
index 677144eb8058de08b160a18fc45841266f0ec084..48b1a31c2d6c13d903a3042354380431e6112a13 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
@@ -735,6 +735,8 @@ gb.emailAddressDescription = Die prim\u00e4re Emailadresse f\u00fcr den Empfang
 gb.sshKeys = SSH Keys
 gb.sshKeysDescription = SSH Public Key Authentifizierung ist eine sichere Alternative zur Authentifizierung mit Passwort
 gb.addSshKey = SSH Key hinzuf\u00fcgen
+gb.addSshKeyErrorEmpty = SSH Public Key leer. Bitte geben Sie einen g\u00fltigen SSH Public Key an
+gb.addSshKeyErrorFormat = SSH Public Key Format ungültig. Bitte geben Sie einen g\u00fltigen SSH Public Key an
 gb.key = Key
 gb.sshKeyComment = Kommentar
 gb.sshKeyCommentDescription = Geben Sie optional einen Kommentar ein. Falls Sie dies nicht tun, wird der Kommentar aus dem Key extrahiert.

diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index 0d99f5e52956f865290f630b25252ca2f962e028..bb97ee8ccecda779693bf748c0ba43eebd97c88b 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -251,7 +251,7 @@ public abstract class BasePage extends SessionPage {
                add(rootLink);\r
 \r
                // Feedback panel for info, warning, and non-fatal error messages\r
-               add(new FeedbackPanel("feedback"));\r
+               add(new FeedbackPanel("feedback").setOutputMarkupId(true));\r
 \r
                add(new Label("gbVersion", "v" + Constants.getVersion()));\r
                if (app().settings().getBoolean(Keys.web.aggressiveHeapManagement, false)) {\r

diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
index 4ab2483a50851b0583331c4aa6df793e0789b5d3..9bcb212704dd4ade287a4f6bae7e5f7a3c14d8e5 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
@@ -134,6 +134,8 @@ public class SshKeysPanel extends BasePanel {
                                String data = keyData.getObject();\r
                                if (StringUtils.isEmpty(data)) {\r
                                        // do not submit empty key\r
+                                       error(getString("gb.addSshKeyErrorEmpty"));\r
+                                       target.addComponent(getPage().get("feedback"));\r
                                        return;\r
                                }\r
 \r
@@ -142,6 +144,8 @@ public class SshKeysPanel extends BasePanel {
                                        key.getPublicKey();\r
                                } catch (Exception e) {\r
                                        // failed to parse the key\r
+                                       error(getString("gb.addSshKeyErrorFormat"));\r
+                                       target.addComponent(getPage().get("feedback"));\r
                                        return;\r
                                }\r
 \r