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

Trim spaces in DNS-01 ACME secrets (closes #382)

Browse Source
This commit is contained in:
mdecimus
2024-04-28 17:58:17 +02:00
parent a93c792a9a
commit 58b8c5bcdb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/common/src/config/server/tls.rs
View File

@@ -210,7 +210,7 @@ fn build_dns_updater(config: &mut Config, acme_id: &str) -> Option<DnsUpdater> {
})
.ok()?;
let key = STANDARD
.decode(config.value_require(("acme", acme_id, "secret"))?)
.decode(config.value_require(("acme", acme_id, "secret"))?.trim())
.map_err(|_| {
config.new_parse_error(
("acme", acme_id, "secret"),
@@ -230,7 +230,10 @@ fn build_dns_updater(config: &mut Config, acme_id: &str) -> Option<DnsUpdater> {
DnsUpdater::new_rfc2136_tsig(
addr,
config.value_require(("acme", acme_id, "key"))?.to_string(),
config
.value_require(("acme", acme_id, "key"))?
.trim()
.to_string(),
key,
algorithm,
)
@@ -250,8 +253,9 @@ fn build_dns_updater(config: &mut Config, acme_id: &str) -> Option<DnsUpdater> {
DnsUpdater::new_cloudflare(
config
.value_require(("acme", acme_id, "secret"))?
.trim()
.to_string(),
config.value(("acme", acme_id, "user")),
config.value(("acme", acme_id, "user")).map(|s| s.trim()),
timeout.into(),
)
.map_err(|err| {