You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by necouchman <gi...@git.apache.org> on 2018/04/06 11:24:41 UTC
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
GitHub user necouchman opened a pull request:
https://github.com/apache/guacamole-client/pull/270
GUACAMOLE-527: Client-side changes for SSH host key checking
The client-side changes for passing through a known host key to guacd.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/necouchman/guacamole-client jira/527
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/guacamole-client/pull/270.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #270
----
commit 823627d4c3e9be3052e1727a4033e5f137e4e6b2
Author: Nick Couchman <vn...@...>
Date: 2018-04-05T10:32:31Z
GUACAMOLE-527: Add fields for known host key for servers.
commit c342eea58cb0a0efb4db5f90d3d7f2c650a0c2d7
Author: Nick Couchman <vn...@...>
Date: 2018-04-05T11:01:26Z
GUACAMOLE-527: Add correct translations for field options.
commit 4473766871ba05b8cb3704d69c4ff019218d3dc5
Author: Nick Couchman <vn...@...>
Date: 2018-04-05T14:57:17Z
GUACAMOLE-527: Add parameters and translations for SSH host keys for VNC and RDP.
----
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198257222
--- Diff: guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json ---
@@ -12,6 +12,10 @@
{
"name" : "port",
"type" : "NUMERIC"
+ },
+ {
+ "name" : "host-key",
+ "type" : "MULTILINE"
--- End diff --
Does this value contain multiple lines? I thought each host was defined by a single line.
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198273481
--- Diff: guacamole/src/main/webapp/translations/en.json ---
@@ -364,6 +364,7 @@
"FIELD_HEADER_SECURITY" : "Security mode:",
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
+ "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):",
--- End diff --
Yeah, good point. Fixed.
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/guacamole-client/pull/270
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198258868
--- Diff: guacamole/src/main/webapp/translations/en.json ---
@@ -364,6 +364,7 @@
"FIELD_HEADER_SECURITY" : "Security mode:",
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
+ "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):",
--- End diff --
As the fact this is the key of the SSH host is given from the header for the section (SFTP), but the public vs. private nature of that key is not, I suggest using the same text for VNC/RDP that you use for the SSH parameter ("public host key").
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198273111
--- Diff: guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json ---
@@ -12,6 +12,10 @@
{
"name" : "port",
"type" : "NUMERIC"
+ },
+ {
+ "name" : "host-key",
+ "type" : "MULTILINE"
--- End diff --
Fixed.
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198272834
--- Diff: guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json ---
@@ -12,6 +12,10 @@
{
"name" : "port",
"type" : "NUMERIC"
+ },
+ {
+ "name" : "host-key",
+ "type" : "MULTILINE"
--- End diff --
Yeah, I think you're right.
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198272676
--- Diff: guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json ---
@@ -329,6 +329,10 @@
"name" : "sftp-hostname",
"type" : "TEXT"
},
+ {
+ "name" : "sftp-host-key",
--- End diff --
No, just a mistake. Reordered.
---
[GitHub] guacamole-client pull request #270: GUACAMOLE-527: Client-side changes for S...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/270#discussion_r198253892
--- Diff: guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json ---
@@ -329,6 +329,10 @@
"name" : "sftp-hostname",
"type" : "TEXT"
},
+ {
+ "name" : "sftp-host-key",
--- End diff --
Is there a reason behind the difference in parameter order across protocols? I see `hostname`/`port`/**`host-key`** for SSH but `sftp-hostname`/**`sftp-host-key`**/`sftp-port` for VNC/RDP.
---