Skip to content

ssh-key: make certificate::Builder::new fallible #71

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.

Sign up for GitHub

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

Merged
tarcieri merged 1 commit into from
Mar 6, 2023
Merged

ssh-key: make certificate::Builder::new fallible #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 15 additions & 20 deletions ssh-key/src/certificate/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ use crate::PrivateKey;
/// subject_public_key,
/// valid_after,
/// valid_before,
/// );
/// )?;
/// cert_builder.serial(42)?; // Optional: serial number chosen by the CA
/// cert_builder.key_id("nobody-cert-02")?; // Optional: CA-specific key identifier
/// cert_builder.cert_type(certificate::CertType::User)?; // User or host certificate
Expand Down Expand Up @@ -104,13 +104,18 @@ impl Builder {
public_key: impl Into<public::KeyData>,
valid_after: u64,
valid_before: u64,
) -> Self {
// TODO(tarcieri): return a `Result` instead of using `expect`
// Breaking change; needs to be done in the next release
let valid_after = UnixTime::new(valid_after).expect("valid_after time overflow");
let valid_before = UnixTime::new(valid_before).expect("valid_before time overflow");
) -> Result<Self> {
let valid_after =
UnixTime::new(valid_after).map_err(|_| Field::ValidAfter.invalid_error())?;

let valid_before =
UnixTime::new(valid_before).map_err(|_| Field::ValidBefore.invalid_error())?;

if valid_before < valid_after {
return Err(Field::ValidBefore.invalid_error());
}

Self {
Ok(Self {
nonce: nonce.into(),
public_key: public_key.into(),
serial: None,
Expand All @@ -122,7 +127,7 @@ impl Builder {
critical_options: OptionsMap::new(),
extensions: OptionsMap::new(),
comment: None,
}
})
}

/// Create a new certificate builder with the validity window specified
Expand All @@ -140,17 +145,7 @@ impl Builder {
let valid_before =
UnixTime::try_from(valid_before).map_err(|_| Field::ValidBefore.invalid_error())?;

// TODO(tarcieri): move this check into `Builder::new`
if valid_before < valid_after {
return Err(Field::ValidBefore.invalid_error());
}

Ok(Self::new(
nonce,
public_key,
valid_before.into(),
valid_after.into(),
))
Self::new(nonce, public_key, valid_before.into(), valid_after.into())
}

/// Create a new certificate builder, generating a random nonce using the
Expand All @@ -161,7 +156,7 @@ impl Builder {
public_key: impl Into<public::KeyData>,
valid_after: u64,
valid_before: u64,
) -> Self {
) -> Result<Self> {
let mut nonce = vec![0u8; Self::RECOMMENDED_NONCE_SIZE];
rng.fill_bytes(&mut nonce);
Self::new(nonce, public_key, valid_after, valid_before)
Expand Down
10 changes: 7 additions & 3 deletions ssh-key/tests/certificate_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ fn ed25519_sign_and_verify() {
subject_key.public_key(),
ISSUED_AT,
EXPIRES_AT,
);
)
.unwrap();

cert_builder.serial(SERIAL).unwrap();
cert_builder.key_id(KEY_ID).unwrap();
cert_builder.valid_principal(PRINCIPAL).unwrap();
Expand Down Expand Up @@ -124,7 +126,8 @@ fn ecdsa_nistp256_sign_and_verify() {
subject_key.public_key(),
ISSUED_AT,
EXPIRES_AT,
);
)
.unwrap();
cert_builder.all_principals_valid().unwrap();
let cert = cert_builder.sign(&ca_key).unwrap();

Expand Down Expand Up @@ -178,7 +181,8 @@ R6qbyo6hPuCiV9cAAAAAAQID
subject_key.public_key(),
ISSUED_AT,
EXPIRES_AT,
);
)
.unwrap();
cert_builder.all_principals_valid().unwrap();
let cert = cert_builder.sign(&ca_key).unwrap();

Expand Down