socket factory delegates that set TCP keepalive #1274

(cherry picked from commit 6ac7109)

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java

@@ -77,6 +77,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.util.ByteArrayDataSource;
+import javax.net.SocketFactory;
 import javax.net.ssl.*;
 import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
@@ -310,7 +311,7 @@ public boolean verify(String hostname, SSLSession session) {
             throw new IllegalArgumentException("no trust manager and default is not an X509TrustManager");
           trustManager = (X509TrustManager) trustMgrs[0];
           sslContext.init(null, trustMgrs, null);
-          clientBldr.sslSocketFactory(sslContext.getSocketFactory(), trustManager);
+          clientBldr.sslSocketFactory(new SSLSocketFactoryDelegator(sslContext.getSocketFactory()), trustManager);
         } catch (KeyStoreException e) {
           throw new IllegalArgumentException("no trust manager and cannot initialize factory for default", e);
         } catch (NoSuchAlgorithmException e) {
@@ -319,8 +320,10 @@ public boolean verify(String hostname, SSLSession session) {
           throw new IllegalArgumentException("no trust manager and cannot initialize context with default", e);
         }
       } else {
-        clientBldr.sslSocketFactory(sslContext.getSocketFactory(), trustManager);
+        clientBldr.sslSocketFactory(new SSLSocketFactoryDelegator(sslContext.getSocketFactory()), trustManager);
       }
+    } else {
+        clientBldr.socketFactory(new SocketFactoryDelegator(SocketFactory.getDefault()));
     }
 
     if ( hostnameVerifier != null ) {
@@ -372,11 +375,10 @@ public void log(String message) {
 
     this.client = clientBldr.build();
     // System.setProperty("javax.net.debug", "all"); // all or ssl
-    /*
-    // long-term alternative to isFirstRequest alive
-    // HttpProtocolParams.setUseExpectContinue(httpParams, false);
-    // httpParams.setIntParameter(CoreProtocolPNames.WAIT_FOR_CONTINUE, 1000);
-    */
+    /* TODO: long-term alternative to isFirstRequest alive
+             HttpProtocolParams.setUseExpectContinue(httpParams, false);
+             httpParams.setIntParameter(CoreProtocolPNames.WAIT_FOR_CONTINUE, 1000);
+     */
   }
 
   public OkHttpClient.Builder configureAuthentication(BasicAuthContext basicAuthContext, OkHttpClient.Builder clientBuilder) {

marklogic-client-api/src/main/java/com/marklogic/client/impl/SSLSocketFactoryDelegator.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020 MarkLogic Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.marklogic.client.impl;
+
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+
+class SSLSocketFactoryDelegator extends SSLSocketFactory {
+    private final SSLSocketFactory delegate;
+
+    SSLSocketFactoryDelegator(SSLSocketFactory delegate) {
+        super();
+        this.delegate = delegate;
+    }
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return delegate.getDefaultCipherSuites();
+    }
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return delegate.getSupportedCipherSuites();
+    }
+
+    @Override
+    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+        return configureSocket(delegate.createSocket(s, host, port, autoClose));
+    }
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        return configureSocket(delegate.createSocket(host, port));
+    }
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localAddress, int localPort) throws IOException {
+        return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
+    }
+    @Override
+    public Socket createSocket(InetAddress address, int port) throws IOException {
+        return configureSocket(delegate.createSocket(address, port));
+    }
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return configureSocket(delegate.createSocket(address, port, localAddress, localPort));
+    }
+    @Override
+    public Socket createSocket(Socket s, InputStream consumed, boolean autoClose) throws IOException {
+        return configureSocket(delegate.createSocket(s, consumed, autoClose));
+    }
+    @Override
+    public Socket createSocket() throws IOException {
+        return configureSocket(delegate.createSocket());
+    }
+
+    private Socket configureSocket(Socket socket) throws SocketException {
+        socket.setKeepAlive(true);
+        return socket;
+    }
+}

marklogic-client-api/src/main/java/com/marklogic/client/impl/SocketFactoryDelegator.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2020 MarkLogic Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.marklogic.client.impl;
+
+import javax.net.SocketFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+
+class SocketFactoryDelegator extends SocketFactory {
+    private final SocketFactory delegate;
+
+    SocketFactoryDelegator(SocketFactory delegate) {
+        super();
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        return configureSocket(delegate.createSocket(host, port));
+    }
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localAddress, int localPort) throws IOException {
+        return configureSocket(delegate.createSocket(host, port, localAddress, localPort));
+    }
+    @Override
+    public Socket createSocket(InetAddress address, int port) throws IOException {
+        return configureSocket(delegate.createSocket(address, port));
+    }
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return configureSocket(delegate.createSocket(address, port, localAddress, localPort));
+    }
+    @Override
+    public Socket createSocket() throws IOException {
+        return configureSocket(delegate.createSocket());
+    }
+
+    private Socket configureSocket(Socket socket) throws SocketException {
+        socket.setKeepAlive(true);
+        return socket;
+    }
+}