From df59285898b635c3c9f3011609eb7a73e779ecb9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 10:10:50 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK
---
opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java | 170 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 84 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index f8cb256..75b911f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -25,9 +25,6 @@
* Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.io.BufferedWriter;
import java.io.File;
@@ -56,7 +53,10 @@
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
-import org.opends.server.protocols.asn1.ASN1Exception;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.protocols.ldap.BindRequestProtocolOp;
import org.opends.server.protocols.ldap.BindResponseProtocolOp;
import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp;
@@ -65,13 +65,10 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Control;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import org.opends.server.util.PasswordReader;
import static org.opends.messages.ToolMessages.*;
-
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -337,6 +334,13 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message =
@@ -344,13 +348,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
@@ -648,6 +645,13 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message =
@@ -655,13 +659,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
@@ -900,6 +897,14 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -907,13 +912,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
- SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1043,6 +1041,14 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -1050,13 +1056,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
- SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -1479,6 +1478,14 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
+ SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1486,13 +1493,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
- SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1791,6 +1791,14 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
+ SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -1798,13 +1806,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
- SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -2455,6 +2456,13 @@
message);
}
}
+ catch (DecodeException e)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
+ throw new ClientException(
+ LDAPResultCode.CLIENT_SIDE_DECODING_ERROR, message, e);
+ }
catch (IOException ioe)
{
LocalizableMessage message =
@@ -2462,13 +2470,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
@@ -3049,6 +3050,13 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message =
@@ -3056,13 +3064,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
@@ -3278,6 +3279,13 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
@@ -3285,13 +3293,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
@@ -3451,6 +3452,14 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE
+ .get(getExceptionMessage(ae));
+ throw new ClientException(
+ LDAPResultCode.CLIENT_SIDE_DECODING_ERROR, message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
@@ -3458,13 +3467,6 @@
throw new ClientException(LDAPResultCode.CLIENT_SIDE_SERVER_DOWN,
message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
- getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
@@ -3655,6 +3657,13 @@
message);
}
}
+ catch (DecodeException ae)
+ {
+ LocalizableMessage message =
+ ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(ae));
+ throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
+ message, ae);
+ }
catch (IOException ioe)
{
LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(
@@ -3662,13 +3671,6 @@
throw new ClientException(
LDAPResultCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
}
- catch (ASN1Exception ae)
- {
- LocalizableMessage message =
- ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(ae));
- throw new ClientException(LDAPResultCode.CLIENT_SIDE_DECODING_ERROR,
- message, ae);
- }
catch (LDAPException le)
{
LocalizableMessage message =
--
Gitblit v1.10.0