[java-opensaml] 04/04: JPAR-85 - Checkstyle, check final variables
Tom Zeller
tzeller at dragonacea.biz
Wed Aug 9 22:49:43 EDT 2017
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=b98b77da3183768781d623862af74a162d82cb01
commit b98b77da3183768781d623862af74a162d82cb01
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 21:48:19 2017 -0500
JPAR-85 - Checkstyle, check final variables
---
...ClientTLSValidationConfiguratonInitializer.java | 4 +--
.../impl/EvaluableCredentialCriteriaRegistry.java | 24 ++++++-------
.../impl/EvaluableEntityIDCredentialCriterion.java | 4 +--
.../EvaluableKeyAlgorithmCredentialCriterion.java | 8 ++---
.../EvaluableKeyLengthCredentialCriterion.java | 6 ++--
.../impl/EvaluableKeyNameCredentialCriterion.java | 4 +--
.../EvaluablePublicKeyCredentialCriterion.java | 4 +--
.../impl/EvaluableUsageCredentialCriterion.java | 4 +--
...aluableX509CertSelectorCredentialCriterion.java | 4 +--
.../EvaluableX509DigestCredentialCriterion.java | 12 +++----
...aluableX509IssuerSerialCredentialCriterion.java | 7 ++--
...509SubjectKeyIdentifierCredentialCriterion.java | 6 ++--
...valuableX509SubjectNameCredentialCriterion.java | 4 +--
.../impl/AbstractCredentialResolver.java | 2 +-
...bstractCriteriaFilteringCredentialResolver.java | 10 +++---
.../impl/KeyStoreCredentialResolver.java | 18 +++++-----
.../impl/SecurityEnhancedHttpClientSupport.java | 2 +-
.../impl/SecurityEnhancedTLSSocketFactory.java | 20 +++++------
.../impl/TrustEngineTLSSocketFactory.java | 17 ++++-----
.../impl/BaseClientCertAuthSecurityHandler.java | 10 +++---
.../trust/impl/ExplicitKeyTrustEngine.java | 2 +-
.../trust/impl/ExplicitKeyTrustEvaluator.java | 4 +--
.../impl/ExplicitX509CertificateTrustEngine.java | 2 +-
.../ExplicitX509CertificateTrustEvaluator.java | 10 +++---
.../impl/BasicX509CredentialNameEvaluator.java | 18 +++++-----
.../x509/impl/CertPathPKIXTrustEvaluator.java | 42 +++++++++++-----------
.../x509/impl/PKIXX509CredentialTrustEngine.java | 2 +-
.../StaticPKIXValidationInformationResolver.java | 6 ++--
.../impl/X509KeyManagerX509CredentialAdapter.java | 4 +--
...BasicClientTLSValidationParametersResolver.java | 8 ++---
30 files changed, 135 insertions(+), 133 deletions(-)
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/config/impl/ClientTLSValidationConfiguratonInitializer.java b/opensaml-security-impl/src/main/java/org/opensaml/security/config/impl/ClientTLSValidationConfiguratonInitializer.java
index 204583a..740c571 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/config/impl/ClientTLSValidationConfiguratonInitializer.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/config/impl/ClientTLSValidationConfiguratonInitializer.java
@@ -36,12 +36,12 @@ public class ClientTLSValidationConfiguratonInitializer implements Initializer {
/** {@inheritDoc} */
public void init() throws InitializationException {
- CertificateNameOptions nameOptions = new CertificateNameOptions();
+ final CertificateNameOptions nameOptions = new CertificateNameOptions();
nameOptions.setEvaluateSubjectCommonName(true);
nameOptions.setSubjectAltNames(
new HashSet<>(Arrays.asList(X509Support.DNS_ALT_NAME, X509Support.URI_ALT_NAME)));
- BasicClientTLSValidationConfiguration config = new BasicClientTLSValidationConfiguration();
+ final BasicClientTLSValidationConfiguration config = new BasicClientTLSValidationConfiguration();
config.setCertificateNameOptions(nameOptions);
ConfigurationService.register(ClientTLSValidationConfiguration.class, config);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
index 120f4a8..064591d 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
@@ -74,15 +74,15 @@ public final class EvaluableCredentialCriteriaRegistry {
throws SecurityException {
Constraint.isNotNull(criteria, "Criteria to map cannot be null");
- Logger log = getLogger();
- Class<? extends EvaluableCredentialCriterion> clazz = lookup(criteria.getClass());
+ final Logger log = getLogger();
+ final Class<? extends EvaluableCredentialCriterion> clazz = lookup(criteria.getClass());
if (clazz != null) {
log.debug("Registry located evaluable criteria class {} for criteria class {}", clazz.getName(), criteria
.getClass().getName());
try {
- Constructor<? extends EvaluableCredentialCriterion> constructor =
+ final Constructor<? extends EvaluableCredentialCriterion> constructor =
clazz.getConstructor(new Class[] { criteria.getClass() });
return constructor.newInstance(new Object[] { criteria });
@@ -122,7 +122,7 @@ public final class EvaluableCredentialCriteriaRegistry {
Constraint.isNotNull(criteriaClass, "Criterion class to register cannot be null");
Constraint.isNotNull(evaluableClass, "Evaluable class to register cannot be null");
- Logger log = getLogger();
+ final Logger log = getLogger();
log.debug("Registering class {} as evaluator for class {}", evaluableClass.getName(), criteriaClass.getName());
registry.put(criteriaClass, evaluableClass);
@@ -136,7 +136,7 @@ public final class EvaluableCredentialCriteriaRegistry {
public static synchronized void deregister(@Nonnull final Class<? extends Criterion> criteriaClass) {
Constraint.isNotNull(criteriaClass, "Criterion class to unregister cannot be null");
- Logger log = getLogger();
+ final Logger log = getLogger();
log.debug("Deregistering evaluator for class {}", criteriaClass.getName());
registry.remove(criteriaClass);
}
@@ -145,7 +145,7 @@ public final class EvaluableCredentialCriteriaRegistry {
* Clear all mappings from the registry.
*/
public static synchronized void clearRegistry() {
- Logger log = getLogger();
+ final Logger log = getLogger();
log.debug("Clearing evaluable criteria registry");
registry.clear();
@@ -204,22 +204,22 @@ public final class EvaluableCredentialCriteriaRegistry {
/**
* Load a set of criteria-evaluator mappings from the supplied properties set.
*
- * @param mappings properies set where the key is the criteria class name, the value is the evaluator class name
+ * @param mappings properties set where the key is the criteria class name, the value is the evaluator class name
*/
public static synchronized void loadMappings(@Nonnull final Properties mappings) {
Constraint.isNotNull(mappings, "Mappings to load cannot be null");
- Logger log = getLogger();
- for (Object key : mappings.keySet()) {
+ final Logger log = getLogger();
+ for (final Object key : mappings.keySet()) {
if (!(key instanceof String)) {
log.error("Properties key was not an instance of String, was '{}', skipping...",
key.getClass().getName());
continue;
}
- String criteriaName = (String) key;
- String evaluatorName = mappings.getProperty(criteriaName);
+ final String criteriaName = (String) key;
+ final String evaluatorName = mappings.getProperty(criteriaName);
- ClassLoader classLoader = XMLObjectProviderRegistrySupport.class.getClassLoader();
+ final ClassLoader classLoader = XMLObjectProviderRegistrySupport.class.getClassLoader();
Class criteriaClass = null;
try {
criteriaClass = classLoader.loadClass(criteriaName);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
index 5ab7d1c..567608d 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
@@ -58,7 +58,7 @@ public class EvaluableEntityIDCredentialCriterion extends AbstractTriStatePredic
* @param entity the criteria value which is the basis for evaluation
*/
public EvaluableEntityIDCredentialCriterion(@Nonnull final String entity) {
- String trimmed = StringSupport.trimOrNull(entity);
+ final String trimmed = StringSupport.trimOrNull(entity);
Constraint.isNotNull(trimmed, "EntityID criteria cannot be null or empty");
entityID = trimmed;
@@ -78,7 +78,7 @@ public class EvaluableEntityIDCredentialCriterion extends AbstractTriStatePredic
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableEntityIDCredentialCriterion [entityID=");
builder.append(entityID);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
index 667f296..73aaf18 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
@@ -58,7 +58,7 @@ public class EvaluableKeyAlgorithmCredentialCriterion extends AbstractTriStatePr
* @param newKeyAlgorithm the criteria value which is the basis for evaluation
*/
public EvaluableKeyAlgorithmCredentialCriterion(@Nonnull final String newKeyAlgorithm) {
- String trimmed = StringSupport.trimOrNull(newKeyAlgorithm);
+ final String trimmed = StringSupport.trimOrNull(newKeyAlgorithm);
Constraint.isNotNull(trimmed, "Key algorithm cannot be null or empty");
keyAlgorithm = trimmed;
@@ -71,13 +71,13 @@ public class EvaluableKeyAlgorithmCredentialCriterion extends AbstractTriStatePr
return isNullInputSatisfies();
}
- Key key = getKey(target);
+ final Key key = getKey(target);
if (key == null) {
log.info("Could not evaluate criteria, credential contained no key");
return isUnevaluableSatisfies();
}
- String algorithm = StringSupport.trimOrNull(key.getAlgorithm());
+ final String algorithm = StringSupport.trimOrNull(key.getAlgorithm());
if (algorithm == null) {
log.info("Could not evaluate criteria, key does not specify an algorithm via getAlgorithm()");
return isUnevaluableSatisfies();
@@ -107,7 +107,7 @@ public class EvaluableKeyAlgorithmCredentialCriterion extends AbstractTriStatePr
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableKeyAlgorithmCredentialCriterion [keyAlgorithm=");
builder.append(keyAlgorithm);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
index d15b570..84bb5ff 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
@@ -68,13 +68,13 @@ public class EvaluableKeyLengthCredentialCriterion extends AbstractTriStatePredi
return isNullInputSatisfies();
}
- Key key = getKey(target);
+ final Key key = getKey(target);
if (key == null) {
log.info("Could not evaluate criteria, credential contained no key");
return isUnevaluableSatisfies();
}
- Integer length = KeySupport.getKeyLength(key);
+ final Integer length = KeySupport.getKeyLength(key);
if (length == null) {
log.info("Could not evaluate criteria, cannot determine length of key");
return isUnevaluableSatisfies();
@@ -104,7 +104,7 @@ public class EvaluableKeyLengthCredentialCriterion extends AbstractTriStatePredi
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableKeyLengthCredentialCriterion [keyLength=");
builder.append(keyLength);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
index 9015429..d6e4db4 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
@@ -57,7 +57,7 @@ public class EvaluableKeyNameCredentialCriterion extends AbstractTriStatePredica
* @param newKeyName the criteria value which is the basis for evaluation
*/
public EvaluableKeyNameCredentialCriterion(@Nonnull final String newKeyName) {
- String trimmed = StringSupport.trimOrNull(newKeyName);
+ final String trimmed = StringSupport.trimOrNull(newKeyName);
Constraint.isNotNull(trimmed, "Key name cannot be null or empty");
keyName = trimmed;
@@ -78,7 +78,7 @@ public class EvaluableKeyNameCredentialCriterion extends AbstractTriStatePredica
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableKeyNameCredentialCriterion [keyName=");
builder.append(keyName);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
index 3949fd1..450f30b 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
@@ -68,7 +68,7 @@ public class EvaluablePublicKeyCredentialCriterion extends AbstractTriStatePredi
return isNullInputSatisfies();
}
- PublicKey key = target.getPublicKey();
+ final PublicKey key = target.getPublicKey();
if (key == null) {
log.info("Credential contained no public key, does not satisfy public key criteria");
return false;
@@ -79,7 +79,7 @@ public class EvaluablePublicKeyCredentialCriterion extends AbstractTriStatePredi
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluablePublicKeyCredentialCriterion [publicKey=");
builder.append(publicKey);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
index a6698e9..7e5763c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
@@ -66,7 +66,7 @@ public class EvaluableUsageCredentialCriterion extends AbstractTriStatePredicate
return isNullInputSatisfies();
}
- UsageType credUsage = target.getUsageType();
+ final UsageType credUsage = target.getUsageType();
if (credUsage == null) {
log.info("Could not evaluate criteria, credential contained no usage specifier");
return isUnevaluableSatisfies();
@@ -91,7 +91,7 @@ public class EvaluableUsageCredentialCriterion extends AbstractTriStatePredicate
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableUsageCredentialCriterion [usage=");
builder.append(usage);
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
index 4e74786..eaa232d 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
@@ -64,7 +64,7 @@ public class EvaluableX509CertSelectorCredentialCriterion extends AbstractTriSta
return false;
}
- X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
+ final X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
if (entityCert == null) {
log.info("X509Credential did not contain an entity certificate, cannot evaluate X509CertSelector criteria");
return false;
@@ -75,7 +75,7 @@ public class EvaluableX509CertSelectorCredentialCriterion extends AbstractTriSta
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableX509CertSelectorCredentialCriterion [certSelector=");
builder.append("<contents not displayable>");
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
index 1df555c..9bcbcb8 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509DigestCredentialCriterion.java
@@ -73,7 +73,7 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
*/
public EvaluableX509DigestCredentialCriterion(@Nonnull final String alg, @Nonnull final byte[] digest) {
x509digest = Constraint.isNotEmpty(digest, "X.509 digest cannot be null or empty");
- String trimmed = StringSupport.trimOrNull(alg);
+ final String trimmed = StringSupport.trimOrNull(alg);
Constraint.isNotNull(trimmed, "Certificate digest algorithm cannot be null or empty");
algorithm = trimmed;
}
@@ -88,15 +88,15 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
return false;
}
- X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
+ final X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
if (entityCert == null) {
log.info("X509Credential did not contain an entity certificate, does not satisfy criteria");
return false;
}
try {
- MessageDigest hasher = MessageDigest.getInstance(algorithm);
- byte[] hashed = hasher.digest(entityCert.getEncoded());
+ final MessageDigest hasher = MessageDigest.getInstance(algorithm);
+ final byte[] hashed = hasher.digest(entityCert.getEncoded());
return Arrays.equals(hashed, x509digest);
} catch (final CertificateEncodingException e) {
log.error("Unable to encode certificate for digest operation", e);
@@ -109,7 +109,7 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableX509DigestCredentialCriterion [algorithm=");
builder.append(algorithm);
builder.append(", x509digest=");
@@ -137,7 +137,7 @@ public final class EvaluableX509DigestCredentialCriterion extends AbstractTriSta
}
if (obj instanceof EvaluableX509DigestCredentialCriterion) {
- EvaluableX509DigestCredentialCriterion other = (EvaluableX509DigestCredentialCriterion) obj;
+ final EvaluableX509DigestCredentialCriterion other = (EvaluableX509DigestCredentialCriterion) obj;
return algorithm.equals(other.algorithm) && Arrays.equals(x509digest, other.x509digest);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
index f5f1c6c..702fa8d 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
@@ -81,7 +81,7 @@ public class EvaluableX509IssuerSerialCredentialCriterion extends AbstractTriSta
return false;
}
- X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
+ final X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
if (entityCert == null) {
log.info("X509Credential did not contain an entity certificate, does not satisfy criteria");
return false;
@@ -92,7 +92,7 @@ public class EvaluableX509IssuerSerialCredentialCriterion extends AbstractTriSta
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableX509IssuerSerialCredentialCriterion [issuer=");
builder.append(issuer.getName());
builder.append(", serialNumber=");
@@ -120,7 +120,8 @@ public class EvaluableX509IssuerSerialCredentialCriterion extends AbstractTriSta
}
if (obj instanceof EvaluableX509IssuerSerialCredentialCriterion) {
- EvaluableX509IssuerSerialCredentialCriterion other = (EvaluableX509IssuerSerialCredentialCriterion) obj;
+ final EvaluableX509IssuerSerialCredentialCriterion other =
+ (EvaluableX509IssuerSerialCredentialCriterion) obj;
return issuer.equals(other.issuer) && serialNumber.equals(other.serialNumber);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
index 85b17f9..5b665bd 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
@@ -76,13 +76,13 @@ public class EvaluableX509SubjectKeyIdentifierCredentialCriterion extends Abstra
return false;
}
- X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
+ final X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
if (entityCert == null) {
log.info("X509Credential did not contain an entity certificate, does not satisfy criteria");
return false;
}
- byte[] credSKI = X509Support.getSubjectKeyIdentifier(entityCert);
+ final byte[] credSKI = X509Support.getSubjectKeyIdentifier(entityCert);
if (credSKI == null || credSKI.length == 0) {
log.info("Could not evaluate criteria, certificate contained no subject key identifier extension");
return isUnevaluableSatisfies();
@@ -93,7 +93,7 @@ public class EvaluableX509SubjectKeyIdentifierCredentialCriterion extends Abstra
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableX509SubjectKeyIdentifierCredentialCriterion [ski=");
builder.append(Hex.encodeHexString(ski));
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
index 6b7ca52..99d9d70 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
@@ -73,7 +73,7 @@ public class EvaluableX509SubjectNameCredentialCriterion extends AbstractTriStat
return false;
}
- X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
+ final X509Certificate entityCert = ((X509Credential) target).getEntityCertificate();
if (entityCert == null) {
log.info("X509Credential did not contain an entity certificate, does not satisfy criteria");
return false;
@@ -84,7 +84,7 @@ public class EvaluableX509SubjectNameCredentialCriterion extends AbstractTriStat
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EvaluableX509SubjectNameCredentialCriterion [subjectName=");
builder.append(subjectName.getName());
builder.append("]");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
index b4d6f58..3f0934d 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
@@ -33,7 +33,7 @@ public abstract class AbstractCredentialResolver implements CredentialResolver {
/** {@inheritDoc} */
@Nullable public Credential resolveSingle(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
- Iterable<Credential> creds = resolve(criteriaSet);
+ final Iterable<Credential> creds = resolve(criteriaSet);
if (creds.iterator().hasNext()) {
return creds.iterator().next();
} else {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
index f30a039..1297753 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
@@ -59,8 +59,8 @@ public abstract class AbstractCriteriaFilteringCredentialResolver extends Abstra
/** {@inheritDoc} */
@Nonnull public Iterable<Credential> resolve(@Nullable final CriteriaSet criteriaSet) throws ResolverException {
- Iterable<Credential> storeCandidates = resolveFromSource(criteriaSet);
- Set<Predicate<Credential>> predicates = getPredicates(criteriaSet);
+ final Iterable<Credential> storeCandidates = resolveFromSource(criteriaSet);
+ final Set<Predicate<Credential>> predicates = getPredicates(criteriaSet);
if (predicates.isEmpty()) {
return storeCandidates;
} else {
@@ -118,12 +118,12 @@ public abstract class AbstractCriteriaFilteringCredentialResolver extends Abstra
if (criteriaSet == null) {
return Collections.emptySet();
}
- Set<Predicate<Credential>> predicates = new HashSet<>(criteriaSet.size());
- for (Criterion criteria : criteriaSet) {
+ final Set<Predicate<Credential>> predicates = new HashSet<>(criteriaSet.size());
+ for (final Criterion criteria : criteriaSet) {
if (criteria instanceof EvaluableCredentialCriterion) {
predicates.add((EvaluableCredentialCriterion) criteria);
} else {
- EvaluableCredentialCriterion evaluableCriteria;
+ final EvaluableCredentialCriterion evaluableCriteria;
try {
evaluableCriteria = EvaluableCredentialCriteriaRegistry.getEvaluator(criteria);
} catch (final SecurityException e) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
index f37360a..77b2a70 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
@@ -112,9 +112,9 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
checkCriteriaRequirements(criteriaSet);
- String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();
- UsageCriterion usageCriteria = criteriaSet.get(UsageCriterion.class);
- UsageType usage;
+ final String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();
+ final UsageCriterion usageCriteria = criteriaSet.get(UsageCriterion.class);
+ final UsageType usage;
if (usageCriteria != null) {
usage = usageCriteria.getUsage();
} else {
@@ -148,7 +148,7 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
return Collections.emptySet();
}
- Credential credential = buildCredential(keyStoreEntry, entityID, keystoreUsage);
+ final Credential credential = buildCredential(keyStoreEntry, entityID, keystoreUsage);
return Collections.singleton(credential);
}
@@ -219,13 +219,13 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
log.debug("Processing TrustedCertificateEntry from keystore");
- X509Certificate cert = (X509Certificate) trustedCertEntry.getTrustedCertificate();
+ final X509Certificate cert = (X509Certificate) trustedCertEntry.getTrustedCertificate();
- BasicX509Credential credential = new BasicX509Credential(cert);
+ final BasicX509Credential credential = new BasicX509Credential(cert);
credential.setEntityId(entityID);
credential.setUsageType(usage);
- ArrayList<X509Certificate> certChain = new ArrayList<>();
+ final ArrayList<X509Certificate> certChain = new ArrayList<>();
certChain.add(cert);
credential.setEntityCertificateChain(certChain);
@@ -245,7 +245,7 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
log.debug("Processing PrivateKeyEntry from keystore");
- BasicX509Credential credential =
+ final BasicX509Credential credential =
new BasicX509Credential((X509Certificate) privateKeyEntry.getCertificate(),
privateKeyEntry.getPrivateKey());
credential.setEntityId(entityID);
@@ -268,7 +268,7 @@ public class KeyStoreCredentialResolver extends AbstractCriteriaFilteringCredent
@Nonnull final String entityID, @Nonnull final UsageType usage) {
log.debug("Processing SecretKeyEntry from keystore");
- BasicCredential credential = new BasicCredential(secretKeyEntry.getSecretKey());
+ final BasicCredential credential = new BasicCredential(secretKeyEntry.getSecretKey());
credential.setEntityId(entityID);
credential.setUsageType(usage);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
index 543455f..8304699 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
@@ -123,7 +123,7 @@ public final class SecurityEnhancedHttpClientSupport {
@Nonnull public static LayeredConnectionSocketFactory buildTLSSocketFactory(final boolean supportTrustEngine,
final boolean supportClientTLS) {
- TLSSocketFactoryBuilder wrappedFactoryBuilder = new TLSSocketFactoryBuilder();
+ final TLSSocketFactoryBuilder wrappedFactoryBuilder = new TLSSocketFactoryBuilder();
if (supportTrustEngine || supportClientTLS) {
wrappedFactoryBuilder.setHostnameVerifier(new AllowAllHostnameVerifier());
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
index 64ec5c9..5ef94b9 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
@@ -206,7 +206,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
log.trace("In connectSocket");
try {
setup(context);
- Socket socket =
+ final Socket socket =
wrappedFactory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
performTrustEval(socket, host.getHostName(), context);
performHostnameVerification(socket, host.getHostName(), context);
@@ -223,7 +223,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
log.trace("In createLayeredSocket");
try {
setup(context);
- Socket layeredSocket = wrappedFactory.createLayeredSocket(socket, target, port, context);
+ final Socket layeredSocket = wrappedFactory.createLayeredSocket(socket, target, port, context);
performTrustEval(layeredSocket, target, context);
performHostnameVerification(layeredSocket, target, context);
return layeredSocket;
@@ -274,11 +274,11 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
log.debug("Socket was not an instance of SSLSocket, skipping trust eval");
return;
}
- SSLSocket sslSocket = (SSLSocket) socket;
+ final SSLSocket sslSocket = (SSLSocket) socket;
log.debug("Attempting to evaluate server TLS credential against supplied TrustEngine and CriteriaSet");
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") final
TrustEngine<? super X509Credential> trustEngine = (TrustEngine<? super X509Credential>) context.getAttribute(
HttpClientSecurityConstants.CONTEXT_KEY_TRUST_ENGINE);
if (trustEngine == null) {
@@ -306,7 +306,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
log.trace("Saw CriteriaSet: {}", criteriaSet);
}
- X509Credential credential = extractCredential(sslSocket);
+ final X509Credential credential = extractCredential(sslSocket);
try {
if (trustEngine.validate(credential, criteriaSet)) {
@@ -336,20 +336,20 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
* @throws IOException if credential data can not be extracted from the socket
*/
@Nonnull protected X509Credential extractCredential(@Nonnull final SSLSocket sslSocket) throws IOException {
- SSLSession session = sslSocket.getSession();
+ final SSLSession session = sslSocket.getSession();
final Certificate[] peerCertificates = session.getPeerCertificates();
if (peerCertificates == null || peerCertificates.length < 1) {
throw new SSLPeerUnverifiedException("SSLSession peer certificates array was null or empty");
}
- ArrayList<X509Certificate> certChain = new ArrayList<>();
- for (Certificate cert : peerCertificates) {
+ final ArrayList<X509Certificate> certChain = new ArrayList<>();
+ for (final Certificate cert : peerCertificates) {
certChain.add((X509Certificate) cert);
}
final X509Certificate entityCert = certChain.get(0);
- BasicX509Credential credential = new BasicX509Credential(entityCert);
+ final BasicX509Credential credential = new BasicX509Credential(entityCert);
credential.setEntityCertificateChain(certChain);
return credential;
@@ -383,7 +383,7 @@ public class SecurityEnhancedTLSSocketFactory implements LayeredConnectionSocket
return;
}
if (!ThreadLocalX509CredentialContext.haveCurrent()) {
- X509Credential credential =
+ final X509Credential credential =
(X509Credential) context.getAttribute(
HttpClientSecurityConstants.CONTEXT_KEY_CLIENT_TLS_CREDENTIAL);
if (credential != null) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
index 7b24375..c45f5f3 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
@@ -119,7 +119,8 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
final HttpContext context) throws IOException {
log.trace("In connectSocket");
- Socket socket = wrappedFactory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
+ final Socket socket =
+ wrappedFactory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
performTrustEval(socket, context);
performHostnameVerification(socket, host.getHostName(), context);
return socket;
@@ -131,7 +132,7 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
public Socket createLayeredSocket(final Socket socket, final String target, final int port,
final HttpContext context) throws IOException {
log.trace("In createLayeredSocket");
- Socket layeredSocket = wrappedFactory.createLayeredSocket(socket, target, port, context);
+ final Socket layeredSocket = wrappedFactory.createLayeredSocket(socket, target, port, context);
performTrustEval(layeredSocket, context);
performHostnameVerification(layeredSocket, target, context);
return layeredSocket;
@@ -159,7 +160,7 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
log.debug("Attempting to evaluate server TLS credential against supplied TrustEngine and CriteriaSet");
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") final
TrustEngine<? super X509Credential> trustEngine = (TrustEngine<? super X509Credential>) context.getAttribute(
HttpClientSecurityConstants.CONTEXT_KEY_TRUST_ENGINE);
if (trustEngine == null) {
@@ -178,7 +179,7 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
log.trace("Saw CriteriaSet: {}", criteriaSet);
}
- X509Credential credential = extractCredential(sslSocket);
+ final X509Credential credential = extractCredential(sslSocket);
try {
if (trustEngine.validate(credential, criteriaSet)) {
@@ -208,20 +209,20 @@ public class TrustEngineTLSSocketFactory implements LayeredConnectionSocketFacto
* @throws IOException if credential data can not be extracted from the socket
*/
@Nonnull protected X509Credential extractCredential(@Nonnull final SSLSocket sslSocket) throws IOException {
- SSLSession session = sslSocket.getSession();
+ final SSLSession session = sslSocket.getSession();
final Certificate[] peerCertificates = session.getPeerCertificates();
if (peerCertificates == null || peerCertificates.length < 1) {
throw new SSLPeerUnverifiedException("SSLSession peer certificates array was null or empty");
}
- ArrayList<X509Certificate> certChain = new ArrayList<>();
- for (Certificate cert : peerCertificates) {
+ final ArrayList<X509Certificate> certChain = new ArrayList<>();
+ for (final Certificate cert : peerCertificates) {
certChain.add((X509Certificate) cert);
}
final X509Certificate entityCert = certChain.get(0);
- BasicX509Credential credential = new BasicX509Credential(entityCert);
+ final BasicX509Credential credential = new BasicX509Credential(entityCert);
credential.setEntityCertificateChain(certChain);
return credential;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
index 276e857..ef5d3ef 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
@@ -488,7 +488,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
@Nullable protected String getCommonName(@Nonnull final X509Certificate cert) {
final List<String> names = X509Support.getCommonNames(cert.getSubjectX500Principal());
if (names != null && !names.isEmpty()) {
- String name = names.get(0);
+ final String name = names.get(0);
log.debug("{} Extracted common name from certificate: {}", getLogPrefix(), name);
return name;
}
@@ -528,10 +528,10 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
@Nonnull @NonnullElements protected List<String> getAltNames(@Nonnull final X509Certificate cert,
@Nonnull final Integer altNameType) {
log.debug("{} Extracting alt names from certificate of type: {}", getLogPrefix(), altNameType.toString());
- Integer[] nameTypes = new Integer[] {altNameType};
- List altNames = X509Support.getAltNames(cert, nameTypes);
- List<String> names = new ArrayList<>();
- for (Object altNameValue : altNames) {
+ final Integer[] nameTypes = new Integer[] {altNameType};
+ final List altNames = X509Support.getAltNames(cert, nameTypes);
+ final List<String> names = new ArrayList<>();
+ for (final Object altNameValue : altNames) {
if (!(altNameValue instanceof String)) {
log.debug("{} Skipping non-String certificate alt name value", getLogPrefix());
} else {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
index 35908f1..c200aee 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
@@ -76,7 +76,7 @@ public class ExplicitKeyTrustEngine implements TrustedCredentialTrustEngine<Cred
log.debug("Attempting to validate untrusted credential");
try {
- Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
+ final Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
return trustEvaluator.validate(untrustedCredential, trustedCredentials);
} catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted credentials", e);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEvaluator.java
index 44194df..71c6ee2 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEvaluator.java
@@ -54,7 +54,7 @@ public class ExplicitKeyTrustEvaluator {
* @return true if trust can be established, false otherwise
*/
public boolean validate(@Nonnull final Key untrustedKey, @Nonnull final Iterable<Key> trustedKeys) {
- for (Key trustedKey : trustedKeys) {
+ for (final Key trustedKey : trustedKeys) {
if (untrustedKey.equals(trustedKey)) {
return true;
}
@@ -108,7 +108,7 @@ public class ExplicitKeyTrustEvaluator {
public boolean validate(@Nonnull final Credential untrustedCredential,
@Nonnull final Iterable<Credential> trustedCredentials) {
- for (Credential trustedCredential : trustedCredentials) {
+ for (final Credential trustedCredential : trustedCredentials) {
if (validate(untrustedCredential, trustedCredential)) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
index 97863b1..0e9a017 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
@@ -78,7 +78,7 @@ public class ExplicitX509CertificateTrustEngine implements TrustedCredentialTrus
log.debug("Attempting to validate untrusted credential");
try {
- Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
+ final Iterable<Credential> trustedCredentials = getCredentialResolver().resolve(trustBasisCriteria);
return trustEvaluator.validate(untrustedCredential, trustedCredentials);
} catch (final ResolverException e) {
throw new SecurityException("Error resolving trusted credentials", e);
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEvaluator.java
index b60fa29..c36cacc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEvaluator.java
@@ -59,7 +59,7 @@ public class ExplicitX509CertificateTrustEvaluator {
public boolean validate(@Nonnull final X509Certificate untrustedCertificate,
@Nonnull final Iterable<X509Certificate> trustedCertificates) {
- for (X509Certificate trustedCertificate : trustedCertificates) {
+ for (final X509Certificate trustedCertificate : trustedCertificates) {
if (untrustedCertificate.equals(trustedCertificate)) {
return true;
}
@@ -77,8 +77,8 @@ public class ExplicitX509CertificateTrustEvaluator {
public boolean validate(@Nonnull final X509Credential untrustedCredential,
@Nonnull final X509Credential trustedCredential) {
- X509Certificate untrustedCertificate = untrustedCredential.getEntityCertificate();
- X509Certificate trustedCertificate = trustedCredential.getEntityCertificate();
+ final X509Certificate untrustedCertificate = untrustedCredential.getEntityCertificate();
+ final X509Certificate trustedCertificate = trustedCredential.getEntityCertificate();
if (untrustedCertificate == null) {
log.debug("Untrusted credential contained no entity certificate, unable to evaluate");
return false;
@@ -106,12 +106,12 @@ public class ExplicitX509CertificateTrustEvaluator {
public boolean validate(@Nonnull final X509Credential untrustedCredential,
@Nonnull final Iterable<Credential> trustedCredentials) {
- for (Credential trustedCredential : trustedCredentials) {
+ for (final Credential trustedCredential : trustedCredentials) {
if (!(trustedCredential instanceof X509Credential)) {
log.debug("Skipping evaluation against trusted, non-X509Credential");
continue;
}
- X509Credential trustedX509Credential = (X509Credential) trustedCredential;
+ final X509Credential trustedX509Credential = (X509Credential) trustedCredential;
if (validate(untrustedCredential, trustedX509Credential)) {
return true;
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
index 8886685..c54675f 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
@@ -266,7 +266,7 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
*/
protected boolean processNameChecks(@Nonnull final X509Credential credential,
@Nonnull final Set<String> trustedNames) {
- X509Certificate entityCertificate = credential.getEntityCertificate();
+ final X509Certificate entityCertificate = credential.getEntityCertificate();
if (checkSubjectAltNames()) {
if (processSubjectAltNames(entityCertificate, trustedNames)) {
@@ -315,14 +315,14 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
@Nonnull final Set<String> trustedNames) {
log.debug("Processing subject DN common name");
- X500Principal subjectPrincipal = certificate.getSubjectX500Principal();
- List<String> commonNames = X509Support.getCommonNames(subjectPrincipal);
+ final X500Principal subjectPrincipal = certificate.getSubjectX500Principal();
+ final List<String> commonNames = X509Support.getCommonNames(subjectPrincipal);
if (commonNames == null || commonNames.isEmpty()) {
return false;
}
// TODO We only check the first one returned by X509Support. Maybe we should check all,
// if there are multiple CN AVA's from the same (first) RDN.
- String commonName = commonNames.get(0);
+ final String commonName = commonNames.get(0);
log.debug("Extracted common name from certificate: {}", commonName);
if (!Strings.isNullOrEmpty(commonName) && trustedNames.contains(commonName)) {
@@ -345,12 +345,12 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
@Nonnull final Set<String> trustedNames) {
log.debug("Processing subject DN");
- X500Principal subjectPrincipal = certificate.getSubjectX500Principal();
+ final X500Principal subjectPrincipal = certificate.getSubjectX500Principal();
if (log.isDebugEnabled()) {
log.debug("Extracted X500Principal from certificate: {}", x500DNHandler.getName(subjectPrincipal));
}
- for (String trustedName : trustedNames) {
+ for (final String trustedName : trustedNames) {
X500Principal trustedNamePrincipal = null;
try {
trustedNamePrincipal = x500DNHandler.parse(trustedName);
@@ -384,14 +384,14 @@ public class BasicX509CredentialNameEvaluator implements X509CredentialNameEvalu
@Nonnull final Set<String> trustedNames) {
log.debug("Processing subject alt names");
- Integer[] nameTypes = new Integer[getSubjectAltNameTypes().size()];
+ final Integer[] nameTypes = new Integer[getSubjectAltNameTypes().size()];
getSubjectAltNameTypes().toArray(nameTypes);
- List altNames = X509Support.getAltNames(certificate, nameTypes);
+ final List altNames = X509Support.getAltNames(certificate, nameTypes);
if (altNames != null) {
log.debug("Extracted subject alt names from certificate: {}", altNames);
- for (Object altName : altNames) {
+ for (final Object altName : altNames) {
if (trustedNames.contains(altName)) {
log.debug("Matched subject alt name to trusted names: {}", altName.toString());
return true;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
index 651d240..45d121b 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
@@ -133,12 +133,12 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
}
try {
- PKIXBuilderParameters params = getPKIXBuilderParameters(validationInfo, untrustedCredential);
+ final PKIXBuilderParameters params = getPKIXBuilderParameters(validationInfo, untrustedCredential);
log.trace("Building certificate validation path");
- CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
- PKIXCertPathBuilderResult buildResult = (PKIXCertPathBuilderResult) builder.build(params);
+ final CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
+ final PKIXCertPathBuilderResult buildResult = (PKIXCertPathBuilderResult) builder.build(params);
if (log.isDebugEnabled()) {
logCertPathDebug(buildResult, untrustedCredential.getEntityCertificate());
log.debug("PKIX validation succeeded for untrusted credential: {}",
@@ -174,23 +174,23 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
*/
protected PKIXBuilderParameters getPKIXBuilderParameters(@Nonnull final PKIXValidationInformation validationInfo,
@Nonnull final X509Credential untrustedCredential) throws GeneralSecurityException {
- Set<TrustAnchor> trustAnchors = getTrustAnchors(validationInfo);
+ final Set<TrustAnchor> trustAnchors = getTrustAnchors(validationInfo);
if (trustAnchors == null || trustAnchors.isEmpty()) {
throw new GeneralSecurityException(
"Unable to validate X509 certificate, no trust anchors found in the PKIX validation information");
}
- X509CertSelector selector = new X509CertSelector();
+ final X509CertSelector selector = new X509CertSelector();
selector.setCertificate(untrustedCredential.getEntityCertificate());
log.trace("Adding trust anchors to PKIX validator parameters");
- PKIXBuilderParameters params = new PKIXBuilderParameters(trustAnchors, selector);
+ final PKIXBuilderParameters params = new PKIXBuilderParameters(trustAnchors, selector);
- Integer effectiveVerifyDepth = getEffectiveVerificationDepth(validationInfo);
+ final Integer effectiveVerifyDepth = getEffectiveVerificationDepth(validationInfo);
log.trace("Setting max verification depth to: {} ", effectiveVerifyDepth);
params.setMaxPathLength(effectiveVerifyDepth);
- CertStore certStore = buildCertStore(validationInfo, untrustedCredential);
+ final CertStore certStore = buildCertStore(validationInfo, untrustedCredential);
params.addCertStore(certStore);
boolean isForceRevocationEnabled = false;
@@ -199,7 +199,7 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
boolean anyPolicyInhibited = false;
Set<String> initialPolicies = null;
if (options instanceof CertPathPKIXValidationOptions) {
- CertPathPKIXValidationOptions certpathOptions = (CertPathPKIXValidationOptions) options;
+ final CertPathPKIXValidationOptions certpathOptions = (CertPathPKIXValidationOptions) options;
isForceRevocationEnabled = certpathOptions.isForceRevocationEnabled();
forcedRevocation = certpathOptions.isRevocationEnabled();
policyMappingInhibited = certpathOptions.isPolicyMappingInhibited();
@@ -278,19 +278,19 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
* @return trust anchors to use during validation
*/
@Nullable protected Set<TrustAnchor> getTrustAnchors(@Nonnull final PKIXValidationInformation validationInfo) {
- Collection<X509Certificate> validationCertificates = validationInfo.getCertificates();
+ final Collection<X509Certificate> validationCertificates = validationInfo.getCertificates();
if (validationCertificates == null || validationCertificates.isEmpty()) {
return null;
}
log.trace("Constructing trust anchors for PKIX validation");
- Set<TrustAnchor> trustAnchors = new HashSet<>();
- for (X509Certificate cert : validationCertificates) {
+ final Set<TrustAnchor> trustAnchors = new HashSet<>();
+ for (final X509Certificate cert : validationCertificates) {
trustAnchors.add(buildTrustAnchor(cert));
}
if (log.isTraceEnabled()) {
- for (TrustAnchor anchor : trustAnchors) {
+ for (final TrustAnchor anchor : trustAnchors) {
log.trace("TrustAnchor: {}", anchor.toString());
}
}
@@ -327,9 +327,9 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
log.trace("Creating cert store to use during path validation");
log.trace("Adding entity certificate chain to cert store");
- List<Object> storeMaterial = new ArrayList<Object>(untrustedCredential.getEntityCertificateChain());
+ final List<Object> storeMaterial = new ArrayList<Object>(untrustedCredential.getEntityCertificateChain());
if (log.isTraceEnabled()) {
- for (X509Certificate cert : untrustedCredential.getEntityCertificateChain()) {
+ for (final X509Certificate cert : untrustedCredential.getEntityCertificateChain()) {
log.trace(String.format("Added X509Certificate from entity cert chain to cert store "
+ "with subject name '%s' issued by '%s' with serial number '%s'",
getX500DNHandler().getName(cert.getSubjectX500Principal()),
@@ -338,7 +338,7 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
}
}
- Date now = new Date();
+ final Date now = new Date();
Collection<X509CRL> crls = validationInfo.getCRLs();
if (crls != null && !crls.isEmpty()) {
@@ -367,9 +367,9 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
protected void addCRLsToStoreMaterial(@Nonnull final List<Object> storeMaterial,
@Nonnull final Collection<X509CRL> crls, @Nonnull final Date now) {
- for (X509CRL crl : crls) {
- boolean isEmpty = crl.getRevokedCertificates() == null || crl.getRevokedCertificates().isEmpty();
- boolean isExpired = crl.getNextUpdate().before(now);
+ for (final X509CRL crl : crls) {
+ final boolean isEmpty = crl.getRevokedCertificates() == null || crl.getRevokedCertificates().isEmpty();
+ final boolean isExpired = crl.getNextUpdate().before(now);
if (!isEmpty || options.isProcessEmptyCRLs()) {
if (!isExpired || options.isProcessExpiredCRLs()) {
storeMaterial.add(crl);
@@ -412,11 +412,11 @@ public class CertPathPKIXTrustEvaluator implements PKIXTrustEvaluator {
log.debug("Built valid PKIX cert path");
log.debug("Target certificate: {}", getX500DNHandler().getName(targetCert.getSubjectX500Principal()));
- for (Certificate cert : buildResult.getCertPath().getCertificates()) {
+ for (final Certificate cert : buildResult.getCertPath().getCertificates()) {
log.debug("CertPath certificate: {}", getX500DNHandler().getName(((X509Certificate) cert)
.getSubjectX500Principal()));
}
- TrustAnchor ta = buildResult.getTrustAnchor();
+ final TrustAnchor ta = buildResult.getTrustAnchor();
if (ta.getTrustedCert() != null) {
log.debug("TrustAnchor: {}", getX500DNHandler().getName(ta.getTrustedCert().getSubjectX500Principal()));
} else if (ta.getCA() != null) {
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
index 40287dc..a22dafc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
@@ -182,7 +182,7 @@ public class PKIXX509CredentialTrustEngine implements PKIXTrustEngine<X509Creden
return false;
}
- for (PKIXValidationInformation validationInfo : validationInfoSet) {
+ for (final PKIXValidationInformation validationInfo : validationInfoSet) {
try {
if (getPKIXTrustEvaluator().validate(validationInfo, untrustedX509Credential)) {
log.debug("Credential trust established via PKIX validation");
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
index e0abb30..348acfc 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
@@ -95,14 +95,14 @@ public class StaticPKIXValidationInformationResolver implements PKIXValidationIn
return ImmutableSet.copyOf(trustedNames);
}
- HashSet<String> temp = new HashSet<>(trustedNames);
- EntityIdCriterion entityIDCriterion = criteriaSet.get(EntityIdCriterion.class);
+ final HashSet<String> temp = new HashSet<>(trustedNames);
+ final EntityIdCriterion entityIDCriterion = criteriaSet.get(EntityIdCriterion.class);
if (entityIDCriterion != null) {
temp.add(entityIDCriterion.getEntityId());
}
if (supportDynamicTrustedNames) {
- TrustedNamesCriterion trustedNamesCriterion = criteriaSet.get(TrustedNamesCriterion.class);
+ final TrustedNamesCriterion trustedNamesCriterion = criteriaSet.get(TrustedNamesCriterion.class);
if (trustedNamesCriterion != null) {
temp.addAll(trustedNamesCriterion.getTrustedNames());
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
index cbcd2b8..caa09a4 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java
@@ -64,7 +64,7 @@ public class X509KeyManagerX509CredentialAdapter extends AbstractCredential impl
/** {@inheritDoc} */
@Nonnull public X509Certificate getEntityCertificate() {
- X509Certificate[] certs = keyManager.getCertificateChain(credentialAlias);
+ final X509Certificate[] certs = keyManager.getCertificateChain(credentialAlias);
if (certs != null && certs.length > 0) {
return certs[0];
}
@@ -74,7 +74,7 @@ public class X509KeyManagerX509CredentialAdapter extends AbstractCredential impl
/** {@inheritDoc} */
@Nonnull public Collection<X509Certificate> getEntityCertificateChain() {
- X509Certificate[] certs = keyManager.getCertificateChain(credentialAlias);
+ final X509Certificate[] certs = keyManager.getCertificateChain(credentialAlias);
if (certs != null && certs.length > 0) {
return Arrays.asList(certs);
}
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
index 4f63a19..34bd206 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/x509/tls/impl/BasicClientTLSValidationParametersResolver.java
@@ -50,7 +50,7 @@ public class BasicClientTLSValidationParametersResolver implements ClientTLSVali
/** {@inheritDoc} */
@Nonnull @NonnullElements public Iterable<ClientTLSValidationParameters> resolve(final CriteriaSet criteria)
throws ResolverException {
- ClientTLSValidationParameters params = resolveSingle(criteria);
+ final ClientTLSValidationParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
} else {
@@ -64,7 +64,7 @@ public class BasicClientTLSValidationParametersResolver implements ClientTLSVali
Constraint.isNotNull(criteria.get(ClientTLSValidationConfigurationCriterion.class),
"Resolver requires an instance of ClientTLSValidationConfigurationCriterion");
- ClientTLSValidationParameters params = new ClientTLSValidationParameters();
+ final ClientTLSValidationParameters params = new ClientTLSValidationParameters();
params.setX509TrustEngine(resolveTrustEngine(criteria));
@@ -82,7 +82,7 @@ public class BasicClientTLSValidationParametersResolver implements ClientTLSVali
*/
@Nullable protected TrustEngine<? super X509Credential> resolveTrustEngine(@Nonnull final CriteriaSet criteria) {
- for (ClientTLSValidationConfiguration config :
+ for (final ClientTLSValidationConfiguration config :
criteria.get(ClientTLSValidationConfigurationCriterion.class).getConfigurations()) {
if (config.getX509TrustEngine() != null) {
return config.getX509TrustEngine();
@@ -100,7 +100,7 @@ public class BasicClientTLSValidationParametersResolver implements ClientTLSVali
*/
@Nullable protected CertificateNameOptions resolveNameOptions(@Nonnull final CriteriaSet criteria) {
- for (ClientTLSValidationConfiguration config :
+ for (final ClientTLSValidationConfiguration config :
criteria.get(ClientTLSValidationConfigurationCriterion.class).getConfigurations()) {
if (config.getCertificateNameOptions() != null) {
return config.getCertificateNameOptions();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list