[java-metadata-aggregator] branch main updated: MDA-242 - Review for thread safety
Ian Young
ian at iay.org.uk
Fri Aug 26 11:00:42 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=ac63302e95243684d4848bc9a348a1a176110426
The following commit(s) were added to refs/heads/main by this push:
new ac63302 MDA-242 - Review for thread safety
ac63302 is described below
commit ac63302e95243684d4848bc9a348a1a176110426
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Aug 26 12:00:35 2022 +0100
MDA-242 - Review for thread safety
https://issues.shibboleth.net/jira/browse/MDA-242
Additional issues highlighted by SpotBugs.
Note that making the doInitialize and doDestroy methods synchronized isn't actually ever required, as they are executed as a chain by a public method in a parent class which _is_ synchronized. SpotBugs thinks it is because it is unaware of the context in which these are called.
However, this change doesn't cost us much (double synchronization is supposedly inexpensive) and does allow SpotBugs to operate on the whole codebase without fiddly filtering of specific issues against specific method names.
---
.../net/shibboleth/metadata/dom/AbstractElementValidationStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java | 2 +-
.../main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java | 2 +-
.../main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java | 2 +-
.../net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java | 2 +-
.../main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java | 2 +-
.../main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java | 2 +-
.../java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java | 2 +-
.../metadata/dom/saml/mdattr/EntityAttributeAddingStage.java | 4 ++--
.../metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java | 2 +-
.../shibboleth/metadata/pipeline/MultiOutputSerializationStage.java | 2 +-
.../net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java | 2 +-
.../main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/SerializationStage.java | 2 +-
.../main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java | 4 ++--
.../src/main/java/net/shibboleth/metadata/validate/BaseValidator.java | 2 +-
.../shibboleth/metadata/validate/string/BaseStringRegexValidator.java | 2 +-
.../java/net/shibboleth/metadata/validate/x509/X509DSADetector.java | 2 +-
.../shibboleth/metadata/validate/x509/X509RSAExponentValidator.java | 4 ++--
.../shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java | 4 ++--
27 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
index ff4c07e..0f4e797 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
@@ -61,7 +61,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
*
* @param names collection of element names to visit.
*/
- public void setElementNames(@Nonnull final Collection<QName> names) {
+ public final synchronized void setElementNames(@Nonnull final Collection<QName> names) {
checkSetterPreconditions();
Constraint.isNotNull(names, "elementNames may not be null");
elementNames = Set.copyOf(names);
@@ -106,7 +106,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (elementNames.isEmpty()) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
index 74f0be8..75a2cea 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
@@ -258,7 +258,7 @@ public abstract class AbstractXSLProcessingStage extends AbstractStage<Element>
TransformerConfigurationException;
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (xslResource == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
index e2d5ec2..0c40be6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
@@ -293,7 +293,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (parserPool == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index f801c7e..8e02225 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -175,7 +175,7 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (parserPool == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
index a1c2e4d..1125905 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
@@ -114,7 +114,7 @@ public class ElementStrippingStage extends AbstractIteratingStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (elementNamespace == null) {
throw new ComponentInitializationException("target namespace can not be null or empty");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
index 62d1d0d..2e08578 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
@@ -119,7 +119,7 @@ public class EmptyContainerStrippingStage extends AbstractIteratingStage<Element
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (elementNamespace == null) {
throw new ComponentInitializationException("target namespace can not be null or empty");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
index d54256c..806935f 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
@@ -68,7 +68,7 @@ public class NamespaceStrippingStage extends AbstractNamespacesStrippingStage {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (namespace == null) {
throw new ComponentInitializationException("target namespace can not be null or empty");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
index aef8dc0..56711a8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
@@ -147,7 +147,7 @@ public class XMLSchemaValidationStage extends AbstractIteratingStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (schemaResources.isEmpty()) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index 67e4ddb..0f18132 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -506,7 +506,7 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
*
* @param newValue whether to remove CR characters from generated signatures.
*/
- public void setRemovingCRsFromSignature(final boolean newValue) {
+ public final synchronized void setRemovingCRsFromSignature(final boolean newValue) {
checkSetterPreconditions();
removingCRsFromSignature = newValue;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
index 37946f8..9fe87d6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
@@ -294,7 +294,7 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
Init.init();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
index 5cef161..f4b21ce 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
@@ -145,7 +145,7 @@ public class XPathFilteringStage extends AbstractStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (xpathExpression == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
index d46137e..c7122a0 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
@@ -132,7 +132,7 @@ public class X509ValidationStage extends AbstractDOMValidationStage<X509Certific
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
try {
factory = CertificateFactory.getInstance("X.509");
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
index 71148ee..dbd530e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
@@ -84,7 +84,7 @@ public class SetCacheDurationStage extends AbstractIteratingStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (cacheDuration == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
index d93ca45..a0d0059 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
@@ -85,7 +85,7 @@ public class SetValidUntilStage extends AbstractIteratingStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (validityDuration == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
index d055309..161d850 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
@@ -215,7 +215,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
// If any of the existing attribute values match our value, we're done
if (attributeValuePresent(attributes, attributeValueMatcher)) {
- log.debug("attribute value '{}' already present", attributeValue);
+ log.debug("attribute value '{}' already present", value);
return;
}
@@ -228,7 +228,7 @@ public class EntityAttributeAddingStage extends AbstractStage<Element> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (attributeValue == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
index dc405bb..7f40f07 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
@@ -200,7 +200,7 @@ public class FilesInDirectoryMultiOutputStrategy<T> extends BaseInitializableCom
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (directory == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
index ccf0549..0e24a3a 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
@@ -151,7 +151,7 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (outputStrategy == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index 658ad8d..ada6fca 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -192,7 +192,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (pipelineAndStrategies.isEmpty()) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index f6c6f51..3d045ed 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -168,7 +168,7 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
for (final Pipeline<T> pipeline : mergedPipelines) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
index 0ce281e..2316e1d 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
@@ -119,7 +119,7 @@ public class ScriptletStage<T> extends AbstractStage<T> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (script == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
index c5f7148..72ee0bb 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
@@ -137,7 +137,7 @@ public class SerializationStage<T> extends AbstractStage<T> {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (outputFile == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
index 317bc62..88fc878 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
@@ -67,7 +67,7 @@ public class SimplePipeline<T> extends BaseIdentifiableInitializableComponent
final var start = Instant.now();
- for (final Stage<T> stage : pipelineStages) {
+ for (final Stage<T> stage : getStages()) {
stage.execute(items);
}
@@ -78,7 +78,7 @@ public class SimplePipeline<T> extends BaseIdentifiableInitializableComponent
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
for (final Stage<T> stage : pipelineStages) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
index 8817080..695db05 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
@@ -70,7 +70,7 @@ public abstract class BaseValidator extends BaseIdentifiableInitializableCompone
*
* @since 0.10.0
*/
- public void setMessage(@Nonnull final String newMessage) {
+ public final synchronized void setMessage(@Nonnull final String newMessage) {
checkSetterPreconditions();
message = Constraint.isNotNull(newMessage, "message format string may not be null");
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
index bd57a05..b3395c5 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
@@ -73,7 +73,7 @@ public abstract class BaseStringRegexValidator extends BaseValidator {
}
@Override
- protected void doInitialize() throws ComponentInitializationException {
+ protected synchronized void doInitialize() throws ComponentInitializationException {
super.doInitialize();
if (getRegex() == null) {
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
index ab34bd6..6f66a98 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
@@ -108,7 +108,7 @@ public class X509DSADetector extends BaseValidator implements Validator<X509Cert
@Nonnull final String stageId) {
final PublicKey key = cert.getPublicKey();
if ("DSA".equals(key.getAlgorithm())) {
- addStatus(error, "certificate contains a DSA key", item, stageId);
+ addStatus(isError(), "certificate contains a DSA key", item, stageId);
return getAction();
}
return Action.CONTINUE;
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
index 733922b..0746250 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
@@ -118,10 +118,10 @@ public class X509RSAExponentValidator extends AbstractX509Validator {
if (!exponent.testBit(0)) {
addError("RSA public exponent of " + exponent + " must be odd", item, stageId);
} else if (exponent.compareTo(getErrorBoundary()) < 0) {
- addError("RSA public exponent of " + exponent + " is less than required " + errorBoundary,
+ addError("RSA public exponent of " + exponent + " is less than required " + getErrorBoundary(),
item, stageId);
} else if (exponent.compareTo(getWarningBoundary()) < 0) {
- addWarning("RSA public exponent of " + exponent + " is less than recommended " + warningBoundary,
+ addWarning("RSA public exponent of " + exponent + " is less than recommended " + getWarningBoundary(),
item, stageId);
}
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
index 8e76f3a..633357e 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
@@ -92,10 +92,10 @@ public class X509RSAKeyLengthValidator extends AbstractX509Validator {
final RSAPublicKey rsaKey = (RSAPublicKey) key;
final int keyLen = rsaKey.getModulus().bitLength();
if (keyLen < getErrorBoundary()) {
- addError("RSA key length of " + keyLen + " bits is less than required " + errorBoundary,
+ addError("RSA key length of " + keyLen + " bits is less than required " + getErrorBoundary(),
item, stageId);
} else if (keyLen < getWarningBoundary()) {
- addWarning("RSA key length of " + keyLen + " bits is less than recommended " + warningBoundary,
+ addWarning("RSA key length of " + keyLen + " bits is less than recommended " + getWarningBoundary(),
item, stageId);
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list