Merge pull request #16955 from iterate-ch/bugfix/GH-16954

Make aware of none value for configuration directives in OpenSSH configuration

Author: dkocher

ssh/src/main/java/ch/cyberduck/core/sftp/openssh/OpenSSHCredentialsConfigurator.java

@@ -53,7 +53,7 @@ public Credentials configure(final Host host) {
             if(!credentials.isPublicKeyAuthentication()) {
                 if(null != entry.getIdentityFile()) {
                     log.info("Using identity {} from {}", entry, configuration);
-                    credentials.setIdentity(entry.getIdentityFile());
+                    credentials.setIdentity(LocalFactory.get(entry.getIdentityFile()));
                 }
                 else {
                     // No custom public key authentication configuration

ssh/src/main/java/ch/cyberduck/core/sftp/openssh/OpenSSHIdentityAgentConfigurator.java

@@ -18,7 +18,6 @@
  * [email protected]
  */
 
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.LocalFactory;
 import ch.cyberduck.core.sftp.openssh.config.transport.OpenSshConfig;
 
@@ -39,13 +38,13 @@ public OpenSSHIdentityAgentConfigurator(final OpenSshConfig configuration) {
     }
 
     public String getIdentityAgent(final String alias) {
-        final Local agent = configuration.lookup(alias).getIdentityAgent();
+        final String agent = configuration.lookup(alias).getIdentityAgent();
         if(null == agent) {
             log.debug("No configuration for alias {}", alias);
             return null;
         }
         log.debug("Found configuration {} for alias {}", agent, alias);
-        return agent.getAbsolute();
+        return agent;
     }
 
     @Override

ssh/src/main/java/ch/cyberduck/core/sftp/openssh/config/transport/OpenSshConfig.java

@@ -147,45 +147,35 @@ public Map<String, Host> refresh() {
     }
 
     private Map<String, Host> parse(final InputStream in) throws IOException {
-        final Map<String, Host> m = new LinkedHashMap<String, Host>();
+        final Map<String, Host> m = new LinkedHashMap<>();
         final BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
-        final List<Host> current = new ArrayList<Host>(4);
+        final List<Host> current = new ArrayList<>(4);
         String line;
 
         while((line = br.readLine()) != null) {
             line = line.trim();
-            if(line.length() == 0 || line.startsWith("#")) {
+            if(line.isEmpty() || line.startsWith("#")) {
                 continue;
             }
-
             final String[] parts = line.split("[ \t]*[= \t]", 2);
             if(parts.length != 2) {
                 continue;
             }
             final String keyword = parts[0].trim();
             final String argValue = parts[1].trim();
-
             if("Host".equalsIgnoreCase(keyword)) {
                 current.clear();
                 for(final String pattern : argValue.split("[ \t]")) {
                     final String name = dequote(pattern);
-                    Host c = m.get(name);
-                    if(c == null) {
-                        c = new Host();
-                        m.put(name, c);
-                    }
+                    Host c = m.computeIfAbsent(name, k -> new Host());
                     current.add(c);
                 }
                 continue;
             }
-
             if(current.isEmpty()) {
-                // We received an option outside of a Host block. We
-                // don't know who this should match against, so skip.
-                //
+                // We received an option outside a Host block. We don't know who this should match against, so skip.
                 continue;
             }
-
             if("HostName".equalsIgnoreCase(keyword)) {
                 for(final Host c : current) {
                     if(c.hostName == null) {
@@ -196,7 +186,7 @@ private Map<String, Host> parse(final InputStream in) throws IOException {
             else if("ProxyJump".equalsIgnoreCase(keyword)) {
                 for(final Host c : current) {
                     if(c.proxyJump == null) {
-                        c.proxyJump = dequote(argValue);
+                        c.proxyJump = none(dequote(argValue));
                     }
                 }
             }
@@ -223,21 +213,21 @@ else if("Port".equalsIgnoreCase(keyword)) {
             else if("IdentityFile".equalsIgnoreCase(keyword)) {
                 for(final Host c : current) {
                     if(c.identityFile == null) {
-                        c.identityFile = LocalFactory.get(dequote(argValue));
+                        c.identityFile = none(dequote(argValue));
                     }
                 }
             }
             else if("IdentityAgent".equalsIgnoreCase(keyword)) {
                 for(final Host c : current) {
                     if(c.identityAgent == null) {
-                        c.identityAgent = LocalFactory.get(dequote(argValue));
+                        c.identityAgent = none(dequote(argValue));
                     }
                 }
             }
             else if("PreferredAuthentications".equalsIgnoreCase(keyword)) {
                 for(final Host c : current) {
                     if(c.preferredAuthentications == null) {
-                        c.preferredAuthentications = nows(dequote(argValue));
+                        c.preferredAuthentications = none(nows(dequote(argValue)));
                     }
                 }
             }
@@ -256,7 +246,6 @@ else if("BatchMode".equalsIgnoreCase(keyword)) {
                 }
             }
         }
-
         return m;
     }
 
@@ -300,6 +289,13 @@ private static Boolean yesno(final String value) {
         return Boolean.FALSE;
     }
 
+    private static String none(final String value) {
+        if("none".equalsIgnoreCase(value)) {
+            return null;
+        }
+        return value;
+    }
+
     /**
      * Configuration of one "Host" block in the configuration file.
      * <p/>
@@ -315,8 +311,8 @@ public static class Host {
         String hostName;
         String proxyJump;
         int port;
-        Local identityFile;
-        Local identityAgent;
+        String identityFile;
+        String identityAgent;
         String user;
         String preferredAuthentications;
         Boolean identitiesOnly;
@@ -374,14 +370,14 @@ public int getPort() {
          * @return path of the private key file to use for authentication; null if the caller should use default
          * authentication strategies.
          */
-        public Local getIdentityFile() {
+        public String getIdentityFile() {
             return identityFile;
         }
 
         /**
          * @return Specifies the UNIX-domain socket used to communicate with the authentication agent.
          */
-        public Local getIdentityAgent() {
+        public String getIdentityAgent() {
             return identityAgent;
         }