Apply connectTimeout before SSLSocket.startHandshake to avoid infinite wait in case the connection is broken

[davecramer]

Fixes a report that SSL connections do not honour connection timeout.

[vlsi]

I wonder why don't we get failures in the regular test execution. We might add tests that would configure the default db with tls and execute all tests againt it

[davecramer]

Good question, ever harder will be to test this particular scenario as you have to have a connection to get this far. Postgres doesn't use a separate port for SSL so it would be tough to only block SSL connections.

[davecramer]

@vlsi should we be using sslResponseTimeout instead ?

[vlsi]

I have not checked it, however, I think we should have different settings for "connect timeout" and for "read response timeout".

The case is:

1. You want "read response timeout" to be large enough to cover the longest query you expect in the application. For instance, there might be a reporting query taking 10min, so you might set read response timeout to 10min
2. You want your connects fallback to the workable databases quite quickly, so you don't want to wait for 10 minutes only to recognize the host is not responding

[davecramer]

agreed!

However in this particular case we are connecting so sslResponseTimeout seems more appropriate.

[vlsi]

Frankly, we have connectTimeout, and I do not see reasons to have different value here.

I suggest the following:

--- a/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
+++ b/pgjdbc/src/main/java/org/postgresql/ssl/MakeSSL.java
@@ -36,6 +36,8 @@ public class MakeSSL extends ObjectFactory {
     try {
       newConnection = (SSLSocket) factory.createSocket(stream.getSocket(),
           stream.getHostSpec().getHost(), stream.getHostSpec().getPort(), true);
+      int connectTimeoutSeconds = PGProperty.CONNECT_TIMEOUT.getInt(info);
+      newConnection.setSoTimeout(connectTimeoutSeconds * 1000);
       // We must invoke manually, otherwise the exceptions are hidden
       newConnection.setUseClientMode(true);
       newConnection.startHandshake();
@@ -51,7 +53,8 @@ public class MakeSSL extends ObjectFactory {
     if (sslMode.verifyPeerName()) {
       verifyPeerName(stream, info, newConnection);
     }
+    // Zero timeout (default) means infinite
+    int socketTimeout = PGProperty.SOCKET_TIMEOUT.getInt(info);
+    newConnection.setSoTimeout(socketTimeout * 1000);
     stream.changeSocket(newConnection);
   }

[davecramer]

I've pushed the change above, but then what is the point of SSLResponseTimeout ?

[vlsi]

It might be worth adding tlsConnectTimeout (or connectTimeoutTls), however, I think SSLResponseTimeout is a questionable name for "tls connect timeout"

[davecramer]

It might be worth adding tlsConnectTimeout (or connectTimeoutTls), however, I think SSLResponseTimeout is a questionable name for "tls connect timeout"

Not before releasing this version, but yes, it's a misnomer

[vlsi]

I do not see an easy way to test this, and the code looks good to me