Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(did-key): Add Support To Resolve JWK_JCS-PUB encoded did:key DIDs #600

Merged
merged 14 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from 10 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
35 changes: 35 additions & 0 deletions crates/jwk/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ impl FromStr for JWK {
}
}

impl TryFrom<&[u8]> for JWK {
type Error = serde_json::Error;

fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
serde_json::from_slice(bytes)
}
}

impl TryFrom<serde_json::Value> for JWK {
type Error = serde_json::Error;

Expand Down Expand Up @@ -302,6 +310,10 @@ impl JWK {
}
}

pub fn from_bytes(bytes: &[u8]) -> Result<JWK, serde_json::Error> {
serde_json::from_slice(bytes)
}

#[cfg(feature = "ed25519")]
pub fn generate_ed25519_from(
rng: &mut (impl rand::CryptoRng + rand::RngCore),
Expand Down Expand Up @@ -1319,6 +1331,7 @@ mod tests {
const RSA_DER: &[u8] = include_bytes!("../../../tests/rsa2048-2020-08-25.der");
const RSA_PK_DER: &[u8] = include_bytes!("../../../tests/rsa2048-2020-08-25-pk.der");
const ED25519_JSON: &str = include_str!("../../../tests/ed25519-2020-10-18.json");
const JWK_JCS_JSON: &[u8] = include_bytes!("../../../tests/jwk_jcs-pub.json");

#[test]
fn jwk_to_from_der_rsa() {
Expand All @@ -1330,6 +1343,28 @@ mod tests {
assert_eq!(key.to_public().params, Params::RSA(rsa_params));
}

#[test]
fn jwk_from_bytes() {
let actual_jwk: JWK = JWK::from_bytes(JWK_JCS_JSON).unwrap();
let actual_params: Params = actual_jwk.params;
if let Params::EC(ref ec_params) = actual_params {
assert_eq!(ec_params.curve.as_deref(), Some("P-256"));
} else {
panic!("actual_params is not of type Params::EC");
}
}

#[test]
fn jwk_try_from_bytes() {
let actual_jwk: JWK = JWK::try_from(JWK_JCS_JSON).unwrap();
let actual_params: Params = actual_jwk.params;
if let Params::EC(ref ec_params) = actual_params {
assert_eq!(ec_params.curve.as_deref(), Some("P-256"));
} else {
panic!("actual_params is not of type Params::EC");
}
}

#[test]
fn rsa_from_str() {
let _key: JWK = serde_json::from_str(RSA_JSON).unwrap();
Expand Down
6 changes: 6 additions & 0 deletions crates/jwk/src/multicodec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ impl JWK {
ssi_multicodec::BLS12_381_G2_PUB => {
crate::bls12381g2_parse(k).map_err(FromMulticodecError::Bls12381G2Pub)
}
ssi_multicodec::JWK_JCS_PUB => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test checking that its able to decode a JWK encoded with the JWK_JCS_PUB multicodec?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

JWK::from_bytes(k).map_err(FromMulticodecError::JwkJcsPub)
}
_ => Err(FromMulticodecError::UnsupportedCodec(codec)),
}
}
Expand Down Expand Up @@ -165,6 +168,9 @@ pub enum FromMulticodecError {
#[error(transparent)]
Bls12381G2Pub(ssi_bbs::Error),

#[error(transparent)]
JwkJcsPub(serde_json::Error),

/// Unexpected multibase (multicodec) key prefix multicodec
#[error("Unsupported multicodec key type 0x{0:x}")]
UnsupportedCodec(u64),
Expand Down
6 changes: 6 additions & 0 deletions tests/jwk_jcs-pub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"crv": "P-256",
"kty": "EC",
"x": "g3fsv1xpWPH099LIUn_zJoOF5Ur8xobyzZwX9m_dJ4E",
"y": "9304UAFl55xQMfrnB-zKEjjXEC4OFWSuYnr7W6hdkVA"
}