Viewer: Various SSH username handling improvements

(refer to change log)

ChangeLog.md

@@ -6,6 +6,16 @@
 1. The TurboVNC Viewer now asks for confirmation before overwriting an existing
 screenshot file.
 
+2. Improved the TurboVNC Viewer's handling of SSH usernames in the following
+ways:
+
+  - To better emulate the behavior of OpenSSH, the TurboVNC Viewer's
+built-in SSH client now allows an SSH username specified on the command line or
+in a connection info file to override an SSH username specified in the OpenSSH
+config file.
+ - The `LocalUsernameLC` parameter now affects the SSH username if the SSH
+username is unspecified.
+
 
 3.0.3
 =====

java/com/turbovnc/rfb/Params.java

@@ -767,7 +767,8 @@ public static void reset() {
 
  public static BoolParameter localUsernameLC =
  new BoolParameter("LocalUsernameLC",
- "When the SendLocalUsername parameter is set, setting this parameter will " +
+ "When the SendLocalUsername parameter is set, or when using SSH " +
+ "tunneling without a specified SSH username, setting this parameter will " +
  "cause the local username to be sent in lowercase, which may be useful " +
  "when using the viewer on Windows machines (Windows allows mixed-case " +
  "usernames, whereas Un*x and Mac platforms generally don't.)", false);

java/com/turbovnc/vncviewer/Tunnel.java

@@ -168,8 +168,6 @@ protected static void createTunnelJSch(String host, Options opts)
  // username and passphrase will be given via UserInfo interface.
  int port = Params.sshPort.getValue();
  String user = opts.sshUser;
- if (user == null)
- user = (String)System.getProperties().get("user.name");
 
  File sshConfigFile = new File(Params.sshConfig.getValue());
  if (sshConfigFile.exists() && sshConfigFile.canRead()) {
@@ -182,7 +180,7 @@ protected static void createTunnelJSch(String host, Options opts)
  // getSession() if the configuration has already been set using an
  // OpenSSH configuration file.
  String repoUser = repo.getConfig(host).getUser();
- if (repoUser != null)
+ if (repoUser != null && user == null)
  user = repoUser;
  String[] identityFiles = repo.getConfig(host).getValues("IdentityFile");
  if (identityFiles != null) {
@@ -201,6 +199,12 @@ protected static void createTunnelJSch(String host, Options opts)
  }
  }
 
+ if (user == null) {
+ user = (String)System.getProperties().get("user.name");
+ if (Params.localUsernameLC.getValue())
+ user = user.toLowerCase();
+ }
+
  if (useDefaultPrivateKeyFiles) {
  privateKeys.add(new File(homeDir + "/.ssh/id_rsa"));
  privateKeys.add(new File(homeDir + "/.ssh/id_dsa"));