#560 treat openssh config values ConnectTimeout and ServerAliveInterv…

…al as seconds.
mwiede · Jan 24, 2025 · 7179f33 · 7179f33
1 parent fdcdfb8
commit 7179f33
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/main/java/com/jcraft/jsch/OpenSSHConfig.java b/src/main/java/com/jcraft/jsch/OpenSSHConfig.java
@@ -233,14 +233,15 @@ private String find(String key) {
         if (value != null)
           break;
       }
-      // TODO: The following change should be applied,
-      // but it is breaking changes.
-      // The consensus is required to enable it.
-      /*
-       * if(value!=null && (key.equals("SERVERALIVEINTERVAL") || key.equals("CONNECTTIMEOUT"))){ try
-       * { int timeout = Integer.parseInt(value); value = Integer.toString(timeout*1000); } catch
-       * (NumberFormatException e) { } }
-       */
+
+      if (value != null && (key.equals("SERVERALIVEINTERVAL") || key.equals("CONNECTTIMEOUT"))) {
+        try {
+          int timeout = Integer.parseInt(value);
+          value = Integer.toString(timeout * 1000);
+        } catch (NumberFormatException e) {
+          logError(originalKey, e);
+        }
+      }
 
       if (keysWithListAdoption.contains(key) && value != null
           && (value.startsWith("+") || value.startsWith("-") || value.startsWith("^"))) {
@@ -264,6 +265,14 @@ private String find(String key) {
       return value;
     }
 
+    private void logError(String originalKey, NumberFormatException e) {
+      Logger logger = JSch.getLogger();
+      if (logger != null) {
+        logger.log(Logger.ERROR, "Error during parsing of " + originalKey + ": " + e.getMessage(),
+            e);
+      }
+    }
+
     private String[] multiFind(String key) {
       key = key.toUpperCase(Locale.ROOT);
       Vector<String> value = new Vector<>();
@@ -303,6 +312,7 @@ public int getPort() {
         port = Integer.parseInt(foo);
       } catch (NumberFormatException e) {
         // wrong format
+        logError("Port", e);
       }
       return port;
     }

diff --git a/src/test/java/com/jcraft/jsch/OpenSSHConfigTest.java b/src/test/java/com/jcraft/jsch/OpenSSHConfigTest.java
@@ -102,6 +102,14 @@ void parseFileWithNegations() throws IOException, URISyntaxException {
     assertUserEquals(openSSHConfig, "my.example.org", "u2");
   }
 
+  @ParameterizedTest
+  @ValueSource(strings = {"ConnectTimeout", "ServerAliveInterval"})
+  void timeoutsAreConvertedToMs(String configKey) throws IOException {
+    OpenSSHConfig parse = OpenSSHConfig.parse(configKey + " 42");
+    ConfigRepository.Config config = parse.getConfig("");
+    assertEquals("42000", config.getValue(configKey));
+  }
+
   private void assertUserEquals(OpenSSHConfig openSSHConfig, String host, String expected) {
     final ConfigRepository.Config config = openSSHConfig.getConfig(host);
     assertNotNull(config);