From 172f9ff26c2a07363b37ea83bdaba4ac6ef70226 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 18 Mar 2011 21:00:33 +0000
Subject: [PATCH] Fix issue opendj-92: improve replication thread names
---
opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 87 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index 778ad65..fdfe13a 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -54,12 +55,6 @@
public class ReplSessionSecurity
{
/**
- * Whether the replication server should listen on a secure port.
- * Set false for test purposes only.
- */
- private static boolean useSSL = true;
-
- /**
* Whether replication sessions use SSL encryption.
*/
private boolean sslEncryption;
@@ -155,7 +150,7 @@
private boolean isSecurePort(String serverURL)
{
// Always true unless changed for test purposes.
- return useSSL;
+ return true;
}
/**
@@ -236,56 +231,50 @@
public ProtocolSession createServerSession(Socket socket, int soTimeout)
throws ConfigException, IOException
{
- if (useSSL)
+ try
{
- try
- {
- // Create a new SSL context every time to make sure we pick up the
- // latest contents of the trust store.
- CryptoManager cryptoManager = DirectoryConfig.getCryptoManager();
- SSLContext sslContext = cryptoManager.getSslContext(sslCertNickname);
- SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+ // Create a new SSL context every time to make sure we pick up the
+ // latest contents of the trust store.
+ CryptoManager cryptoManager = DirectoryConfig.getCryptoManager();
+ SSLContext sslContext = cryptoManager.getSslContext(sslCertNickname);
+ SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
- SSLSocket secureSocket = (SSLSocket)
- sslSocketFactory.createSocket(socket,
+ SSLSocket secureSocket = (SSLSocket)
+ sslSocketFactory.createSocket(socket,
socket.getInetAddress().getHostName(),
socket.getPort(), false);
- secureSocket.setUseClientMode(false);
- secureSocket.setNeedClientAuth(true);
- secureSocket.setSoTimeout(soTimeout);
+ secureSocket.setUseClientMode(false);
+ secureSocket.setNeedClientAuth(true);
+ secureSocket.setSoTimeout(soTimeout);
- if (sslProtocols != null)
- {
- secureSocket.setEnabledProtocols(sslProtocols);
- }
-
- if (sslCipherSuites != null)
- {
- secureSocket.setEnabledCipherSuites(sslCipherSuites);
- }
-
- // Force TLS negotiation now.
- secureSocket.startHandshake();
-
-// SSLSession sslSession = secureSocket.getSession();
-// System.out.println("Peer = " + sslSession.getPeerHost() + ":" +
-// sslSession.getPeerPort());
-// System.out.println("Principal = " + sslSession.getPeerPrincipal());
-
- return new TLSSocketSession(socket, secureSocket);
- } catch (SSLException e)
+ if (sslProtocols != null)
{
- // This is probably a connection attempt from an unexpected client
- // log that to warn the administrator.
- InetAddress remHost = socket.getInetAddress();
- Message message = NOTE_SSL_SERVER_CON_ATTEMPT_ERROR.get(remHost.
- getHostName(), remHost.getHostAddress(), e.getLocalizedMessage());
- logError(message);
- return null;
+ secureSocket.setEnabledProtocols(sslProtocols);
}
- } else
+
+ if (sslCipherSuites != null)
+ {
+ secureSocket.setEnabledCipherSuites(sslCipherSuites);
+ }
+
+ // Force TLS negotiation now.
+ secureSocket.startHandshake();
+
+ // SSLSession sslSession = secureSocket.getSession();
+ // System.out.println("Peer = " + sslSession.getPeerHost() + ":" +
+ // sslSession.getPeerPort());
+ // System.out.println("Principal = " + sslSession.getPeerPrincipal());
+
+ return new TLSSocketSession(socket, secureSocket);
+ } catch (SSLException e)
{
- return new SocketSession(socket);
+ // This is probably a connection attempt from an unexpected client
+ // log that to warn the administrator.
+ InetAddress remHost = socket.getInetAddress();
+ Message message = NOTE_SSL_SERVER_CON_ATTEMPT_ERROR.get(remHost.
+ getHostName(), remHost.getHostAddress(), e.getLocalizedMessage());
+ logError(message);
+ return null;
}
}
--
Gitblit v1.10.0