instant-labs
/
instant-acme
mirror of https://github.com/instant-labs/instant-acme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use trait object for HTTP client implementation

This commit is contained in:
Dirkjan Ochtman 2023-05-30 10:19:52 +02:00
parent 2fa8b657a6
commit 560ae75535
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/lib.rs
View File

@ -8,7 +8,7 @@ use std::fmt;
use std::sync::Arc; use std::sync::Arc;
use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD}; use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD};
use hyper::client::HttpConnector; use hyper::client::{HttpConnector, ResponseFuture};
use hyper::header::{CONTENT_TYPE, LOCATION}; use hyper::header::{CONTENT_TYPE, LOCATION};
use hyper::{Body, Method, Request, Response}; use hyper::{Body, Method, Request, Response};
use ring::digest::{digest, SHA256}; use ring::digest::{digest, SHA256};
@ -210,7 +210,7 @@ impl Account {
server_url: &str, server_url: &str,
external_account: Option<&ExternalAccountKey>, external_account: Option<&ExternalAccountKey>,
) -> Result<Account, Error> { ) -> Result<Account, Error> {
let client = Client::new(server_url).await?; let client = Client::new(server_url, Box::new(DefaultClient::default())).await?;
let key = Key::generate()?; let key = Key::generate()?;
let payload = NewAccountPayload { let payload = NewAccountPayload {
new_account: account, new_account: account,
@ -292,7 +292,7 @@ impl AccountInner {
Ok(Self { Ok(Self {
key: Key::from_pkcs8_der(BASE64_URL_SAFE_NO_PAD.decode(&credentials.key_pkcs8)?)?, key: Key::from_pkcs8_der(BASE64_URL_SAFE_NO_PAD.decode(&credentials.key_pkcs8)?)?,
client: Client { client: Client {
client: client(), http: Box::new(DefaultClient::default()),
urls: credentials.urls.into_owned(), urls: credentials.urls.into_owned(),
}, },
id: credentials.id.into_owned(), id: credentials.id.into_owned(),
@ -345,19 +345,21 @@ impl Signer for AccountInner {
} }
} }
#[derive(Debug)]
struct Client { struct Client {
client: hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>>, http: Box<dyn HttpClient>,
urls: DirectoryUrls, urls: DirectoryUrls,
} }
impl Client { impl Client {
async fn new(server_url: &str) -> Result<Self, Error> { async fn new(server_url: &str, http: Box<dyn HttpClient>) -> Result<Self, Error> {
let client = client(); let req = Request::builder()
let rsp = client.get(server_url.parse()?).await?; .uri(server_url)
.body(Body::empty())
.unwrap();
let rsp = http.request(req).await?;
let body = hyper::body::to_bytes(rsp.into_body()).await?; let body = hyper::body::to_bytes(rsp.into_body()).await?;
Ok(Client { Ok(Client {
client, http,
urls: serde_json::from_slice(&body)?, urls: serde_json::from_slice(&body)?,
}) })
} }
@ -376,7 +378,7 @@ impl Client {
.body(Body::empty()) .body(Body::empty())
.unwrap(); .unwrap();
let rsp = self.client.request(request).await?; let rsp = self.http.request(request).await?;
nonce = nonce_from_response(&rsp); nonce = nonce_from_response(&rsp);
}; };
@ -389,7 +391,16 @@ impl Client {
.body(Body::from(serde_json::to_vec(&body)?)) .body(Body::from(serde_json::to_vec(&body)?))
.unwrap(); .unwrap();
Ok(self.client.request(request).await?) Ok(self.http.request(request).await?)
}
}
impl fmt::Debug for Client {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Client")
.field("client", &"..")
.field("urls", &self.urls)
.finish()
} }
} }
@ -533,15 +544,31 @@ fn nonce_from_response(rsp: &Response<Body>) -> Option<String> {
.and_then(|hv| String::from_utf8(hv.as_ref().to_vec()).ok()) .and_then(|hv| String::from_utf8(hv.as_ref().to_vec()).ok())
} }
fn client() -> hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>> { struct DefaultClient(hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>>);
let https = hyper_rustls::HttpsConnectorBuilder::new()
impl HttpClient for DefaultClient {
fn request(&self, req: Request<Body>) -> ResponseFuture {
self.0.request(req)
}
}
impl Default for DefaultClient {
fn default() -> Self {
Self(
hyper::Client::builder().build(
hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots() .with_native_roots()
.https_only() .https_only()
.enable_http1() .enable_http1()
.enable_http2() .enable_http2()
.build(); .build(),
),
)
}
}
hyper::Client::builder().build(https) trait HttpClient {
fn request(&self, req: Request<Body>) -> ResponseFuture;
} }
const JOSE_JSON: &str = "application/jose+json"; const JOSE_JSON: &str = "application/jose+json";