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

Move Signer trait into types module

This commit is contained in:
Dirkjan Ochtman 2023-05-18 10:54:19 +02:00
parent 92864b03bf
commit c4a1c29534
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib.rs
View File

@ -23,7 +23,7 @@ pub use types::{
Identifier, LetsEncrypt, NewAccount, NewOrder, OrderState, OrderStatus, Problem, Identifier, LetsEncrypt, NewAccount, NewOrder, OrderState, OrderStatus, Problem,
}; };
use types::{ use types::{
DirectoryUrls, Empty, FinalizeRequest, Header, JoseJson, Jwk, KeyOrKeyId, SigningAlgorithm, DirectoryUrls, Empty, FinalizeRequest, Header, Jwk, KeyOrKeyId, Signer, SigningAlgorithm,
}; };
/// An ACME order as described in RFC 8555 (section 7.1.3) /// An ACME order as described in RFC 8555 (section 7.1.3)
@ -428,34 +428,6 @@ impl Signer for Key {
} }
} }
trait Signer {
type Signature: AsRef<[u8]>;
fn signed_json(
&self,
payload: Option<&impl Serialize>,
protected: Header<'_>,
) -> Result<JoseJson, Error> {
let protected = base64(&protected)?;
let payload = match payload {
Some(data) => base64(&data)?,
None => String::new(),
};
let combined = format!("{protected}.{payload}");
let signature = self.sign(combined.as_bytes())?;
Ok(JoseJson {
protected,
payload,
signature: BASE64_URL_SAFE_NO_PAD.encode(signature.as_ref()),
})
}
fn header<'n, 'u: 'n, 's: 'u>(&'s self, nonce: &'n str, url: &'u str) -> Header<'n>;
fn sign(&self, payload: &[u8]) -> Result<Self::Signature, Error>;
}
/// The response value to use for challenge responses /// The response value to use for challenge responses
/// ///
/// Refer to the methods below to see which encoding to use for your challenge type. /// Refer to the methods below to see which encoding to use for your challenge type.
@ -504,10 +476,6 @@ 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 base64(data: &impl Serialize) -> Result<String, serde_json::Error> {
Ok(BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_vec(data)?))
}
fn client() -> hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>> { fn client() -> hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>> {
let https = hyper_rustls::HttpsConnectorBuilder::new() let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots() .with_native_roots()

32
src/types.rs
View File

@ -261,6 +261,38 @@ pub(crate) struct JoseJson {
pub(crate) signature: String, pub(crate) signature: String,
} }
pub(crate) trait Signer {
type Signature: AsRef<[u8]>;
fn signed_json(
&self,
payload: Option<&impl Serialize>,
protected: Header<'_>,
) -> Result<JoseJson, Error> {
let protected = base64(&protected)?;
let payload = match payload {
Some(data) => base64(&data)?,
None => String::new(),
};
let combined = format!("{protected}.{payload}");
let signature = self.sign(combined.as_bytes())?;
Ok(JoseJson {
protected,
payload,
signature: BASE64_URL_SAFE_NO_PAD.encode(signature.as_ref()),
})
}
fn header<'n, 'u: 'n, 's: 'u>(&'s self, nonce: &'n str, url: &'u str) -> Header<'n>;
fn sign(&self, payload: &[u8]) -> Result<Self::Signature, Error>;
}
fn base64(data: &impl Serialize) -> Result<String, serde_json::Error> {
Ok(BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_vec(data)?))
}
/// An ACME authorization as described in RFC 8555 (section 7.1.4) /// An ACME authorization as described in RFC 8555 (section 7.1.4)
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]