forked from openmls/openmls
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
18 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,8 @@ use openmls_traits::{ | |
pub struct CertificateKeyPair(pub SignatureKeyPair); | ||
|
||
impl CertificateKeyPair { | ||
/// Constructs the `CertificateKeyPair` from a private key and a der encoded certificate chain | ||
/// Constructs the `CertificateKeyPair` from a private key and a der encoded | ||
/// certificate chain | ||
pub fn new(sk: Vec<u8>, cert_chain: Vec<Vec<u8>>) -> Result<Self, CryptoError> { | ||
if cert_chain.len() < 2 { | ||
return Err(CryptoError::IncompleteCertificateChain); | ||
|
@@ -105,8 +106,6 @@ pub trait X509Ext { | |
fn identity(&self) -> Result<Vec<u8>, CryptoError>; | ||
} | ||
|
||
const CLIENT_ID_PREFIX: &str = "im:wireapp="; | ||
|
||
impl X509Ext for Certificate { | ||
fn is_valid(&self) -> Result<(), CryptoError> { | ||
if !self.is_time_valid()? { | ||
|
@@ -214,11 +213,14 @@ impl X509Ext for Certificate { | |
} | ||
} | ||
|
||
/// Turn 'wireapp:https://ZHpLZLZMROeMWp4sJlL2XA:[email protected]' into | ||
/// '647a4b64-b64c-44e7-8c5a-9e2c2652f65c:[email protected]' | ||
fn try_to_qualified_wire_client_id(client_id: &str) -> Option<Vec<u8>> { | ||
const COLON: u8 = 58; | ||
const WIRE_URI_SCHEME: &str = "wireapp:https://"; | ||
|
||
let client_id = client_id.strip_prefix(CLIENT_ID_PREFIX)?; | ||
let (user_id, rest) = client_id.split_once('/')?; | ||
let client_id = client_id.strip_prefix(WIRE_URI_SCHEME)?; | ||
let (user_id, rest) = client_id.split_once(':')?; | ||
let user_id = to_hyphenated_user_id(user_id)?; | ||
|
||
let client_id = [&user_id[..], &[COLON], rest.as_bytes()].concat(); | ||
|
@@ -237,3 +239,14 @@ fn to_hyphenated_user_id(user_id: &str) -> Option<[u8; uuid::fmt::Hyphenated::LE | |
|
||
Some(buf) | ||
} | ||
|
||
#[test] | ||
fn to_qualified_wire_client_id_should_work() { | ||
let input = "wireapp:https://ZHpLZLZMROeMWp4sJlL2XA:[email protected]"; | ||
let output = try_to_qualified_wire_client_id(input).unwrap(); | ||
let output = std::str::from_utf8(&output).unwrap(); | ||
assert_eq!( | ||
output, | ||
"647a4b64-b64c-44e7-8c5a-9e2c2652f65c:[email protected]" | ||
); | ||
} |