[java-metadata-aggregator] branch master updated: MDA-198 - X.509 validators should not set default component ID
Ian Young
ian at iay.org.uk
Fri Jan 12 10:09:27 EST 2018
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=56c19e4e41ed5016a16b7ead17a36215c141848b
The following commit(s) were added to refs/heads/master by this push:
new 56c19e4 MDA-198 - X.509 validators should not set default component ID
56c19e4 is described below
commit 56c19e4e41ed5016a16b7ead17a36215c141848b
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Jan 12 15:09:12 2018 +0000
MDA-198 - X.509 validators should not set default component ID
---
.../validate/x509/X509RSAExponentValidator.java | 8 --------
.../validate/x509/X509RSAKeyLengthValidator.java | 8 --------
.../validate/x509/X509RSAOpenSSLBlacklistValidator.java | 8 --------
.../metadata/dom/ds/X509ValidationStageTest.java | 4 ++++
.../validate/x509/X509RSAExponentValidatorTest.java | 14 ++++++++++++++
.../validate/x509/X509RSAKeyLengthValidatorTest.java | 16 ++++++++++++++++
.../x509/X509RSAOpenSSLBlacklistValidatorTest.java | 17 ++++++++++++++++-
7 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
index 477f2f9..a528ca5 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
@@ -46,14 +46,6 @@ public class X509RSAExponentValidator extends AbstractX509Validator {
/** The RSA public exponent value below which a warning should result. Default: 0 (disabled). */
private BigInteger warningBoundary = BigInteger.ZERO;
-
- /**
- * Constructor.
- */
- public X509RSAExponentValidator() {
- super();
- setId("RSAExponent");
- }
/**
* Get the RSA public exponent below which an error will result.
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
index 09f15d1..752d3c7 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
@@ -44,14 +44,6 @@ public class X509RSAKeyLengthValidator extends AbstractX509Validator {
/** The RSA key length below which a warning should result. Default: 0 (disabled). */
private int warningBoundary;
-
- /**
- * Constructor.
- */
- public X509RSAKeyLengthValidator() {
- super();
- setId("RSAKeyLength");
- }
/**
* Get the RSA key length below which an error will result.
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
index d5e4b93..6ed6580 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
@@ -65,14 +65,6 @@ public class X509RSAOpenSSLBlacklistValidator extends AbstractX509Validator {
/** Set of digest values blacklisted by this validator. */
private final Set<String> blacklistedValues = new HashSet<>();
-
- /**
- * Constructor.
- */
- public X509RSAOpenSSLBlacklistValidator() {
- super();
- setId("OpenSSLBlacklist");
- }
/**
* Gets the resource that provides the blacklist.
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
index f5b2520..1e5063d 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
@@ -96,6 +96,8 @@ public class X509ValidationStageTest extends BaseDOMTest {
final X509RSAKeyLengthValidator val =
new X509RSAKeyLengthValidator();
val.setErrorBoundary(2049);
+ val.setId("test");
+ val.initialize();
final List<Validator<X509Certificate>> vals = new ArrayList<>();
vals.add(val);
@@ -120,6 +122,8 @@ public class X509ValidationStageTest extends BaseDOMTest {
new X509RSAKeyLengthValidator();
val.setWarningBoundary(2049);
val.setErrorBoundary(2048);
+ val.setId("test");
+ val.initialize();
final List<Validator<X509Certificate>> vals = new ArrayList<>();
vals.add(val);
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
index a337837..afd8b9c 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
@@ -55,6 +55,8 @@ public class X509RSAExponentValidatorTest extends BaseX509ValidatorTest {
@Test
public void testDefaults() throws Exception {
final X509RSAExponentValidator val = new X509RSAExponentValidator();
+ val.setId("test");
+ val.initialize();
testThreeCerts(val, 1, 0, 0, 0, 0, 0);
}
@@ -62,6 +64,8 @@ public class X509RSAExponentValidatorTest extends BaseX509ValidatorTest {
public void testNISTWarning() throws Exception {
final X509RSAExponentValidator val = new X509RSAExponentValidator();
val.setWarningBoundary(65537);
+ val.setId("test");
+ val.initialize();
testThreeCerts(val, 1, 0, 0, 1, 0, 0);
}
@@ -69,6 +73,8 @@ public class X509RSAExponentValidatorTest extends BaseX509ValidatorTest {
public void testNISTError() throws Exception {
final X509RSAExponentValidator val = new X509RSAExponentValidator();
val.setErrorBoundary(65537);
+ val.setId("test");
+ val.initialize();
testThreeCerts(val, 1, 0, 1, 0, 0, 0);
}
@@ -77,7 +83,15 @@ public class X509RSAExponentValidatorTest extends BaseX509ValidatorTest {
final X509RSAExponentValidator val = new X509RSAExponentValidator();
val.setErrorBoundary(0);
val.setWarningBoundary(65537);
+ val.setId("test");
+ val.initialize();
testThreeCerts(val, 0, 1, 0, 1, 0, 0);
}
+ @Test
+ public void mda198() throws Exception {
+ final X509RSAExponentValidator val = new X509RSAExponentValidator();
+ // do not initialize
+ Assert.assertNull(val.getId(), "unset ID should be null");
+ }
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
index f39d353..34a58ac 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
@@ -38,6 +38,9 @@ public class X509RSAKeyLengthValidatorTest extends BaseX509ValidatorTest {
public void testDefaults2048() throws Exception {
final Item<String> item = new MockItem("foo");
final Validator<X509Certificate> val = new X509RSAKeyLengthValidator();
+ val.setId("test");
+ val.initialize();
+
final X509Certificate cert = getCertificate("2048.pem");
Assert.assertEquals(val.validate(cert, item, "stage"), Validator.Action.CONTINUE);
errorsAndWarnings(item, 0, 0);
@@ -47,6 +50,9 @@ public class X509RSAKeyLengthValidatorTest extends BaseX509ValidatorTest {
public void testDefaults1024() throws Exception {
final Item<String> item = new MockItem("foo");
final Validator<X509Certificate> val = new X509RSAKeyLengthValidator();
+ val.setId("test");
+ val.initialize();
+
final X509Certificate cert = getCertificate("1024.pem");
Assert.assertEquals(val.validate(cert, item, "stage"), Validator.Action.CONTINUE);
errorsAndWarnings(item, 1, 0);
@@ -58,9 +64,19 @@ public class X509RSAKeyLengthValidatorTest extends BaseX509ValidatorTest {
final X509RSAKeyLengthValidator val = new X509RSAKeyLengthValidator();
val.setErrorBoundary(1024);
val.setWarningBoundary(2048);
+ val.setId("test");
+ val.initialize();
+
final X509Certificate cert = getCertificate("1024.pem");
Assert.assertEquals(val.validate(cert, item, "stage"), Validator.Action.CONTINUE);
errorsAndWarnings(item, 0, 1);
}
+ @Test
+ public void mda198() throws Exception {
+ final X509RSAKeyLengthValidator val = new X509RSAKeyLengthValidator();
+ // do not initialize
+ Assert.assertNull(val.getId(), "unset ID should be null");
+ }
+
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
index dccdd77..75104b4 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
@@ -38,6 +38,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
public void testNotBlacklisted() throws Exception {
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("1024.txt"));
+ val.setId("test");
val.initialize();
Assert.assertEquals(val.getKeySize(), 0); // no key size restriction
@@ -51,6 +52,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
public void test1024on1024noRestriction() throws Exception {
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("1024.txt"));
+ val.setId("test");
val.initialize();
Assert.assertEquals(val.getKeySize(), 0); // no key size restriction
@@ -65,6 +67,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("1024.txt"));
val.setKeySize(1024);
+ val.setId("test");
val.initialize();
final Item<String> item = new MockItem("foo");
@@ -78,6 +81,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("1024.txt"));
val.setKeySize(2048); // untrue, but should prevent any matches
+ val.setId("test");
val.initialize();
final Item<String> item = new MockItem("foo");
@@ -90,6 +94,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
public void test2048on1024noRestriction() throws Exception {
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("1024.txt"));
+ val.setId("test");
val.initialize();
Assert.assertEquals(val.getKeySize(), 0); // no key size restriction
@@ -103,6 +108,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
public void test2048on2048noRestriction() throws Exception {
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("2048.txt"));
+ val.setId("test");
val.initialize();
Assert.assertEquals(val.getKeySize(), 0); // no key size restriction
@@ -117,6 +123,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("2048.txt"));
val.setKeySize(2048);
+ val.setId("test");
val.initialize();
final Item<String> item = new MockItem("foo");
@@ -130,6 +137,7 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("2048.txt"));
val.setKeySize(1024); // untrue, but should prevent any matches
+ val.setId("test");
val.initialize();
final Item<String> item = new MockItem("foo");
@@ -142,7 +150,14 @@ public class X509RSAOpenSSLBlacklistValidatorTest extends BaseX509ValidatorTest
public void testBlankLineIssue9() throws Exception {
final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
val.setBlacklistResource(getClasspathResource("issue9.txt"));
+ val.setId("test");
val.initialize();
}
-
+
+ @Test
+ public void mda198() throws Exception {
+ final X509RSAOpenSSLBlacklistValidator val = new X509RSAOpenSSLBlacklistValidator();
+ // do not initialize
+ Assert.assertNull(val.getId(), "unset ID should be null");
+ }
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list