mirrors/acme4j
1
0
Fork 0
mirror of https://github.com/shred/acme4j.git synced 2025-12-13 11:14:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new methods for status change busy waiting

Browse Source
This commit is contained in:
Richard Körber
2024-08-17 17:20:52 +02:00
parent ae60431a79
commit b897dc277d
11 changed files with 258 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
acme4j-it/src/test/java/org/shredzone/acme4j/it/boulder/OrderHttpIT.java
View File

@@ -13,22 +13,17 @@
*/
package org.shredzone.acme4j.it.boulder;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import java.net.URI;
import java.security.KeyPair;
import java.time.Duration;
import org.junit.jupiter.api.Test;
import org.shredzone.acme4j.AccountBuilder;
import org.shredzone.acme4j.Authorization;
import org.shredzone.acme4j.Order;
import org.shredzone.acme4j.Session;
import org.shredzone.acme4j.Status;
import org.shredzone.acme4j.challenge.Http01Challenge;
import org.shredzone.acme4j.exception.AcmeException;
import org.shredzone.acme4j.exception.AcmeLazyLoadingException;
import org.shredzone.acme4j.it.BammBammClient;
import org.shredzone.acme4j.util.KeyPairUtils;
@@ -38,6 +33,7 @@ import org.shredzone.acme4j.util.KeyPairUtils;
public class OrderHttpIT {
private static final String TEST_DOMAIN = "example.com";
private static final Duration TIMEOUT = Duration.ofSeconds(30L);
private final String bammbammUrl = System.getProperty("bammbammUrl", "http://localhost:14001");
@@ -66,25 +62,20 @@ public class OrderHttpIT {
client.httpAddToken(challenge.getToken(), challenge.getAuthorization());
challenge.trigger();
challenge.waitForCompletion(TIMEOUT);
await()
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.untilAsserted(() -> assertThat(auth.getStatus()).isNotIn(Status.PENDING, Status.PROCESSING));
assertThat(challenge.getStatus()).isEqualTo(Status.VALID);
assertThat(auth.getStatus()).isEqualTo(Status.VALID);
client.httpRemoveToken(challenge.getToken());
}
order.execute(domainKeyPair);
order.waitUntilReady(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.READY);
await()
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.untilAsserted(() -> assertThat(order.getStatus()).isNotIn(Status.PENDING, Status.PROCESSING));
order.execute(domainKeyPair);
order.waitForCompletion(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.VALID);
var cert = order.getCertificate().getCertificate();
assertThat(cert.getNotAfter()).isNotNull();
@@ -108,32 +99,4 @@ public class OrderHttpIT {
return KeyPairUtils.createKeyPair(2048);
}
/**
* Safely updates the authorization, catching checked exceptions.
*
* @param auth
* {@link Authorization} to update
*/
private void updateAuth(Authorization auth) {
try {
auth.update();
} catch (AcmeException ex) {
throw new AcmeLazyLoadingException(auth, ex);
}
}
/**
* Safely updates the order, catching checked exceptions.
*
* @param order
* {@link Order} to update
*/
private void updateOrder(Order order) {
try {
order.update();
} catch (AcmeException ex) {
throw new AcmeLazyLoadingException(order, ex);
}
}
}

23
acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderIT.java
View File

@@ -13,9 +13,7 @@
*/
package org.shredzone.acme4j.it.pebble;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.net.URI;
@@ -46,6 +44,7 @@ import org.shredzone.acme4j.exception.AcmeServerException;
public class OrderIT extends PebbleITBase {
private static final String TEST_DOMAIN = "example.com";
private static final Duration TIMEOUT = Duration.ofSeconds(30L);
/**
* Test if a certificate can be ordered via http-01 challenge.
@@ -169,24 +168,20 @@ public class OrderIT extends PebbleITBase {
var challenge = validator.prepare(auth);
challenge.trigger();
await()
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.untilAsserted(() -> assertThat(auth.getStatus()).isNotIn(Status.PENDING, Status.PROCESSING));
challenge.waitForCompletion(TIMEOUT);
assertThat(challenge.getStatus()).isEqualTo(Status.VALID);
auth.fetch();
assertThat(auth.getStatus()).isEqualTo(Status.VALID);
}
order.waitUntilReady(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.READY);
order.execute(domainKeyPair);
await()
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.untilAsserted(() -> assertThat(order.getStatus())
.isNotIn(Status.PENDING, Status.PROCESSING, Status.READY));
order.waitForCompletion(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.VALID);
var certificate = order.getCertificate();

24
acme4j-it/src/test/java/org/shredzone/acme4j/it/pebble/OrderWildcardIT.java
View File

@@ -13,10 +13,8 @@
*/
package org.shredzone.acme4j.it.pebble;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import java.time.Duration;
import java.time.Instant;
@@ -37,6 +35,7 @@ public class OrderWildcardIT extends PebbleITBase {
private static final String TEST_DOMAIN = "example.com";
private static final String TEST_WILDCARD_DOMAIN = "*.example.com";
private static final Duration TIMEOUT = Duration.ofSeconds(30L);
/**
* Test if a wildcard certificate can be ordered via dns-01 challenge.
@@ -82,27 +81,22 @@ public class OrderWildcardIT extends PebbleITBase {
try {
challenge.trigger();
await().pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateAuth(auth))
.untilAsserted(() -> assertThat(
auth.getStatus()).isNotIn(Status.PENDING, Status.PROCESSING));
challenge.waitForCompletion(TIMEOUT);
assertThat(challenge.getStatus()).isEqualTo(Status.VALID);
} finally {
performCleanup();
}
auth.fetch();
assertThat(auth.getStatus()).isEqualTo(Status.VALID);
}
order.waitUntilReady(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.READY);
order.execute(domainKeyPair);
await()
.pollInterval(1, SECONDS)
.timeout(30, SECONDS)
.conditionEvaluationListener(cond -> updateOrder(order))
.untilAsserted(() -> assertThat(
order.getStatus()).isNotIn(Status.PENDING, Status.PROCESSING));
order.waitForCompletion(TIMEOUT);
assertThat(order.getStatus()).isEqualTo(Status.VALID);
var cert = order.getCertificate().getCertificate();
assertThat(cert).isNotNull();