Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions certbot/src/acme_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

use anyhow::{bail, Context, Result};
use fs_err as fs;
use hickory_resolver::error::ResolveErrorKind;
use hickory_resolver::{
config::{ResolverConfig, ResolverOpts},
error::ResolveErrorKind,
};
use instant_acme::{
Account, AccountCredentials, AuthorizationStatus, ChallengeType, Identifier, NewAccount,
NewOrder, Order, OrderStatus, Problem,
Expand Down Expand Up @@ -347,8 +350,9 @@ impl AcmeClient {

sleep(delay).await;

debug!("Creating Google DNS resolver for verification");
let dns_resolver =
AsyncResolver::tokio_from_system_conf().context("failed to create dns resolver")?;
AsyncResolver::tokio(ResolverConfig::google(), ResolverOpts::default());

while let Some(challenge) = unsettled_challenges.pop() {
let expected_txt = &challenge.dns_value;
Expand Down
8 changes: 2 additions & 6 deletions certbot/src/dns01_client/cloudflare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ impl Dns01Api for CloudflareClient {

let response = client
.get(&url)
.query(&[("name", domain)])
.header("Authorization", format!("Bearer {}", self.api_token))
.send()
.await?;
Expand All @@ -131,12 +132,7 @@ impl Dns01Api for CloudflareClient {
let response: CloudflareResponse =
response.json().await.context("failed to parse response")?;

let records = response
.result
.into_iter()
.filter(|record| record.name == domain)
.collect();
Ok(records)
Ok(response.result)
}
}

Expand Down