From cdbc97a66ca18d9f74b58c3fbca253f17d4dcd55 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Feb 2016 10:57:43 +0000
Subject: [PATCH] Code cleanups: - remove isEmpty() checks when lists are iterated immediately after - extracted methods - removed {@inheritDoc} javadocs
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 84 +++++++++++++-----------------------------
1 files changed, 26 insertions(+), 58 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 50f4242..5f80c1f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -35,6 +35,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
@@ -44,8 +45,12 @@
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.ldap.LDAPClientConnection;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.InitializationException;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -94,9 +99,6 @@
super();
}
-
-
- /** {@inheritDoc} */
@Override
public void initializeSASLMechanismHandler(
ExternalSASLMechanismHandlerCfg configuration)
@@ -107,18 +109,7 @@
// See if we should attempt to validate client certificates against those in
// the corresponding user's entry.
- switch (configuration.getCertificateValidationPolicy())
- {
- case NEVER:
- validationPolicy = CertificateValidationPolicy.NEVER;
- break;
- case IFPRESENT:
- validationPolicy = CertificateValidationPolicy.IFPRESENT;
- break;
- case ALWAYS:
- validationPolicy = CertificateValidationPolicy.ALWAYS;
- break;
- }
+ validationPolicy = toCertificateValidationPolicy(configuration);
// Get the attribute type to use for validating the certificates. If none
@@ -134,9 +125,19 @@
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_EXTERNAL, this);
}
+ private CertificateValidationPolicy toCertificateValidationPolicy(ExternalSASLMechanismHandlerCfg cfg)
+ {
+ switch (cfg.getCertificateValidationPolicy())
+ {
+ case NEVER:
+ return CertificateValidationPolicy.NEVER;
+ case IFPRESENT:
+ return CertificateValidationPolicy.IFPRESENT;
+ default:
+ return CertificateValidationPolicy.ALWAYS;
+ }
+ }
-
- /** {@inheritDoc} */
@Override
public void finalizeSASLMechanismHandler()
{
@@ -144,10 +145,6 @@
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_EXTERNAL);
}
-
-
-
- /** {@inheritDoc} */
@Override
public void processSASLBind(BindOperation bindOperation)
{
@@ -240,7 +237,7 @@
try
{
ByteString certBytes = ByteString.wrap(clientCertChain[0].getEncoded());
- if (!find(certAttrList, certBytes))
+ if (!findAttributeValue(certAttrList, certBytes))
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -269,7 +266,7 @@
try
{
ByteString certBytes = ByteString.wrap(clientCertChain[0].getEncoded());
- if (!find(certAttrList, certBytes))
+ if (!findAttributeValue(certAttrList, certBytes))
{
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -299,9 +296,7 @@
bindOperation.setResultCode(ResultCode.SUCCESS);
}
-
-
- private boolean find(List<Attribute> certAttrList, ByteString certBytes)
+ private boolean findAttributeValue(List<Attribute> certAttrList, ByteString certBytes)
{
for (Attribute a : certAttrList)
{
@@ -313,9 +308,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isPasswordBased(String mechanism)
{
@@ -323,9 +315,6 @@
return false;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isSecure(String mechanism)
{
@@ -333,9 +322,6 @@
return true;
}
-
-
- /** {@inheritDoc} */
@Override
public boolean isConfigurationAcceptable(
SASLMechanismHandlerCfg configuration,
@@ -346,9 +332,7 @@
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
-
-
- /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
ExternalSASLMechanismHandlerCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -356,9 +340,7 @@
return true;
}
-
-
- /** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
ExternalSASLMechanismHandlerCfg configuration)
{
@@ -367,20 +349,7 @@
// See if we should attempt to validate client certificates against those in
// the corresponding user's entry.
- CertificateValidationPolicy newValidationPolicy =
- CertificateValidationPolicy.ALWAYS;
- switch (configuration.getCertificateValidationPolicy())
- {
- case NEVER:
- newValidationPolicy = CertificateValidationPolicy.NEVER;
- break;
- case IFPRESENT:
- newValidationPolicy = CertificateValidationPolicy.IFPRESENT;
- break;
- case ALWAYS:
- newValidationPolicy = CertificateValidationPolicy.ALWAYS;
- break;
- }
+ CertificateValidationPolicy newValidationPolicy = toCertificateValidationPolicy(configuration);
// Get the attribute type to use for validating the certificates. If none
@@ -403,4 +372,3 @@
return ccr;
}
}
-
--
Gitblit v1.10.0