github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

added javadoc-@since, changed to the use of AssertJ

pull/134/head
kimmerin 2022-05-25 11:19:36 +02:00 committed by Richard Körber
parent b73750672c
commit a6acf78f31
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java
View File

@ -192,6 +192,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
* @param attName The BCStyle attribute name * @param attName The BCStyle attribute name
* @param value The value * @param value The value
* @since 2.14
*/ */
public void addValue(String attName, String value) { public void addValue(String attName, String value) {
ASN1ObjectIdentifier oid = X500Name.getDefaultStyle().attrNameToOID(requireNonNull(attName, "attribute name must not be null")); ASN1ObjectIdentifier oid = X500Name.getDefaultStyle().attrNameToOID(requireNonNull(attName, "attribute name must not be null"));
@ -204,6 +205,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
* @param oid The OID of the attribute to be added * @param oid The OID of the attribute to be added
* @param value The value * @param value The value
* @since 2.14
*/ */
public void addValue(ASN1ObjectIdentifier oid, String value) { public void addValue(ASN1ObjectIdentifier oid, String value) {
if (requireNonNull(oid, "OID must not be null").equals(BCStyle.CN)) { if (requireNonNull(oid, "OID must not be null").equals(BCStyle.CN)) {

78
acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
View File

@ -14,8 +14,8 @@
package org.shredzone.acme4j.util; package org.shredzone.acme4j.util;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -31,6 +31,7 @@ import java.util.Arrays;
import org.assertj.core.api.AutoCloseableSoftAssertions; import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1IA5String;
import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DERIA5String;
import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DEROctetString;
@ -45,7 +46,6 @@ import org.bouncycastle.asn1.x509.GeneralNames;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.junit.Assert;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.shredzone.acme4j.Identifier; import org.shredzone.acme4j.Identifier;
@ -112,7 +112,8 @@ public class CSRBuilderTest {
CSRBuilder builder = new CSRBuilder(); CSRBuilder builder = new CSRBuilder();
builder.sign(testKey); builder.sign(testKey);
}); });
Assert.assertEquals("unexpected exception message", "No domain or IP address was set", ise.getMessage()); assertThat(ise.getMessage())
.isEqualTo("No domain or IP address was set");
} }
/** /**
@ -124,7 +125,8 @@ public class CSRBuilderTest {
CSRBuilder builder = new CSRBuilder(); CSRBuilder builder = new CSRBuilder();
builder.addIdentifier(new Identifier("UnKnOwN", "123")); builder.addIdentifier(new Identifier("UnKnOwN", "123"));
}); });
Assert.assertEquals("unexpected exception message", "Unknown identifier type: UnKnOwN", iae.getMessage()); assertThat(iae.getMessage())
.isEqualTo("Unknown identifier type: UnKnOwN");
} }
/** /**
@ -135,10 +137,16 @@ public class CSRBuilderTest {
CSRBuilder builder = new CSRBuilder(); CSRBuilder builder = new CSRBuilder();
IllegalStateException ise; IllegalStateException ise;
ise = assertThrows(IllegalStateException.class, builder::getCSR, "getCSR()"); assertThatExceptionOfType(IllegalStateException.class)
Assert.assertEquals("unexpected exception message", "sign CSR first", ise.getMessage()); .isThrownBy(builder::getCSR)
ise = assertThrows(IllegalStateException.class, builder::getEncoded, "getEncoded()"); .as("getCSR()")
Assert.assertEquals("unexpected exception message", "sign CSR first", ise.getMessage()); .withMessage("sign CSR first");
assertThatExceptionOfType(IllegalStateException.class)
.isThrownBy(builder::getEncoded)
.as("getCSR()")
.withMessage("sign CSR first");
ise = assertThrows(IllegalStateException.class, () -> { ise = assertThrows(IllegalStateException.class, () -> {
try (StringWriter w = new StringWriter()) { try (StringWriter w = new StringWriter()) {
builder.write(w); builder.write(w);
@ -150,47 +158,45 @@ public class CSRBuilderTest {
@Test @Test
public void testAddAttrValues() throws Exception { public void testAddAttrValues() throws Exception {
CSRBuilder builder = new CSRBuilder(); CSRBuilder builder = new CSRBuilder();
Exception ex; String invAttNameExMessage = assertThrows(IllegalArgumentException.class,
String invAttNameExMessage = ""; () -> X500Name.getDefaultStyle().attrNameToOID("UNKNOWNATT")).getMessage();
try {
X500Name.getDefaultStyle().attrNameToOID("UNKNOWNATT");
fail("exception expected");
}
catch(IllegalArgumentException iae) {
invAttNameExMessage = iae.getMessage();
}
assertEquals("unexpected X500Name", "", builder.toString()); assertThat(builder.toString()).isEqualTo("");
ex = assertThrows(NullPointerException.class, () -> new CSRBuilder().addValue((String) null, "value"), "addValue(String, String)"); assertThatExceptionOfType(NullPointerException.class)
assertEquals("unexpected exception message", "attribute name must not be null", ex.getMessage()); .isThrownBy(() -> new CSRBuilder().addValue((String) null, "value"))
ex = assertThrows(NullPointerException.class, () -> new CSRBuilder().addValue((ASN1ObjectIdentifier) null, "value"), "addValue(ASN1ObjectIdentifier, String)"); .as("addValue(String, String)");
assertEquals("unexpected exception message", "OID must not be null", ex.getMessage()); assertThatExceptionOfType(NullPointerException.class)
ex = assertThrows(NullPointerException.class, () -> new CSRBuilder().addValue("C", null), "addValue(String, null)"); .isThrownBy(() -> new CSRBuilder().addValue((ASN1ObjectIdentifier) null, "value"))
assertEquals("unexpected exception message", "attribute value must not be null", ex.getMessage()); .as("addValue(ASN1ObjectIdentifier, String)");
ex = assertThrows(IllegalArgumentException.class, () -> new CSRBuilder().addValue("UNKNOWNATT", "val"), "addValue(String, null)"); assertThatExceptionOfType(NullPointerException.class)
assertEquals("unexpected exception message", invAttNameExMessage, ex.getMessage()); .isThrownBy(() -> new CSRBuilder().addValue("C", null))
.as("addValue(String, null)");
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> new CSRBuilder().addValue("UNKNOWNATT", "val"))
.as("addValue(String, null)")
.withMessage(invAttNameExMessage);
assertEquals("unexpected X500Name", "", builder.toString()); assertThat(builder.toString()).isEqualTo("");
builder.addValue("C", "DE"); builder.addValue("C", "DE");
assertEquals("unexpected X500Name", "C=DE", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE");
builder.addValue("E", "contact@example.com"); builder.addValue("E", "contact@example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com");
builder.addValue("CN", "firstcn.example.com"); builder.addValue("CN", "firstcn.example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com");
builder.addValue("CN", "scnd.example.com"); builder.addValue("CN", "scnd.example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
builder = new CSRBuilder(); builder = new CSRBuilder();
builder.addValue(BCStyle.C, "DE"); builder.addValue(BCStyle.C, "DE");
assertEquals("unexpected X500Name", "C=DE", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE");
builder.addValue(BCStyle.EmailAddress, "contact@example.com"); builder.addValue(BCStyle.EmailAddress, "contact@example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com");
builder.addValue(BCStyle.CN, "firstcn.example.com"); builder.addValue(BCStyle.CN, "firstcn.example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com");
builder.addValue(BCStyle.CN, "scnd.example.com"); builder.addValue(BCStyle.CN, "scnd.example.com");
assertEquals("unexpected X500Name", "C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com", builder.toString()); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com");
} }
private CSRBuilder createBuilderWithValues() throws UnknownHostException { private CSRBuilder createBuilderWithValues() throws UnknownHostException {
@ -264,7 +270,7 @@ public class CSRBuilderTest {
GeneralNames names = GeneralNames.fromExtensions((Extensions) extensions[0], Extension.subjectAlternativeName); GeneralNames names = GeneralNames.fromExtensions((Extensions) extensions[0], Extension.subjectAlternativeName);
assertThat(names.getNames()) assertThat(names.getNames())
.filteredOn(gn -> gn.getTagNo() == GeneralName.dNSName) .filteredOn(gn -> gn.getTagNo() == GeneralName.dNSName)
.extracting(gn -> DERIA5String.getInstance(gn.getName()).getString()) .extracting(gn -> ASN1IA5String.getInstance(gn.getName()).getString())
.containsExactlyInAnyOrder("abc.de", "fg.hi", "jklm.no", "pqr.st", .containsExactlyInAnyOrder("abc.de", "fg.hi", "jklm.no", "pqr.st",
"uv.wx", "y.z", "*.wild.card", "ide1.nt", "ide2.nt", "ide3.nt"); "uv.wx", "y.z", "*.wild.card", "ide1.nt", "ide2.nt", "ide3.nt");