From 45a005c7657b9c76c5c70b3fb2bff2841793460f Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 04 Apr 2014 13:54:53 +0000
Subject: [PATCH] OPENDJ-1343 Migrate dsconfig / OPENDJ-1387 - Code cleanup on LDAPConnectionConsoleInteraction.java.
---
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 4
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java | 4
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java | 3
opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 34 ------
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java | 3
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 4
opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 6
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 215 +++++++++++++++++++-----------------------
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 2
10 files changed, 115 insertions(+), 162 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index d70da01..46baca5 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -28,6 +28,7 @@
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
+import static com.forgerock.opendj.cli.Utils.isDN;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -52,7 +53,6 @@
import org.opends.guitools.controlpanel.util.LDAPEntryReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.quicksetup.util.Utils;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.Base64;
@@ -345,7 +345,7 @@
setPrimaryInvalid(lName);
}
String parentDN = this.parentDN.getText().trim();
- if (!Utils.isDn(parentDN))
+ if (!isDN(parentDN))
{
errors.add(ERR_CTRL_PANEL_DUPLICATE_ENTRY_PARENT_DN_NOT_VALID.get());
setPrimaryInvalid(lParentDN);
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index fbb0880..e658e52 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -28,6 +28,7 @@
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
+import static com.forgerock.opendj.cli.Utils.isDN;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -52,7 +53,6 @@
import org.opends.guitools.controlpanel.ui.components.BasicExpander;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.quicksetup.util.Utils;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
@@ -458,7 +458,7 @@
String[] dnArray = s.split("\n");
for (int i=0; i<dnArray.length; i++)
{
- if (!Utils.isDn(dnArray[i]))
+ if (!isDN(dnArray[i]))
{
errors.add(ERR_CTRL_PANEL_DN_NOT_VALID_WITH_VALUE.get(dnArray[i]));
validDn = false;
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 1af49b1..811968f 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -29,6 +29,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.isDN;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -507,7 +508,7 @@
dnInvalid = true;
errors.add(INFO_EMPTY_DIRECTORY_MANAGER_DN.get());
}
- else if (!Utils.isDn(dn.getText()))
+ else if (!isDN(dn.getText()))
{
dnInvalid = true;
errors.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
index 7c804d6..948053e 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -29,6 +29,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.isDN;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -182,7 +183,7 @@
dnInvalid = true;
errors.add(INFO_EMPTY_DIRECTORY_MANAGER_DN.get());
}
- else if (!Utils.isDn(dn.getText()))
+ else if (!isDN(dn.getText()))
{
dnInvalid = true;
errors.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index d98aa15..395b908 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1385,7 +1385,7 @@
println();
stopProcessing = true;
if (ci.promptForCertificateConfirmation(e.getCause(),
- e.getTrustManager(), e.getLdapUrl(), true, logger))
+ e.getTrustManager(), e.getLdapUrl(), logger))
{
reloadTopologyCache = true;
updateTrustManager(userData, ci);
diff --git a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index ab0b77c..3ccb619 100644
--- a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -68,6 +68,8 @@
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.Utils.canWrite;
+import static com.forgerock.opendj.cli.Utils.isDN;
+import static com.forgerock.opendj.cli.Utils.getHostNameForLdapUrl;
/**
* This is an abstract class that is in charge of actually performing the
@@ -3201,7 +3203,7 @@
{
errorMsgs.add(INFO_EMPTY_DIRECTORY_MANAGER_DN.get());
qs.displayFieldInvalid(FieldName.DIRECTORY_MANAGER_DN, true);
- } else if (!isDn(dmDn))
+ } else if (!isDN(dmDn))
{
errorMsgs.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
qs.displayFieldInvalid(FieldName.DIRECTORY_MANAGER_DN, true);
@@ -3921,7 +3923,7 @@
{
// Do nothing, the user does not want to provide a base DN.
baseDn = "";
- } else if (!isDn(baseDn))
+ } else if (!isDN(baseDn))
{
errorMsgs.add(INFO_NOT_A_BASE_DN.get());
qs.displayFieldInvalid(FieldName.DIRECTORY_BASE_DN, true);
diff --git a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 94798ac..7b2f69f 100644
--- a/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -364,26 +364,6 @@
}
/**
- * Returns <CODE>true</CODE> if the the provided string is a DN and
- * <CODE>false</CODE> otherwise.
- * @param dn the String we are analyzing.
- * @return <CODE>true</CODE> if the the provided string is a DN and
- * <CODE>false</CODE> otherwise.
- */
- public static boolean isDn(String dn)
- {
- boolean isDn = true;
- try
- {
- new LdapName(dn);
- } catch (Exception ex)
- {
- isDn = false;
- }
- return isDn;
- }
-
- /**
* Returns <CODE>true</CODE> if the the provided string is a configuration DN
* and <CODE>false</CODE> otherwise.
* @param dn the String we are analyzing.
@@ -734,20 +714,6 @@
}
/**
- * Returns the String that can be used to represent a given host name in a
- * LDAP URL.
- * This method must be used when we have IPv6 addresses (the address in the
- * LDAP URL must be enclosed with brackets).
- * @param host the host name.
- * @return the String that can be used to represent a given host name in a
- * LDAP URL.
- */
- public static String getHostNameForLdapUrl(String host)
- {
- return ConnectionUtils.getHostNameForLdapUrl(host);
- }
-
- /**
* Indicates whether we are in a web start installation or not.
*
* @return <CODE>true</CODE> if we are in a web start installation and
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 452a916..832ba33 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -31,8 +31,8 @@
import static org.opends.messages.ToolMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.canWrite;
-import static org.opends.quicksetup.util.Utils.isDn;
import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;
+import static com.forgerock.opendj.cli.Utils.isDN;
import java.io.File;
import java.io.OutputStream;
@@ -465,7 +465,7 @@
LinkedList<String> baseDNs = baseDNsArg.getValues();
for (String dn : baseDNs)
{
- if (!isDn(dn))
+ if (!isDN(dn))
{
errors.add(ERR_REPLICATION_NOT_A_VALID_BASEDN.get(dn));
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index d200fe1..4af3173 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -4127,7 +4127,7 @@
{
reloadTopology = true;
cancelled = !ci.promptForCertificateConfirmation(e.getCause(),
- e.getTrustManager(), e.getLdapUrl(), true, logger);
+ e.getTrustManager(), e.getLdapUrl(), logger);
}
else
{
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index ce9ebb2..e035984 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -26,6 +26,11 @@
*/
package org.opends.server.util.cli;
+import static com.forgerock.opendj.cli.Utils.isDN;
+import static com.forgerock.opendj.cli.Utils.getAdministratorDN;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
+import static com.forgerock.opendj.cli.CliMessages.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -43,24 +48,22 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.util.ApplicationKeyManager;
import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.quicksetup.Step;
-import org.opends.quicksetup.UserDataCertificateException;
-import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.tools.LDAPConnectionOptions;
import org.opends.server.tools.SSLConnectionException;
import org.opends.server.tools.SSLConnectionFactory;
-import org.opends.server.tools.dsconfig.ArgumentExceptionFactory;
import org.opends.server.util.SelectableCertificateKeyManager;
-import com.forgerock.opendj.cli.*;
-
-import static org.opends.messages.QuickSetupMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.messages.UtilityMessages.*;
+import com.forgerock.opendj.cli.ArgumentException;
+import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.CommandBuilder;
+import com.forgerock.opendj.cli.ConsoleApplication;
+import com.forgerock.opendj.cli.Menu;
+import com.forgerock.opendj.cli.MenuBuilder;
+import com.forgerock.opendj.cli.MenuResult;
+import com.forgerock.opendj.cli.ValidationCallback;
/**
* Supports interacting with a user through the command line to prompt for
@@ -400,7 +403,7 @@
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
@@ -568,7 +571,7 @@
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
@@ -643,12 +646,12 @@
app.println();
if (useAdminOrBindDn)
{
- String def = (adminUID != null ? adminUID : bindDN);
+ String def = adminUID != null ? adminUID : bindDN;
String v =
app.readValidatedInput(
INFO_LDAP_CONN_GLOBAL_ADMINISTRATOR_OR_BINDDN_PROMPT
.get(def), callback);
- if (Utils.isDn(v))
+ if (isDN(v))
{
bindDN = v;
providedBindDN = v;
@@ -680,7 +683,7 @@
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
if (useAdminOrBindDn)
@@ -740,11 +743,11 @@
{
if (useAdmin)
{
- throw ArgumentExceptionFactory.missingBindPassword(adminUID);
+ throw new ArgumentException(ERR_ERROR_NO_ADMIN_PASSWORD.get(adminUID));
}
else
{
- throw ArgumentExceptionFactory.missingBindPassword(bindDN);
+ throw new ArgumentException(ERR_ERROR_NO_ADMIN_PASSWORD.get(bindDN));
}
}
copySecureArgsList.bindPasswordFileArg.clearValues();
@@ -758,8 +761,7 @@
// Read the password from the stdin.
if (!app.isInteractive())
{
- throw ArgumentExceptionFactory
- .unableToReadBindPasswordInteractively();
+ throw new ArgumentException(ERR_ERROR_BIND_PASSWORD_NONINTERACTIVE.get());
}
checkHeadingDisplayed();
@@ -788,7 +790,8 @@
}
catch (Exception e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
}
copySecureArgsList.bindPasswordArg.clearValues();
@@ -802,6 +805,13 @@
connectTimeout = secureArgsList.connectTimeoutArg.getIntValue();
}
+ private void cannotReadConnectionParameters(ClientException e)
+ throws ArgumentException
+ {
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
+ }
+
private String readPassword(LocalizableMessage prompt) throws ClientException
{
final char[] pwd = app.readPassword(prompt);
@@ -972,7 +982,7 @@
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
@@ -1016,7 +1026,8 @@
}
catch (Exception e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
}
}
@@ -1067,7 +1078,8 @@
}
catch (Exception e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
}
@@ -1147,7 +1159,7 @@
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
@@ -1162,8 +1174,8 @@
// KeystorePath is null. Either it's unspecified or there's a pb
// We should throw an exception here, anyway since code below will
// anyway
- throw ArgumentExceptionFactory
- .incompatiblePropertyModification("null keystorePath");
+ throw new ArgumentException(ERR_ERROR_INCOMPATIBLE_PROPERTY_MOD
+ .get("null keystorePath"));
}
// Then the keystore password.
@@ -1176,7 +1188,7 @@
if (keystorePassword == null)
{
- throw ArgumentExceptionFactory.missingBindPassword(keystorePassword);
+ throw new ArgumentException(ERR_ERROR_NO_ADMIN_PASSWORD.get(keystorePassword));
}
}
else if (keystorePassword == null || "-".equals(keystorePassword))
@@ -1184,7 +1196,7 @@
// Read the password from the stdin.
if (!app.isInteractive())
{
- throw ArgumentExceptionFactory.unableToReadBindPasswordInteractively();
+ throw new ArgumentException(ERR_ERROR_BIND_PASSWORD_NONINTERACTIVE.get());
}
checkHeadingDisplayed();
@@ -1198,7 +1210,8 @@
}
catch (Exception e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
}
@@ -1215,7 +1228,8 @@
}
catch (Exception e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
certifNickname = secureArgsList.certNicknameArg.getValue();
@@ -1268,11 +1282,12 @@
}
catch (KeyStoreException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ throw new ArgumentException(ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS
+ .get(e.getMessage()), e.getCause());
}
catch (ClientException e)
{
- throw ArgumentExceptionFactory.unableToReadConnectionParameters(e);
+ cannotReadConnectionParameters(e);
}
}
@@ -1381,15 +1396,15 @@
}
else if (providedAdminUID != null)
{
- dn = ADSContext.getAdministratorDN(providedAdminUID);
+ dn = getAdministratorDN(providedAdminUID);
}
- else if (this.bindDN != null)
+ else if (bindDN != null)
{
- dn = this.bindDN;
+ dn = bindDN;
}
- else if (this.adminUID != null)
+ else if (adminUID != null)
{
- dn = ADSContext.getAdministratorDN(this.adminUID);
+ dn = getAdministratorDN(adminUID);
}
else
{
@@ -1398,11 +1413,11 @@
}
else if (secureArgsList.useAdminUID())
{
- dn = ADSContext.getAdministratorDN(this.adminUID);
+ dn = getAdministratorDN(adminUID);
}
else
{
- dn = this.bindDN;
+ dn = bindDN;
}
return dn;
}
@@ -1415,7 +1430,7 @@
*/
public String getAdministratorUID()
{
- return this.adminUID;
+ return adminUID;
}
/**
@@ -1426,7 +1441,7 @@
*/
public String getBindPassword()
{
- return this.bindPassword;
+ return bindPassword;
}
/**
@@ -1437,7 +1452,7 @@
*/
public ApplicationTrustManager getTrustManager()
{
- return this.trustManager;
+ return trustManager;
}
/**
@@ -1448,7 +1463,7 @@
*/
public KeyStore getKeyStore()
{
- return this.truststore;
+ return truststore;
}
/**
@@ -1459,7 +1474,7 @@
*/
public KeyManager getKeyManager()
{
- return this.keyManager;
+ return keyManager;
}
/**
@@ -1469,7 +1484,7 @@
*/
public boolean isTrustStoreInMemory()
{
- return this.trustStoreInMemory;
+ return trustStoreInMemory;
}
/**
@@ -1479,7 +1494,7 @@
*/
public boolean isTrustAll()
{
- return this.trustAll;
+ return trustAll;
}
/**
@@ -1786,17 +1801,14 @@
* the trustManager used when trying to establish the connection.
* @param usedUrl
* the LDAP URL used to connect to the server.
- * @param displayErrorMessage
- * whether to display an error message before asking to accept the
- * certificate or not.
* @param logger
* the Logger used to log messages.
- * @return <CODE>true</CODE> if the user accepted the certificate and
- * <CODE>false</CODE> otherwise.
+ * @return {@code true} if the user accepted the certificate and
+ * {@code false} otherwise.
*/
public boolean promptForCertificateConfirmation(Throwable t,
ApplicationTrustManager usedTrustManager, String usedUrl,
- boolean displayErrorMessage, LocalizedLogger logger)
+ LocalizedLogger logger)
{
ApplicationTrustManager.Cause cause;
if (usedTrustManager != null)
@@ -1812,22 +1824,8 @@
logger.debug(LocalizableMessage.raw("Certificate exception cause: "
+ cause));
}
- UserDataCertificateException.Type excType = null;
- if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
- {
- excType = UserDataCertificateException.Type.NOT_TRUSTED;
- }
- else if (cause == ApplicationTrustManager.Cause.HOST_NAME_MISMATCH)
- {
- excType = UserDataCertificateException.Type.HOST_NAME_MISMATCH;
- }
- else
- {
- app.println(Utils
- .getThrowableMsg(INFO_ERROR_CONNECTING_TO_LOCAL.get(), t));
- }
- if (excType != null)
+ if (cause != null)
{
String h;
int p;
@@ -1839,68 +1837,55 @@
}
catch (Throwable t1)
{
- if (logger != null)
- {
- logger.warn(LocalizableMessage.raw(
- "Error parsing ldap url of ldap url.", t1));
- }
+ printLogger(logger, "Error parsing ldap url of ldap url. " + t1);
h = INFO_NOT_AVAILABLE_LABEL.get().toString();
p = -1;
}
- UserDataCertificateException udce =
- new UserDataCertificateException(Step.REPLICATION_OPTIONS,
- INFO_CERTIFICATE_EXCEPTION.get(h, p), t, h, p, usedTrustManager
- .getLastRefusedChain(), usedTrustManager
- .getLastRefusedAuthType(), excType);
-
+ String authType = usedTrustManager.getLastRefusedAuthType();
LocalizableMessage msg;
- if (udce.getType() == UserDataCertificateException.Type.NOT_TRUSTED)
+ if (authType.equals(ApplicationTrustManager.Cause.NOT_TRUSTED))
{
- msg =
- INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI.get(udce.getHost(), udce
- .getPort());
+ msg = INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI.get(h, p);
}
else
{
- msg =
- INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI.get(udce.getHost(), udce
- .getPort(), udce.getHost(), udce.getHost(), udce.getPort());
+ msg = INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI.get(h, p, h, h, p);
}
- if (displayErrorMessage)
+ app.println(msg);
+
+ X509Certificate[] chain = usedTrustManager.getLastRefusedChain();
+ if (chain == null)
{
- app.println(msg);
+ printLogger(logger, "Null chain for this certificate exception.");
+ return false;
}
- X509Certificate[] chain = udce.getChain();
- String authType = udce.getAuthType();
- String host = udce.getHost();
- if (logger != null)
+ if (authType == null)
{
- if (chain == null)
- {
- logger.warn(LocalizableMessage
- .raw("The chain is null for the UserDataCertificateException"));
- }
- if (authType == null)
- {
- logger
- .warn(LocalizableMessage
- .raw("The auth type is null for the UserDataCertificateException"));
- }
- if (host == null)
- {
- logger.warn(LocalizableMessage
- .raw("The host is null for the UserDataCertificateException"));
- }
+ printLogger(logger, "Null auth type for this certificate exception.");
}
- if (chain != null)
+ if (h == null)
{
- return checkServerCertificate(chain, authType, host);
+ printLogger(logger, "Null host name for this certificate exception.");
}
+ return checkServerCertificate(chain, authType, h);
+ }
+ else
+ {
+ app.println(getThrowableMsg(INFO_ERROR_CONNECTING_TO_LOCAL.get(), t));
}
return false;
}
+ private void printLogger(final LocalizedLogger logger,
+ final String msg)
+ {
+ if (logger != null)
+ {
+ logger.warn(LocalizableMessage.raw(msg));
+ }
+ }
+
/**
* Sets the heading that is displayed in interactive mode.
*
@@ -1942,8 +1927,8 @@
* Tells whether during interaction we can ask for both the DN or the admin
* UID.
*
- * @return <CODE>true</CODE> if during interaction we can ask for both the DN
- * and the admin UID and <CODE>false</CODE> otherwise.
+ * @return {@code true} if during interaction we can ask for both the DN
+ * and the admin UID and {@code false} otherwise.
*/
public boolean isUseAdminOrBindDn()
{
@@ -2149,7 +2134,8 @@
try
{
// If remote host, return
- if (!InetAddress.getLocalHost().getHostName().equals(hostName))
+ if (!InetAddress.getLocalHost().getHostName().equals(hostName)
+ || secureArgsList.getAdminPortFromConfig() != portNumber)
{
return false;
}
@@ -2167,10 +2153,7 @@
secureArgsList.trustStorePathArg.addValue(truststoreFileAbsolute);
return true;
}
- else
- {
- return false;
- }
+ return false;
}
catch (Exception ex)
{
--
Gitblit v1.10.0