Skip to content
Merged
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
35 changes: 31 additions & 4 deletions dstack/dstack-util/src/system_setup/config_id_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ fn verify_mr_config_v3_document(
bail!("Invalid mr_config app_id");
}
}
if let Some(instance_id) = mr_config.instance_id.as_deref() {
if instance_id != local.instance_id {
bail!("Invalid mr_config instance_id");
}
// Absent means empty: a relying party cannot tell an omitted instance_id
// from `no_instance_id`, so it must not skip the check.
if mr_config.instance_id.as_deref().unwrap_or_default() != local.instance_id {
bail!("Invalid mr_config instance_id");
}
if mr_config.key_provider != local.key_provider {
bail!("Invalid mr_config key_provider");
Expand Down Expand Up @@ -305,6 +305,33 @@ mod tests {
Ok(())
}

#[test]
fn mr_config_v3_treats_missing_instance_id_as_empty() {
let compose_hash = [0x22u8; 32];
let app_id = [0x11u8; 20];
let document = MrConfigV3::new(
app_id.to_vec(),
compose_hash.to_vec(),
None,
KeyProviderKind::Kms,
Vec::new(),
Vec::new(),
)
.to_canonical_json();
let local = |instance_id| LocalMrConfigValues {
compose_hash: &compose_hash,
gpu_policy_hash: &[0x55u8; 32],
init_script_hashes: &[],
app_id: &app_id,
instance_id,
key_provider: KeyProviderKind::Kms,
key_provider_id: &[],
};

assert!(verify_mr_config_v3_document(&document, local(&[0x44u8; 20])).is_err());
assert!(verify_mr_config_v3_document(&document, local(&[])).is_ok());
}

#[test]
fn mr_config_v3_document_must_match_expected_gpu_policy_hash() {
let compose_hash = [0x22u8; 32];
Expand Down
Loading