From a4e2fc0298e8d60aa0e4bcfd3304303d952e0972 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 28 Nov 2014 14:52:21 +0000
Subject: [PATCH] OPENDJ-1607 Revert changes to revision 11339
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java | 144 +++++++++++++++++++++++++----------------------
1 files changed, 77 insertions(+), 67 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
index 7ac2692..2d7a493 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
@@ -26,8 +26,13 @@
*/
package com.forgerock.opendj.ldap.tools;
+import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
+import static com.forgerock.opendj.cli.Utils.readBytesFromFile;
+import static com.forgerock.opendj.cli.Utils.secondsToTimeString;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
import org.forgerock.opendj.ldap.LdapException;
@@ -46,11 +51,9 @@
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.cli.AuthenticatedConnectionFactory.AuthenticatedConnection;
import com.forgerock.opendj.util.StaticUtils;
-import static com.forgerock.opendj.cli.Utils.*;
-import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
-
/**
* This class provides utility functions for all the client side tools.
*/
@@ -193,77 +196,84 @@
return ere.getResult().getResultCode().intValue();
}
- static void printPasswordPolicyResults(final ConsoleApplication app, BindResult result) {
- try {
- final AuthorizationIdentityResponseControl control =
- result.getControl(AuthorizationIdentityResponseControl.DECODER, new DecodeOptions());
- if (control != null) {
- final LocalizableMessage message = INFO_BIND_AUTHZID_RETURNED.get(control.getAuthorizationID());
- app.println(message);
- }
- } catch (final DecodeException e) {
- app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
- }
+ static void printPasswordPolicyResults(final ConsoleApplication app, final Connection connection) {
+ if (connection instanceof AuthenticatedConnection) {
+ final AuthenticatedConnection conn = (AuthenticatedConnection) connection;
+ final BindResult result = conn.getAuthenticatedBindResult();
- try {
- final PasswordExpiredResponseControl control =
- result.getControl(PasswordExpiredResponseControl.DECODER,
- new DecodeOptions());
- if (control != null) {
- final LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
- app.println(message);
+ try {
+ final AuthorizationIdentityResponseControl control =
+ result.getControl(AuthorizationIdentityResponseControl.DECODER,
+ new DecodeOptions());
+ if (control != null) {
+ final LocalizableMessage message =
+ INFO_BIND_AUTHZID_RETURNED.get(control.getAuthorizationID());
+ app.println(message);
+ }
+ } catch (final DecodeException e) {
+ app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
}
- } catch (final DecodeException e) {
- app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
- }
- try {
- final PasswordExpiringResponseControl control =
- result.getControl(PasswordExpiringResponseControl.DECODER,
- new DecodeOptions());
- if (control != null) {
- final LocalizableMessage timeString =
- secondsToTimeString(control.getSecondsUntilExpiration());
- final LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
- app.println(message);
- }
- } catch (final DecodeException e) {
- app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
- }
-
- try {
- final PasswordPolicyResponseControl control =
- result.getControl(PasswordPolicyResponseControl.DECODER,
- new DecodeOptions());
- if (control != null) {
- final PasswordPolicyErrorType errorType = control.getErrorType();
- if (errorType == PasswordPolicyErrorType.PASSWORD_EXPIRED) {
+ try {
+ final PasswordExpiredResponseControl control =
+ result.getControl(PasswordExpiredResponseControl.DECODER,
+ new DecodeOptions());
+ if (control != null) {
final LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
app.println(message);
- } else if (errorType == PasswordPolicyErrorType.ACCOUNT_LOCKED) {
- final LocalizableMessage message = INFO_BIND_ACCOUNT_LOCKED.get();
- app.println(message);
- } else if (errorType == PasswordPolicyErrorType.CHANGE_AFTER_RESET) {
-
- final LocalizableMessage message = INFO_BIND_MUST_CHANGE_PASSWORD.get();
- app.println(message);
}
-
- final PasswordPolicyWarningType warningType = control.getWarningType();
- if (warningType == PasswordPolicyWarningType.TIME_BEFORE_EXPIRATION) {
- final LocalizableMessage timeString =
- secondsToTimeString(control.getWarningValue());
- final LocalizableMessage message =
- INFO_BIND_PASSWORD_EXPIRING.get(timeString);
- app.println(message);
- } else if (warningType == PasswordPolicyWarningType.GRACE_LOGINS_REMAINING) {
- final LocalizableMessage message =
- INFO_BIND_GRACE_LOGINS_REMAINING.get(control.getWarningValue());
- app.println(message);
- }
+ } catch (final DecodeException e) {
+ app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
}
- } catch (final DecodeException e) {
- app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
+
+ try {
+ final PasswordExpiringResponseControl control =
+ result.getControl(PasswordExpiringResponseControl.DECODER,
+ new DecodeOptions());
+ if (control != null) {
+ final LocalizableMessage timeString =
+ secondsToTimeString(control.getSecondsUntilExpiration());
+ final LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRING.get(timeString);
+ app.println(message);
+ }
+ } catch (final DecodeException e) {
+ app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
+ }
+
+ try {
+ final PasswordPolicyResponseControl control =
+ result.getControl(PasswordPolicyResponseControl.DECODER,
+ new DecodeOptions());
+ if (control != null) {
+ final PasswordPolicyErrorType errorType = control.getErrorType();
+ if (errorType == PasswordPolicyErrorType.PASSWORD_EXPIRED) {
+ final LocalizableMessage message = INFO_BIND_PASSWORD_EXPIRED.get();
+ app.println(message);
+ } else if (errorType == PasswordPolicyErrorType.ACCOUNT_LOCKED) {
+ final LocalizableMessage message = INFO_BIND_ACCOUNT_LOCKED.get();
+ app.println(message);
+ } else if (errorType == PasswordPolicyErrorType.CHANGE_AFTER_RESET) {
+
+ final LocalizableMessage message = INFO_BIND_MUST_CHANGE_PASSWORD.get();
+ app.println(message);
+ }
+
+ final PasswordPolicyWarningType warningType = control.getWarningType();
+ if (warningType == PasswordPolicyWarningType.TIME_BEFORE_EXPIRATION) {
+ final LocalizableMessage timeString =
+ secondsToTimeString(control.getWarningValue());
+ final LocalizableMessage message =
+ INFO_BIND_PASSWORD_EXPIRING.get(timeString);
+ app.println(message);
+ } else if (warningType == PasswordPolicyWarningType.GRACE_LOGINS_REMAINING) {
+ final LocalizableMessage message =
+ INFO_BIND_GRACE_LOGINS_REMAINING.get(control.getWarningValue());
+ app.println(message);
+ }
+ }
+ } catch (final DecodeException e) {
+ app.errPrintln(ERR_DECODE_CONTROL_FAILURE.get(e.getLocalizedMessage()));
+ }
}
}
--
Gitblit v1.10.0