[java-opensaml] 01/02: OSJ-318: Deprecate terms from classes and configuration
Brent Putman
putmanb at georgetown.edu
Thu Mar 11 05:28:40 UTC 2021
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=10dfc1fbd44cb8ff6c0d75e68ac64a99e7cca101
commit 10dfc1fbd44cb8ff6c0d75e68ac64a99e7cca101
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Mar 10 20:03:34 2021 -0500
OSJ-318: Deprecate terms from classes and configuration
---
.../opensaml/saml/saml2/encryption/Decrypter.java | 10 +--
.../filter/impl/EntityAttributesFilter.java | 2 +-
.../resolver/filter/impl/PredicateFilter.java | 4 +-
.../SAMLMetadataEncryptionParametersResolver.java | 82 +++++++++++-----------
...MetadataSignatureSigningParametersResolver.java | 20 +++---
.../impl/BasicEncryptionParametersResolver.java | 56 +++++++--------
.../BasicSignatureSigningParametersResolver.java | 22 +++---
.../support/impl/BaseSignatureTrustEngine.java | 8 +--
.../support/impl/SignatureAlgorithmValidator.java | 18 ++---
9 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java
index 6ba0d5493..796e96794 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java
@@ -86,16 +86,16 @@ public class Decrypter extends org.opensaml.xmlsec.encryption.support.Decrypter
* @param newResolver resolver for data encryption keys.
* @param newKEKResolver resolver for key encryption keys.
* @param newEncKeyResolver resolver for EncryptedKey elements
- * @param whitelistAlgos collection of whitelisted algorithm URIs
- * @param blacklistAlgos collection of blacklisted algorithm URIs
+ * @param includeAlgos collection of included algorithm URIs
+ * @param excludeAlgos collection of excluded algorithm URIs
*/
public Decrypter(@Nullable final KeyInfoCredentialResolver newResolver,
@Nullable final KeyInfoCredentialResolver newKEKResolver,
@Nullable final EncryptedKeyResolver newEncKeyResolver,
- @Nullable final Collection<String> whitelistAlgos,
- @Nullable final Collection<String> blacklistAlgos) {
+ @Nullable final Collection<String> includeAlgos,
+ @Nullable final Collection<String> excludeAlgos) {
- super(newResolver, newKEKResolver, newEncKeyResolver, whitelistAlgos, blacklistAlgos);
+ super(newResolver, newKEKResolver, newEncKeyResolver, includeAlgos, excludeAlgos);
}
/**
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
index 978170217..8844a7270 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
@@ -245,7 +245,7 @@ public class EntityAttributesFilter extends AbstractInitializableComponent imple
}
/**
- * Apply whitelist to metadata on input.
+ * Apply include policy to metadata on input.
*
* @param descriptor input to evaluate
*/
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
index 20b571f1e..eac0dadad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
/**
* A filter that removes any {@link EntityDescriptor} that does or does not match a {@link Predicate}, thus
- * a whitelist or blacklist.
+ * an include or exclude policy.
*
* <p>If an {@link EntitiesDescriptor} does not contain any children after filtering it may, optionally, be removed as
* well. If the root element of the metadata document is an @link EntitiesDescriptor}, it will never be removed,
@@ -71,7 +71,7 @@ public class PredicateFilter implements MetadataFilter {
/**
* Constructor.
*
- * @param dir whether to whitelist or blacklist
+ * @param dir whether to apply an include or an exclude policy
* @param theCondition the predicate to apply to determine inclusion or exclusion
*/
public PredicateFilter(@Nonnull final Direction dir, @Nonnull final Predicate<EntityDescriptor> theCondition) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
index bbff0273b..fa46b7e55 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataEncryptionParametersResolver.java
@@ -174,7 +174,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
/** {@inheritDoc} */
@Override
protected void resolveAndPopulateCredentialsAndAlgorithms(@Nonnull final EncryptionParameters params,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
// Create a new CriteriaSet for input to the metadata credential resolver, explicitly
// setting/forcing an encryption usage criterion.
@@ -196,7 +196,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
key != null ? key.getAlgorithm() : "n/a");
}
- if (checkAndProcessKeyAgreement(params, criteria, whitelistBlacklistPredicate, credential)) {
+ if (checkAndProcessKeyAgreement(params, criteria, includeExcludePredicate, credential)) {
return;
}
@@ -204,10 +204,10 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
credential.getCredentialContextSet().get(SAMLMDCredentialContext.class);
final Pair<String,EncryptionMethod> dataEncryptionAlgorithmAndMethod = resolveDataEncryptionAlgorithm(
- criteria, whitelistBlacklistPredicate, metadataCredContext);
+ criteria, includeExcludePredicate, metadataCredContext);
final Pair<String,EncryptionMethod> keyTransportAlgorithmAndMethod = resolveKeyTransportAlgorithm(
- credential, criteria, whitelistBlacklistPredicate,
+ credential, criteria, includeExcludePredicate,
dataEncryptionAlgorithmAndMethod.getFirst(), metadataCredContext);
if (keyTransportAlgorithmAndMethod.getFirst() == null) {
log.debug("Unable to resolve key transport algorithm for credential with key type '{}', "
@@ -220,7 +220,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
params.setKeyTransportEncryptionAlgorithm(keyTransportAlgorithmAndMethod.getFirst());
params.setDataEncryptionAlgorithm(dataEncryptionAlgorithmAndMethod.getFirst());
- resolveAndPopulateRSAOAEPParams(params, criteria, whitelistBlacklistPredicate,
+ resolveAndPopulateRSAOAEPParams(params, criteria, includeExcludePredicate,
keyTransportAlgorithmAndMethod.getSecond());
processDataEncryptionCredentialAutoGeneration(params);
@@ -234,7 +234,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
log.debug("Could not resolve encryption parameters based on SAML metadata, "
+ "falling back to locally configured credentials and algorithms");
- super.resolveAndPopulateCredentialsAndAlgorithms(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateCredentialsAndAlgorithms(params, criteria, includeExcludePredicate);
}
/**
@@ -243,7 +243,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
*
* @param params the params instance being populated
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate
+ * @param includeExcludePredicate the include/exclude predicate
* @param credential the credential being evaluated
*
* @return true if all required parameters were supplied, key agreement was successfully performed,
@@ -251,7 +251,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
* otherwise false
*/
protected boolean checkAndProcessKeyAgreement(@Nonnull final EncryptionParameters params,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate,
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate,
@Nonnull final Credential credential) {
if (!KeyAgreementSupport.supportsKeyAgreement(credential) ) {
@@ -268,10 +268,10 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
}
final List<String> criteriaKeyTransportAlgorithms = getEffectiveKeyTransportAlgorithms(criteria,
- whitelistBlacklistPredicate);
+ includeExcludePredicate);
final List<String> criteriaDataEncryptionAlgorithms = getEffectiveDataEncryptionAlgorithms(criteria,
- whitelistBlacklistPredicate);
+ includeExcludePredicate);
final SAMLMDCredentialContext metadataCredContext =
credential.getCredentialContextSet().get(SAMLMDCredentialContext.class);
@@ -282,7 +282,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
final List<String> metadataAlgorithms = metadataCredContext.getEncryptionMethods().stream()
.map(EncryptionMethod::getAlgorithm)
.filter(Objects::nonNull)
- .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), whitelistBlacklistPredicate))
+ .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), includeExcludePredicate))
.collect(Collectors.toList());
metadataKeyWrapAlgorithms = metadataAlgorithms.stream()
@@ -386,7 +386,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
*
* @param params the current encryption parameters instance being resolved
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
* @param encryptionMethod the method encryption method that was resolved along with the key transport
* encryption algorithm URI, if any. May be null.
@@ -394,7 +394,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
//CheckStyle: ReturnCount OFF
protected void resolveAndPopulateRSAOAEPParams(@Nonnull final EncryptionParameters params,
@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate,
+ @Nonnull final Predicate<String> includeExcludePredicate,
@Nullable final EncryptionMethod encryptionMethod) {
if (!AlgorithmSupport.isRSAOAEP(params.getKeyTransportEncryptionAlgorithm())) {
@@ -402,7 +402,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
}
if (encryptionMethod == null) {
- super.resolveAndPopulateRSAOAEPParams(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateRSAOAEPParams(params, criteria, includeExcludePredicate);
return;
}
@@ -411,15 +411,15 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
}
populateRSAOAEPParamsFromEncryptionMethod(params.getRSAOAEPParameters(), encryptionMethod,
- whitelistBlacklistPredicate);
+ includeExcludePredicate);
if (params.getRSAOAEPParameters().isComplete()) {
return;
} else if (params.getRSAOAEPParameters().isEmpty()) {
- super.resolveAndPopulateRSAOAEPParams(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateRSAOAEPParams(params, criteria, includeExcludePredicate);
} else {
if (isMergeMetadataRSAOAEPParametersWithConfig()) {
- super.resolveAndPopulateRSAOAEPParams(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateRSAOAEPParams(params, criteria, includeExcludePredicate);
}
}
}
@@ -431,19 +431,19 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
* {@link RSAOAEPParameters}.
*
* <p>
- * Whitelist/blacklist evaluation is applied to the digest method and MGF algorithm URIs.
+ * Include/exclude evaluation is applied to the digest method and MGF algorithm URIs.
* </p>
*
* @param params the existing RSAOAEPParameters instance being populated
* @param encryptionMethod the method encryption method that was resolved along with the key transport
* encryption algorithm URI, if any. May be null.
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*/
// Checkstyle: CyclomaticComplexity OFF -- more readable not split up
protected void populateRSAOAEPParamsFromEncryptionMethod(@Nonnull final RSAOAEPParameters params,
@Nonnull final EncryptionMethod encryptionMethod,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
final Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
@@ -451,7 +451,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
if (digestMethods.size() > 0) {
final DigestMethod digestMethod = (DigestMethod) digestMethods.get(0);
final String digestAlgorithm = StringSupport.trimOrNull(digestMethod.getAlgorithm());
- if (digestAlgorithm != null && whitelistBlacklistPredicate.test(digestAlgorithm)
+ if (digestAlgorithm != null && includeExcludePredicate.test(digestAlgorithm)
&& algoSupportPredicate.test(digestAlgorithm)) {
params.setDigestMethod(digestAlgorithm);
}
@@ -462,7 +462,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
if (mgfs.size() > 0) {
final MGF mgf = (MGF) mgfs.get(0);
final String mgfAlgorithm = StringSupport.trimOrNull(mgf.getAlgorithm());
- if (mgfAlgorithm != null && whitelistBlacklistPredicate.test(mgfAlgorithm)) {
+ if (mgfAlgorithm != null && includeExcludePredicate.test(mgfAlgorithm)) {
params.setMaskGenerationFunction(mgfAlgorithm);
}
}
@@ -490,7 +490,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
*
* @param keyTransportCredential the key transport credential to evaluate
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
* @param dataEncryptionAlgorithm the optional data encryption algorithm URI to consider
* @param metadataCredContext the credential context extracted from metadata
@@ -498,7 +498,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
*/
@Nonnull protected Pair<String, EncryptionMethod> resolveKeyTransportAlgorithm(
@Nonnull final Credential keyTransportCredential,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate,
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate,
@Nullable final String dataEncryptionAlgorithm,
@Nullable final SAMLMDCredentialContext metadataCredContext) {
@@ -509,10 +509,10 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
final String algorithm = encryptionMethod.getAlgorithm();
log.trace("Evaluating SAML metadata EncryptionMethod algorithm for key transport: {}", algorithm);
if (isKeyTransportAlgorithm(algorithm)
- && whitelistBlacklistPredicate.test(algorithm)
+ && includeExcludePredicate.test(algorithm)
&& getAlgorithmRuntimeSupportedPredicate().test(algorithm)
&& credentialSupportsEncryptionMethod(keyTransportCredential, encryptionMethod)
- && evaluateEncryptionMethodChildren(encryptionMethod, criteria, whitelistBlacklistPredicate)) {
+ && evaluateEncryptionMethodChildren(encryptionMethod, criteria, includeExcludePredicate)) {
boolean accepted = true;
if (keyTransportPredicate != null) {
@@ -534,7 +534,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
+ "falling back to locally configured algorithms");
return new Pair<>(
- super.resolveKeyTransportAlgorithm(keyTransportCredential, criteria, whitelistBlacklistPredicate,
+ super.resolveKeyTransportAlgorithm(keyTransportCredential, criteria, includeExcludePredicate,
dataEncryptionAlgorithm),
null);
}
@@ -549,14 +549,14 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
* </p>
*
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
* @param metadataCredContext the credential context extracted from metadata
* @return the selected algorithm URI and the associated encryption method from metadata, if any
*/
@Nonnull protected Pair<String, EncryptionMethod> resolveDataEncryptionAlgorithm(
@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate,
+ @Nonnull final Predicate<String> includeExcludePredicate,
@Nullable final SAMLMDCredentialContext metadataCredContext) {
if (metadataCredContext != null) {
@@ -564,9 +564,9 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
final String algorithm = encryptionMethod.getAlgorithm();
log.trace("Evaluating SAML metadata EncryptionMethod algorithm for data encryption: {}", algorithm);
if (isDataEncryptionAlgorithm(algorithm)
- && whitelistBlacklistPredicate.test(algorithm)
+ && includeExcludePredicate.test(algorithm)
&& getAlgorithmRuntimeSupportedPredicate().test(algorithm)
- && evaluateEncryptionMethodChildren(encryptionMethod, criteria, whitelistBlacklistPredicate)) {
+ && evaluateEncryptionMethodChildren(encryptionMethod, criteria, includeExcludePredicate)) {
log.debug("Resolved data encryption algorithm URI from SAML metadata EncryptionMethod: {}",
algorithm);
return new Pair<>(algorithm, encryptionMethod);
@@ -578,29 +578,29 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
+ "falling back to locally configured algorithms");
return new Pair<>(
- super.resolveDataEncryptionAlgorithm(null, criteria, whitelistBlacklistPredicate),
+ super.resolveDataEncryptionAlgorithm(null, criteria, includeExcludePredicate),
null);
}
/**
* Evaluate the child elements of an EncryptionMethod for acceptability based on for example
- * whitelist/blacklist policy and algorithm runtime support.
+ * include/exclude policy and algorithm runtime support.
*
* @param encryptionMethod the EncryptionMethod being evaluated
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*
* @return true if the EncryptionMethod children are acceptable
*/
protected boolean evaluateEncryptionMethodChildren(@Nonnull final EncryptionMethod encryptionMethod,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
switch(encryptionMethod.getAlgorithm()) {
case EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP:
case EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11:
- return evaluateRSAOAEPChildren(encryptionMethod, criteria, whitelistBlacklistPredicate);
+ return evaluateRSAOAEPChildren(encryptionMethod, criteria, includeExcludePredicate);
default:
return true;
@@ -610,17 +610,17 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
/**
* Evaluate the child elements of an RSA OAEP EncryptionMethod for acceptability based on for example
- * whitelist/blacklist policy and algorithm runtime support.
+ * include/exclude policy and algorithm runtime support.
*
* @param encryptionMethod the EncryptionMethod being evaluated
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*
* @return true if the EncryptionMethod children are acceptable
*/
protected boolean evaluateRSAOAEPChildren(@Nonnull final EncryptionMethod encryptionMethod,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
final Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
@@ -629,7 +629,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
final DigestMethod digestMethod = (DigestMethod) digestMethods.get(0);
final String digestAlgorithm = StringSupport.trimOrNull(digestMethod.getAlgorithm());
if (digestAlgorithm != null) {
- if (!whitelistBlacklistPredicate.test(digestAlgorithm)
+ if (!includeExcludePredicate.test(digestAlgorithm)
|| !algoSupportPredicate.test(digestAlgorithm)) {
log.debug("Rejecting RSA OAEP EncryptionMethod due to unsupported or disallowed DigestMethod: {}",
digestAlgorithm);
@@ -644,7 +644,7 @@ public class SAMLMetadataEncryptionParametersResolver extends BasicEncryptionPar
final MGF mgf = (MGF) mgfs.get(0);
final String mgfAlgorithm = StringSupport.trimOrNull(mgf.getAlgorithm());
if (mgfAlgorithm != null) {
- if (!whitelistBlacklistPredicate.test(mgfAlgorithm)) {
+ if (!includeExcludePredicate.test(mgfAlgorithm)) {
log.debug("Rejecting RSA OAEP EncryptionMethod due to disallowed MGF: {}", mgfAlgorithm);
return false;
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolver.java
index bfed4f35b..15d76f757 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMetadataSignatureSigningParametersResolver.java
@@ -64,10 +64,10 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
/** {@inheritDoc} */
@Override
protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
if (!criteria.contains(RoleDescriptorCriterion.class)) {
- super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, includeExcludePredicate);
return;
}
@@ -75,7 +75,7 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
SigningMethod.DEFAULT_ELEMENT_NAME);
if (signingMethods == null || signingMethods.isEmpty()) {
- super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, includeExcludePredicate);
return;
}
@@ -89,7 +89,7 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
if (signingMethod.getAlgorithm() == null
|| !getAlgorithmRuntimeSupportedPredicate().test(signingMethod.getAlgorithm())
- || !whitelistBlacklistPredicate.test(signingMethod.getAlgorithm())) {
+ || !includeExcludePredicate.test(signingMethod.getAlgorithm())) {
continue;
}
@@ -117,7 +117,7 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
log.debug("Could not resolve signing credential and algorithm based on SAML metadata, "
+ "falling back to locally configured algorithms");
- super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
+ super.resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, includeExcludePredicate);
}
// Checkstyle: ReturnCount|CyclomaticComplexity ON
@@ -164,16 +164,16 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
/** {@inheritDoc} */
@Override
@Nullable protected String resolveReferenceDigestMethod(@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
if (!criteria.contains(RoleDescriptorCriterion.class)) {
- return super.resolveReferenceDigestMethod(criteria, whitelistBlacklistPredicate);
+ return super.resolveReferenceDigestMethod(criteria, includeExcludePredicate);
}
final List<XMLObject> digestMethods = getExtensions(criteria.get(RoleDescriptorCriterion.class).getRole(),
DigestMethod.DEFAULT_ELEMENT_NAME);
if (digestMethods == null || digestMethods.isEmpty()) {
- return super.resolveReferenceDigestMethod(criteria, whitelistBlacklistPredicate);
+ return super.resolveReferenceDigestMethod(criteria, includeExcludePredicate);
}
for (final XMLObject xmlObject : digestMethods) {
@@ -183,7 +183,7 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
if (digestMethod.getAlgorithm() != null
&& getAlgorithmRuntimeSupportedPredicate().test(digestMethod.getAlgorithm())
- && whitelistBlacklistPredicate.test(digestMethod.getAlgorithm())) {
+ && includeExcludePredicate.test(digestMethod.getAlgorithm())) {
log.debug("Resolved reference digest method algorithm URI from SAML metadata DigestMethod: {}",
digestMethod.getAlgorithm());
return digestMethod.getAlgorithm();
@@ -193,7 +193,7 @@ public class SAMLMetadataSignatureSigningParametersResolver extends BasicSignatu
log.debug("Could not resolve signature reference digest method algorithm based on SAML metadata, "
+ "falling back to locally configured algorithms");
- return super.resolveReferenceDigestMethod(criteria, whitelistBlacklistPredicate);
+ return super.resolveReferenceDigestMethod(criteria, includeExcludePredicate);
}
/**
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
index 379af0a9a..cdf8ae817 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
@@ -146,11 +146,11 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
Constraint.isNotNull(criteria.get(EncryptionConfigurationCriterion.class),
"Resolver requires an instance of EncryptionConfigurationCriterion");
- final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+ final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
final EncryptionParameters params = new EncryptionParameters();
- resolveAndPopulateCredentialsAndAlgorithms(params, criteria, whitelistBlacklistPredicate);
+ resolveAndPopulateCredentialsAndAlgorithms(params, criteria, includeExcludePredicate);
if (params.getDataEncryptionCredential() != null) {
params.setDataKeyInfoGenerator(resolveDataKeyInfoGenerator(criteria, params.getDataEncryptionCredential()));
@@ -312,21 +312,21 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*
* @param params the params instance being populated
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*/
protected void resolveAndPopulateCredentialsAndAlgorithms(@Nonnull final EncryptionParameters params,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
// Pre-resolve these for efficiency
final List<Credential> keyTransportCredentials = getEffectiveKeyTransportCredentials(criteria);
final List<String> keyTransportAlgorithms =
- getEffectiveKeyTransportAlgorithms(criteria, whitelistBlacklistPredicate);
+ getEffectiveKeyTransportAlgorithms(criteria, includeExcludePredicate);
log.trace("Resolved effective key transport algorithms: {}", keyTransportAlgorithms);
final List<Credential> dataEncryptionCredentials = getEffectiveDataEncryptionCredentials(criteria);
final List<String> dataEncryptionAlgorithms = getEffectiveDataEncryptionAlgorithms(criteria,
- whitelistBlacklistPredicate);
+ includeExcludePredicate);
log.trace("Resolved effective data encryption algorithms: {}", dataEncryptionAlgorithms);
// Select the data encryption algorithm, and credential if exists
@@ -375,7 +375,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
CredentialSupport.extractEncryptionKey(keyTransportCredential).getAlgorithm());
}
- resolveAndPopulateRSAOAEPParams(params, criteria, whitelistBlacklistPredicate);
+ resolveAndPopulateRSAOAEPParams(params, criteria, includeExcludePredicate);
// Auto-generate data encryption cred if configured and possible
processDataEncryptionCredentialAutoGeneration(params);
@@ -526,12 +526,12 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*
* @param params the params instance being populated
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*/
protected void resolveAndPopulateRSAOAEPParams(@Nonnull final EncryptionParameters params,
@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
if (!AlgorithmSupport.isRSAOAEP(params.getKeyTransportEncryptionAlgorithm())) {
return;
@@ -541,7 +541,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
params.setRSAOAEPParameters(new RSAOAEPParameters());
}
- populateRSAOAEPParams(params.getRSAOAEPParameters(), criteria, whitelistBlacklistPredicate);
+ populateRSAOAEPParams(params.getRSAOAEPParameters(), criteria, includeExcludePredicate);
}
/**
@@ -550,13 +550,13 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*
* @param rsaParams the existing RSAOAEPParameters instance being populated
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*/
// Checkstyle: CyclomaticComplexity|ReturnCount OFF -- more readable not split up
protected void populateRSAOAEPParams(@Nonnull final RSAOAEPParameters rsaParams,
@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
if (rsaParams.isComplete()) {
return;
@@ -571,14 +571,14 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
if (rsaConfig != null) {
if (rsaParams.getDigestMethod() == null) {
if (rsaConfig.getDigestMethod() != null
- && whitelistBlacklistPredicate.test(rsaConfig.getDigestMethod())
+ && includeExcludePredicate.test(rsaConfig.getDigestMethod())
&& algoSupportPredicate.test(rsaConfig.getDigestMethod())) {
rsaParams.setDigestMethod(rsaConfig.getDigestMethod());
}
}
if (rsaParams.getMaskGenerationFunction() == null) {
if (rsaConfig.getMaskGenerationFunction() != null
- && whitelistBlacklistPredicate.test(rsaConfig.getMaskGenerationFunction())) {
+ && includeExcludePredicate.test(rsaConfig.getMaskGenerationFunction())) {
rsaParams.setMaskGenerationFunction(rsaConfig.getMaskGenerationFunction());
}
}
@@ -657,18 +657,18 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*
* @param keyTransportCredential the key transport credential to evaluate
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
* @param dataEncryptionAlgorithm the optional data encryption algorithm URI to consider
*
* @return the selected algorithm URI, may be null
*/
@Nullable protected String resolveKeyTransportAlgorithm(@Nonnull final Credential keyTransportCredential,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate,
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate,
@Nullable final String dataEncryptionAlgorithm) {
return resolveKeyTransportAlgorithm(keyTransportCredential, getEffectiveKeyTransportAlgorithms(criteria,
- whitelistBlacklistPredicate), dataEncryptionAlgorithm, resolveKeyTransportAlgorithmPredicate(criteria));
+ includeExcludePredicate), dataEncryptionAlgorithm, resolveKeyTransportAlgorithmPredicate(criteria));
}
/**
@@ -712,16 +712,16 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*
* @param dataEncryptionCredential the data encryption credential to evaluate
* @param criteria the criteria instance being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate data encryption and key transport algorithm URIs
*
* @return the selected algorithm URI
*/
@Nullable protected String resolveDataEncryptionAlgorithm(@Nonnull final Credential dataEncryptionCredential,
- @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
return resolveDataEncryptionAlgorithm(dataEncryptionCredential, getEffectiveDataEncryptionAlgorithms(criteria,
- whitelistBlacklistPredicate));
+ includeExcludePredicate));
}
/**
@@ -744,15 +744,15 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
/**
* Get the effective list of data encryption algorithm URIs to consider, including application of
- * whitelist/blacklist policy.
+ * include/exclude policy.
*
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate to use
+ * @param includeExcludePredicate the include/exclude predicate to use
*
* @return the list of effective algorithm URIs
*/
@Nonnull protected List<String> getEffectiveDataEncryptionAlgorithms(@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
final ArrayList<String> accumulator = new ArrayList<>();
for (final EncryptionConfiguration config
@@ -760,7 +760,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
config.getDataEncryptionAlgorithms()
.stream()
- .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), whitelistBlacklistPredicate))
+ .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), includeExcludePredicate))
.forEach(accumulator::add);
}
return accumulator;
@@ -786,15 +786,15 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
/**
* Get the effective list of key transport algorithm URIs to consider, including application of
- * whitelist/blacklist policy.
+ * include/exclude policy.
*
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate to use
+ * @param includeExcludePredicate the include/exclude predicate to use
*
* @return the list of effective algorithm URIs
*/
@Nonnull protected List<String> getEffectiveKeyTransportAlgorithms(@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
final ArrayList<String> accumulator = new ArrayList<>();
for (final EncryptionConfiguration config
@@ -802,7 +802,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
config.getKeyTransportEncryptionAlgorithms()
.stream()
- .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), whitelistBlacklistPredicate))
+ .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), includeExcludePredicate))
.forEach(accumulator::add);
}
return accumulator;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
index 5cebfe214..64b97fbb4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
@@ -225,14 +225,14 @@ public class BasicSignatureSigningParametersResolver
*
* @param params the parameters instance being populated
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the
+ * @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate signing method algorithm URIs
*/
protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params,
- @Nonnull final CriteriaSet criteria, final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final CriteriaSet criteria, final Predicate<String> includeExcludePredicate) {
final List<Credential> credentials = getEffectiveSigningCredentials(criteria);
- final List<String> algorithms = getEffectiveSignatureAlgorithms(criteria, whitelistBlacklistPredicate);
+ final List<String> algorithms = getEffectiveSignatureAlgorithms(criteria, includeExcludePredicate);
log.trace("Resolved effective signature algorithms: {}", algorithms);
for (final Credential credential : credentials) {
@@ -297,41 +297,41 @@ public class BasicSignatureSigningParametersResolver
/**
* Get the effective list of signature algorithm URIs to consider, including application of
- * whitelist/blacklist policy.
+ * include/exclude policy.
*
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate to use
+ * @param includeExcludePredicate the include/exclude predicate to use
* @return the list of effective algorithm URIs
*/
@Nonnull protected List<String> getEffectiveSignatureAlgorithms(@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
final ArrayList<String> accumulator = new ArrayList<>();
for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
config.getSignatureAlgorithms()
.stream()
- .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), whitelistBlacklistPredicate))
+ .filter(PredicateSupport.and(getAlgorithmRuntimeSupportedPredicate(), includeExcludePredicate))
.forEach(accumulator::add);
}
return accumulator;
}
/**
- * Resolve and return the digest method algorithm URI to use, including application of whitelist/blacklist policy.
+ * Resolve and return the digest method algorithm URI to use, including application of include/exclude policy.
*
* @param criteria the input criteria being evaluated
- * @param whitelistBlacklistPredicate the whitelist/blacklist predicate to use
+ * @param includeExcludePredicate the include/exclude predicate to use
* @return the resolved digest method algorithm URI
*/
@Nullable protected String resolveReferenceDigestMethod(@Nonnull final CriteriaSet criteria,
- @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
+ @Nonnull final Predicate<String> includeExcludePredicate) {
for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
for (final String digestMethod : config.getSignatureReferenceDigestMethods()) {
if (getAlgorithmRuntimeSupportedPredicate().test(digestMethod)
- && whitelistBlacklistPredicate.test(digestMethod)) {
+ && includeExcludePredicate.test(digestMethod)) {
return digestMethod;
}
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
index 85a6a23d8..2d998099b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
@@ -91,13 +91,13 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
final SignatureValidationParametersCriterion validationCriterion =
trustBasisCriteria.get(SignatureValidationParametersCriterion.class);
if (validationCriterion != null) {
- log.debug("Performing signature algorithm whitelist/blacklist validation using params from CriteriaSet");
+ log.debug("Performing signature algorithm include/exclude validation using params from CriteriaSet");
final SignatureAlgorithmValidator algorithmValidator =
new SignatureAlgorithmValidator(validationCriterion.getSignatureValidationParameters());
try {
algorithmValidator.validate(signature);
} catch (final SignatureException e) {
- log.warn("XML signature failed algorithm whitelist/blacklist validation");
+ log.warn("XML signature failed algorithm include/exclude validation");
return false;
}
}
@@ -128,11 +128,11 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
final SignatureValidationParametersCriterion validationCriterion =
trustBasisCriteria.get(SignatureValidationParametersCriterion.class);
if (validationCriterion != null) {
- log.debug("Performing signature algorithm whitelist/blacklist validation using params from CriteriaSet");
+ log.debug("Performing signature algorithm include/exclude validation using params from CriteriaSet");
final SignatureValidationParameters params = validationCriterion.getSignatureValidationParameters();
if (!AlgorithmSupport.validateAlgorithmURI(algorithmURI, params.getIncludedAlgorithms(),
params.getExcludedAlgorithms())) {
- log.warn("Simple/raw signature failed algorithm whitelist/blacklist validation");
+ log.warn("Simple/raw signature failed algorithm include/exclude validation");
return false;
}
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
index 729cdf58d..2fd287f78 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/SignatureAlgorithmValidator.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
/**
* Component which validates a {@link Signature}'s signature and digest algorithm URI's against
- * a supplied algorithm whitelist and blacklist.
+ * a supplied algorithm include and exclude policy.
*
* <p>
* The evaluation is based on the Signature's underlying DOM structure, therefore the Signature must
@@ -79,7 +79,7 @@ public class SignatureAlgorithmValidator {
/**
* Constructor.
*
- * @param params signature validation parameters containing the whitelist and blacklist
+ * @param params signature validation parameters containing the algorithm include and exclude lists
*/
public SignatureAlgorithmValidator(
@Nonnull @ParameterName(name="params") final SignatureValidationParameters params) {
@@ -113,12 +113,12 @@ public class SignatureAlgorithmValidator {
checkDOM(signature);
final String signatureAlgorithm = getSignatureAlgorithm(signature);
- log.debug("Validating SignedInfo/SignatureMethod/@Algorithm against whitelist/blacklist: {}",
+ log.debug("Validating SignedInfo/SignatureMethod/@Algorithm against include/exclude lists: {}",
signatureAlgorithm);
validateAlgorithmURI(signatureAlgorithm);
for (final String digestMethod : getDigestMethods(signature)) {
- log.debug("Validating SignedInfo/Reference/DigestMethod/@Algorithm against whitelist/blacklist: {}",
+ log.debug("Validating SignedInfo/Reference/DigestMethod/@Algorithm against include/exclude lists: {}",
digestMethod);
validateAlgorithmURI(digestMethod);
}
@@ -187,18 +187,18 @@ public class SignatureAlgorithmValidator {
}
/**
- * Validate the supplied algorithm URI against the configured whitelist and blacklist.
+ * Validate the supplied algorithm URI against the configured include and exclude lists.
*
* @param algorithmURI the algorithm URI to evaluate
- * @throws SignatureException if the algorithm URI does not satisfy the whitelist/blacklist policy
+ * @throws SignatureException if the algorithm URI does not satisfy the include/exclude policy
*/
protected void validateAlgorithmURI(@Nonnull final String algorithmURI) throws SignatureException {
- log.debug("Validating algorithm URI against whitelist and blacklist: "
- + "algorithm: {}, whitelist: {}, blacklist: {}",
+ log.debug("Validating algorithm URI against include and exclude: "
+ + "algorithm: {}, includes: {}, excludes: {}",
algorithmURI, includedAlgorithmURIs, excludedAlgorithmURIs);
if (!AlgorithmSupport.validateAlgorithmURI(algorithmURI, includedAlgorithmURIs, excludedAlgorithmURIs)) {
- throw new SignatureException("Algorithm failed whitelist/blacklist validation: " + algorithmURI);
+ throw new SignatureException("Algorithm failed include/exclude validation: " + algorithmURI);
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list