tls remove der header from captured RustlsOwnedTrustAnchor fields

This commit is contained in:
nworbnhoj 2023-06-29 09:42:19 +10:00
parent 2f042cff70
commit 7cef80e193
2 changed files with 55 additions and 3 deletions

View file

@ -19,6 +19,7 @@ modals = { path = "../../services/modals" }
net = { path = "../../services/net" }
pddb = { path = "../../services/pddb" }
der = { version = "0.7.6", features = ["derive"] }
locales = {path = "../../locales"}
rkyv = "0.4.3"

View file

@ -1,11 +1,17 @@
// A mirror of rustls::OwnedTrustAnchor
use rkyv::{Archive, Deserialize, Serialize,};
use der::{Encode, Reader};
use rkyv::{Archive, Deserialize, Serialize};
use std::cmp::min;
use std::convert::TryInto;
use std::fmt;
use std::io::{Error, ErrorKind};
use x509_parser::der_parser::der::Tag;
use x509_parser::prelude::{FromDer, X509Certificate};
/// A close mirror of rustls::OwnedTrustAnchor - but with extras
/// Note that the subject, spki & name_constraints fields are
/// DER encoded but WITHOUT the DER header.
#[derive(Archive, Serialize, Deserialize, Debug)]
pub struct RustlsOwnedTrustAnchor {
pub subject: Vec<u8>,
@ -30,6 +36,7 @@ impl RustlsOwnedTrustAnchor {
let der = self.subject.clone();
let len = min(der.len(), 127);
let mut der = der[..len].to_owned();
// hack back in the DER header to enable decode :-/
der.insert(0, len as u8);
der.insert(0, Tag::Sequence.0 as u8);
match x509_parser::x509::X509Name::from_der(&der) {
@ -41,10 +48,24 @@ impl RustlsOwnedTrustAnchor {
impl<'a> From<&X509Certificate<'a>> for RustlsOwnedTrustAnchor {
fn from(x509: &X509Certificate) -> Self {
// Remove the DER headers in keeping with rustls::OwnersTrustAnchor
RustlsOwnedTrustAnchor {
subject: x509.subject().as_raw().to_vec(),
spki: x509.public_key().raw.to_vec(),
subject: match rm_der_header(x509.subject().as_raw()) {
Ok(naked_der) => naked_der,
Err(e) => {
log::warn!("{e}");
b"der decode failed".to_vec()
}
},
spki: match rm_der_header(x509.public_key().raw) {
Ok(naked_der) => naked_der,
Err(e) => {
log::warn!("{e}");
b"der decode failed".to_vec()
}
},
name_constraints: None,
// name_constraints: x509.name_constraints().unwrap_or(None).map(|c| c.value.into()),
// may have to pass value thru from certificates parameter
// name_constraints: match x509.name_constraints() {
// Ok(Some(nc)) => Some(nc.value),
@ -58,6 +79,36 @@ impl<'a> From<&X509Certificate<'a>> for RustlsOwnedTrustAnchor {
}
}
/// Remove the DER header from the DER encoded [u8]
/// Remove a DER header from a DER encoded [u8]
fn rm_der_header(der: &[u8]) -> Result<Vec<u8>, Error> {
match der::SliceReader::new(der) {
Ok(reader) => match reader.peek_header() {
Ok(header) => match header.encoded_len() {
Ok(len) => match TryInto::<usize>::try_into(len) {
Ok(len) => Ok(der[len..].to_vec()),
Err(_) => Err(Error::new(
ErrorKind::InvalidData,
"der decode failed: into",
)),
},
Err(_) => Err(Error::new(
ErrorKind::InvalidData,
"der decode failed: length",
)),
},
Err(_) => Err(Error::new(
ErrorKind::InvalidData,
"der decode failed: header",
)),
},
Err(_) => Err(Error::new(
ErrorKind::InvalidData,
"der decode failed: reader",
)),
}
}
impl<'a> From<&webpki::TrustAnchor<'a>> for RustlsOwnedTrustAnchor {
fn from(ta: &webpki::TrustAnchor) -> Self {
Self::from_subject_spki_name_constraints(ta.subject, ta.spki, ta.name_constraints)