From b4f8838b15342670c31753a484abf0129e3c9653 Mon Sep 17 00:00:00 2001
From: jcduff <jcduff@localhost>
Date: Thu, 23 Oct 2008 14:04:24 +0000
Subject: [PATCH] The commit will bring the following features : - An updated version of the underlying database. BDB JE 3.3 is now used. - Attribute API refactoring providing a better abstraction and offering improved performances. - A new GUI called the Control-Panel to replace the Status-Panel: the specifications for this GUI are available on OpenDS Wiki and contains a link to a mockup. See <https://www.opends.org/wiki/page/ControlPanelUISpecification>. - Some changes in the replication protocol to implement "Assured Replication Mode". The specifications are on OpenDS Wiki at <https://www.opends.org/wiki/page/AssuredMode> and section 7 described some of the replication changes required to support this. Assured Replication is not finished, but the main replication protocol changes to support it are done. As explained by Gilles on an email on the Dev mailing list (http://markmail.org/message/46rgo3meq3vriy4a), with these changes the newer versions of OpenDS may not be able to replicate with OpenDS 1.0 instances. - Support for Service Tags on the platforms where the functionality is available and enabled. Specifications are published at <https://www.opends.org/wiki/page/OpenDSServiceTagEnabled>. For more information on Service Tags see <http://wikis.sun.com/display/ServiceTag/Sun+Service+Tag+FAQ>. - The Admin Connector service. In order to provide agentry of the OpenDS server at any time, a new service has been added, dedicated to the administration, configuration and monitoring of the server. An overview of the Admin Connector service and it's use is available on the OpenDS wiki <https://www.opends.org/wiki/page/ManagingAdministrationTrafficToTheServer> - Updates to the various command line tools to support the Admin Connector service. - Some internal re-architecting of the server to put the foundation of future developments such as virtual directory services. The new NetworkGroups and WorkFlow internal services which have been specified in <https://www.opends.org/wiki/page/BasicOperationRoutingThroughNetworkGroup> are now implemented. - Many bug fixes...
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index d365221..db67e61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -43,6 +43,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.net.InetAddress;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -186,11 +187,20 @@
static private final Logger LOG =
Logger.getLogger(SecureConnectionCliArgs.class.getName());
+ // Defines if the CLI always use the SSL connection type.
+ private boolean alwaysSSL = false;
+
/**
* Creates a new instance of secure arguments.
+ *
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
*/
- public SecureConnectionCliArgs()
+ public SecureConnectionCliArgs(boolean alwaysSSL)
{
+ if (alwaysSSL) {
+ this.alwaysSSL = true;
+ }
}
/**
@@ -423,26 +433,45 @@
argList = new LinkedHashSet<Argument>();
useSSLArg = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
- OPTION_LONG_USE_SSL, INFO_DESCRIPTION_USE_SSL.get());
+ OPTION_LONG_USE_SSL, INFO_DESCRIPTION_USE_SSL.get());
useSSLArg.setPropertyName(OPTION_LONG_USE_SSL);
- argList.add(useSSLArg);
+ if (!alwaysSSL) {
+ argList.add(useSSLArg);
+ } else {
+ // simulate that the useSSL arg has been given in the CLI
+ useSSLArg.setPresent(true);
+ }
useStartTLSArg = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
- OPTION_LONG_START_TLS,
- INFO_DESCRIPTION_START_TLS.get());
+ OPTION_LONG_START_TLS,
+ INFO_DESCRIPTION_START_TLS.get());
useStartTLSArg.setPropertyName(OPTION_LONG_START_TLS);
- argList.add(useStartTLSArg);
+ if (!alwaysSSL) {
+ argList.add(useStartTLSArg);
+ }
+ String defaultHostName;
+ try {
+ defaultHostName = InetAddress.getLocalHost().getHostName();
+ } catch (Exception e) {
+ defaultHostName="Unknown (" + e + ")";
+ }
hostNameArg = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true, INFO_HOST_PLACEHOLDER.get(),
- "localhost",
+ defaultHostName,
null, INFO_DESCRIPTION_HOST.get());
hostNameArg.setPropertyName(OPTION_LONG_HOST);
argList.add(hostNameArg);
+
+ Message portDescription = INFO_DESCRIPTION_PORT.get();
+ if (alwaysSSL) {
+ portDescription = INFO_DESCRIPTION_ADMIN_PORT.get();
+ }
+
portArg = new IntegerArgument("port", OPTION_SHORT_PORT, OPTION_LONG_PORT,
false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
- INFO_DESCRIPTION_PORT.get());
+ portDescription);
portArg.setPropertyName(OPTION_LONG_PORT);
argList.add(portArg);
@@ -650,15 +679,15 @@
}
}
- // Couldn't have at the same time startTLSArg and
- // useSSLArg
+ // Couldn't have at the same time startTLSArg and
+ // useSSLArg
if (useStartTLSArg.isPresent()
&& useSSLArg.isPresent()) {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
useStartTLSArg
.getLongIdentifier(), useSSLArg.getLongIdentifier());
- errors.add(message);
- }
+ errors.add(message);
+ }
if (errors.size() > 0)
{
for (Message error : errors)
@@ -727,6 +756,16 @@
}
/**
+ * Indicate if the SSL mode is always used.
+ *
+ * @return True if SSL mode is always used.
+ */
+ public boolean alwaysSSL()
+ {
+ return alwaysSSL;
+ }
+
+ /**
* Handle TrustStore.
*
* @return The trustStore manager to be used for the command.
--
Gitblit v1.10.0