[#402] Change default SSL HandshakeTimeout -1 -> 10s (see #146) (#411)

Valery Kharseko

23.53.2024 88aec8f06faa1d39466c46490ee13ce50df76222

[#402] Change default SSL HandshakeTimeout -1 -> 10s (see #146) (#411)

 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java

@@ -13,6 +13,7 @@
 *
 * Copyright 2010 Sun Microsystems, Inc.
 * Portions Copyright 2011-2016 ForgeRock AS.
 * Portions Copyright 2019-2024 3A Systems, LLC.
 */
package org.forgerock.opendj.grizzly;

@@ -830,7 +831,7 @@
            
            SSLEngineConfigurator serverSslEngineConfigurator = buildServerSSLEngineConfigurator(sslContext);
            final SSLFilter sslFilter = new SSLFilter(serverSslEngineConfigurator, sslEngineConfigurator);
            sslFilter.setHandshakeTimeout(getLongProperty("org.forgerock.opendj.grizzly.handshakeTimeout", sslFilter.getHandshakeTimeout(TimeUnit.MILLISECONDS)), TimeUnit.MILLISECONDS);
            sslFilter.setHandshakeTimeout(getLongProperty("org.forgerock.opendj.grizzly.handshakeTimeout", 10000), TimeUnit.MILLISECONDS);
            installFilter(sslFilter);
            sslFilter.handshake(connection, completionHandler);
        }

 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java

@@ -13,6 +13,7 @@
 *
 * Copyright 2010 Sun Microsystems, Inc.
 * Portions Copyright 2012-2016 ForgeRock AS.
 * Portions Copyright 2017-2024 3A Systems, LLC.
 */
package org.forgerock.opendj.grizzly;

@@ -399,7 +400,7 @@
                }
                
                SSLFilter sslFilter = new SSLFilter();
                sslFilter.setHandshakeTimeout(getLongProperty("org.forgerock.opendj.grizzly.handshakeTimeout", sslFilter.getHandshakeTimeout(TimeUnit.MILLISECONDS)), TimeUnit.MILLISECONDS);
                sslFilter.setHandshakeTimeout(getLongProperty("org.forgerock.opendj.grizzly.handshakeTimeout", 10000), TimeUnit.MILLISECONDS);
                installFilter(startTls ? new StartTLSFilter(sslFilter) : sslFilter);
                return true;
            }

 opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java

@@ -13,6 +13,7 @@
 *
 * Copyright 2010 Sun Microsystems, Inc.
 * Portions Copyright 2011-2016 ForgeRock AS.
 * Portions Copyright 2019-2024 3A Systems, LLC.
 */

package org.forgerock.opendj.grizzly;
@@ -565,12 +566,12 @@
                    assertThat(context.isClosed()).isFalse();
                    if (config.sendDisconnectNotification) {
                        context.disconnect(ResultCode.BUSY, "busy");
                        for(int i=1;i<10 && !context.isClosed() ;i++) {
                            Thread.sleep(100);
                        }
                    } else {
                        context.disconnect();
                    }
                    for(int i=1;i<100 && !context.isClosed() ;i++) {
                        Thread.sleep(100);
                    }
                    assertThat(context.isClosed()).isTrue();
                }
                // Block until remote close is signalled.