filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed ACME tests

Browse Source
This commit is contained in:
Maurus Decimus
2026-04-25 08:02:27 +02:00
parent 52733408dc
commit 446996b874
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/docker/docker-compose.yml
View File

@@ -196,12 +196,25 @@ services:
- "127.0.0.1:8055:8055"
command: [ "-defaultIPv6", "", "-defaultIPv4", "0.0.0.0" ]
# Long-running sidecar: keeps pebble-challtestsrv's default-IPv4 set to the
# host gateway. Re-applies on every restart of pebble-challtestsrv (the
# default in-memory IPv4 reverts to 0.0.0.0 each time the server starts).
# Uses the bridge network (not service:pebble-challtestsrv) so it survives
# restarts of the target container.
pebble-challtestsrv-init:
image: alpine:latest
depends_on:
- pebble-challtestsrv
network_mode: "service:pebble-challtestsrv"
entrypoint: [ "/bin/sh", "-c", "HOSTIP=$$(getent hosts host.docker.internal | awk '{print $$1}') && wget -qO- --post-data='{\"ip\":\"'$$HOSTIP'\"}' http://localhost:8055/set-default-ipv4" ]
extra_hosts:
- "host.docker.internal:host-gateway"
restart: unless-stopped
healthcheck:
test: [ "CMD-SHELL", "test -f /tmp/ready" ]
interval: 2s
timeout: 1s
retries: 30
start_period: 3s
entrypoint: [ "/bin/sh", "-c", "rm -f /tmp/ready; while true; do HOSTIP=$$(getent hosts host.docker.internal | awk '{print $$1}'); if [ -n \"$$HOSTIP\" ] && wget -qO- --post-data='{\"ip\":\"'$$HOSTIP'\"}' http://pebble-challtestsrv:8055/set-default-ipv4 >/dev/null 2>&1; then touch /tmp/ready; else rm -f /tmp/ready; fi; sleep 10; done" ]
# ---------------------------------------------------------------------------
# Pebble (ACME server) – ports 14000 (directory) + 15000 (management)
@@ -210,7 +223,7 @@ services:
image: ghcr.io/letsencrypt/pebble:latest
depends_on:
pebble-challtestsrv-init:
condition: service_completed_successfully
condition: service_healthy
environment:
PEBBLE_VA_NOSLEEP: "1"
PEBBLE_WFE_NONCEREJECT: "0"

7
tests/src/automation/acme.rs
View File

@@ -371,7 +371,7 @@ pub async fn test(test: &TestServer) {
.1;
let mut sans = certificate.subject_alternative_names.into_inner();
sans.sort();
assert_eq!(sans, vec!["*.dns.org".to_string()]);
assert_eq!(sans, vec!["*.dns.org".to_string(), "dns.org".to_string()]);
account.registry_destroy_all(ObjectType::Certificate).await;
account.registry_destroy_all(ObjectType::Task).await;
@@ -412,7 +412,10 @@ pub async fn test(test: &TestServer) {
.1;
let mut sans = certificate.subject_alternative_names.into_inner();
sans.sort();
assert_eq!(sans, vec!["*.persist.org".to_string()]);
assert_eq!(
sans,
vec!["*.persist.org".to_string(), "persist.org".to_string()]
);
// Cleanup
account

2
tests/src/automation/dns.rs
View File

@@ -58,7 +58,7 @@ _995._tcp.pop3.example.org. IN TLSA 2 1 1
_dmarc.example.org. IN TXT "v=DMARC1; p=reject; rua=mailto:postmaster@example.org"
_mta-sts.example.org. IN TXT "v=STSv1; id=12942536112359691423"
_smtp._tls.example.org. IN TXT "v=TLSRPTv1; rua=mailto:postmaster@example.org"
_ua-auto-config.example.org. IN TXT "v=UAAC1; a=sha256; d=JJ/h5yIbCwPiASVbENZzCyyzeV/AiFCoBbiH2iTISWs="
_ua-auto-config.example.org. IN TXT "v=UAAC1; a=sha256; d=9X2mMgWAc10oSPuRKZSFBwPXEQpnxkS7SXPO8PC7euM="
_validation-persist.example.org. IN TXT "pebble.letsencrypt.org; accounturi=REDACTED"
dummy-v1-ed25519._domainkey.example.org. IN TXT "v=DKIM1; k=ed25519; h=sha256; p=REDACTED"
dummy-v1-rsa._domainkey.example.org. IN TXT "v=DKIM1; k=rsa; h=sha256; p=REDACTED"