Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions dstack/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dstack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ rand = "0.8.5"
regorus = { version = "0.10.1", default-features = false, features = ["full-opa", "arc"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
safe-write = "0.1.2"
safe-write = "0.2.0"
rustix = { version = "0.38", features = ["fs"] }
nix = "0.29.0"
# Vendored: 6.0.2 does not build for musl. See vendor/README.md.
Expand Down
13 changes: 8 additions & 5 deletions dstack/dstack-util/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use ra_tls::{
kdf::{derive_key, derive_p256_key_pair_from_bytes},
rcgen::KeyPair,
};
use safe_write::{safe_write, safe_write_with_mode};
use scale::Encode;
use std::path::Path;
use std::{
Expand Down Expand Up @@ -793,8 +794,9 @@ fn cmd_gen_ra_cert(args: GenRaCertArgs) -> Result<()> {
let ca_cert = fs::read_to_string(args.ca_cert)?;
let ca_key = fs::read_to_string(args.ca_key)?;
let cert_pair = generate_ra_cert(ca_cert, ca_key)?;
fs::write(&args.cert_path, cert_pair.cert_pem).context("Failed to write certificate")?;
fs::write(&args.key_path, cert_pair.key_pem).context("Failed to write private key")?;
safe_write(&args.cert_path, &cert_pair.cert_pem).context("Failed to write certificate")?;
safe_write_with_mode(&args.key_path, &cert_pair.key_pem, 0o600)
.context("Failed to write private key")?;
Ok(())
}

Expand All @@ -819,8 +821,9 @@ fn cmd_gen_ca_cert(args: GenCaCertArgs) -> Result<()> {
let cert = req
.self_signed()
.context("Failed to self-sign certificate")?;
fs::write(&args.cert, cert.pem()).context("Failed to write certificate")?;
fs::write(&args.key, key.serialize_pem()).context("Failed to write private key")?;
safe_write(&args.cert, cert.pem()).context("Failed to write certificate")?;
safe_write_with_mode(&args.key, key.serialize_pem(), 0o600)
.context("Failed to write private key")?;
Ok(())
}

Expand All @@ -835,7 +838,7 @@ fn cmd_gen_app_keys(args: GenAppKeysArgs) -> Result<()> {
};
let app_keys = make_app_keys(&key, &disk_key, &k256_key, args.ca_level, key_provider)?;
let app_keys = serde_json::to_string(&app_keys).context("Failed to serialize app keys")?;
fs::write(&args.output, app_keys).context("Failed to write app keys")?;
safe_write_with_mode(&args.output, &app_keys, 0o600).context("Failed to write app keys")?;
Ok(())
}

Expand Down
Loading