GUACAMOLE-1290: Merge parameter definitions and translations for SSH …

…public key (cert auth).
apache · Aug 27, 2024 · 9884bb2 · 9884bb2
2 parents 53afb13 + 24443d6
commit 9884bb2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -448,6 +448,10 @@
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
                 },
+                {
+                    "name"  : "sftp-public-key",
+                    "type"  : "MULTILINE"
+                },
                 {
                     "name"  : "sftp-root-directory",
                     "type"  : "TEXT"

diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -42,6 +42,10 @@
                 {
                     "name"  : "passphrase",
                     "type"  : "PASSWORD"
+                },
+                {
+                    "name"  : "public-key",
+                    "type"  : "MULTILINE"
                 }
             ]
         },

diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
@@ -199,6 +199,10 @@
                     "name"  : "sftp-passphrase",
                     "type"  : "PASSWORD"
                 },
+                {
+                    "name"  : "sftp-public-key",
+                    "type"  : "MULTILINE"
+                },
                 {
                     "name"  : "sftp-root-directory",
                     "type"  : "TEXT"

diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json
@@ -644,6 +644,7 @@
         "FIELD_HEADER_SFTP_PASSWORD"              : "Password:",
         "FIELD_HEADER_SFTP_PORT"                  : "Port:",
         "FIELD_HEADER_SFTP_PRIVATE_KEY"           : "Private key:",
+        "FIELD_HEADER_SFTP_PUBLIC_KEY"            : "Public key:",
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
         "FIELD_HEADER_SFTP_TIMEOUT"               : "SFTP connection timeout:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",
@@ -743,6 +744,7 @@
         "FIELD_HEADER_PASSPHRASE"    : "Passphrase:",
         "FIELD_HEADER_PORT"          : "Port:",
         "FIELD_HEADER_PRIVATE_KEY"   : "Private key:",
+        "FIELD_HEADER_PUBLIC_KEY"    : "Public key:",
         "FIELD_HEADER_SCROLLBACK"    : "Maximum scrollback size:",
         "FIELD_HEADER_READ_ONLY"     : "Read-only:",
         "FIELD_HEADER_RECORDING_WRITE_EXISTING" : "@:APP.FIELD_HEADER_RECORDING_WRITE_EXISTING",
@@ -940,6 +942,7 @@
         "FIELD_HEADER_SFTP_PASSWORD"              : "Password:",
         "FIELD_HEADER_SFTP_PORT"                  : "Port:",
         "FIELD_HEADER_SFTP_PRIVATE_KEY"           : "Private key:",
+        "FIELD_HEADER_SFTP_PUBLIC_KEY"            : "Public key:",
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
         "FIELD_HEADER_SFTP_TIMEOUT"               : "SFTP connection timeout:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",