implements PR-026
This commit is contained in:
@@ -2598,7 +2598,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_loader_hardening_invalid_magic() {
|
||||
let mut vm = VirtualMachine::default();
|
||||
let res = vm.initialize(vec![0, 0, 0, 0], "");
|
||||
let res = vm.initialize(vec![0, 0, 0, 0]);
|
||||
assert_eq!(res, Err(VmInitError::InvalidFormat));
|
||||
// VM should remain empty
|
||||
assert_eq!(vm.program.rom.len(), 0);
|
||||
@@ -2611,7 +2611,7 @@ mod tests {
|
||||
header[0..4].copy_from_slice(b"PBS\0");
|
||||
header[4..6].copy_from_slice(&1u16.to_le_bytes()); // version 1 (unsupported)
|
||||
|
||||
let res = vm.initialize(header, "");
|
||||
let res = vm.initialize(header);
|
||||
assert_eq!(res, Err(VmInitError::UnsupportedFormat));
|
||||
}
|
||||
|
||||
@@ -2622,7 +2622,7 @@ mod tests {
|
||||
header[0..4].copy_from_slice(b"PBS\0");
|
||||
header[8..12].copy_from_slice(&1u32.to_le_bytes()); // 1 section claimed but none provided
|
||||
|
||||
let res = vm.initialize(header, "");
|
||||
let res = vm.initialize(header);
|
||||
match res {
|
||||
Err(VmInitError::ImageLoadFailed(prometeu_bytecode::LoadError::UnexpectedEof)) => {}
|
||||
_ => panic!("Expected PbsV0LoadFailed(UnexpectedEof), got {:?}", res),
|
||||
@@ -2630,7 +2630,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_loader_hardening_entrypoint_not_found() {
|
||||
fn test_loader_hardening_boot_protocol_entrypoint_not_found() {
|
||||
let mut vm = VirtualMachine::default();
|
||||
let header = prometeu_bytecode::model::BytecodeModule {
|
||||
version: 0,
|
||||
@@ -2643,8 +2643,7 @@ mod tests {
|
||||
}
|
||||
.serialize();
|
||||
|
||||
// Try to initialize with numeric entrypoint 10 (out of bounds for empty ROM)
|
||||
let res = vm.initialize(header, "10");
|
||||
let res = vm.initialize(header);
|
||||
assert_eq!(res, Err(VmInitError::EntrypointNotFound));
|
||||
|
||||
// VM state should not be updated
|
||||
@@ -2656,22 +2655,27 @@ mod tests {
|
||||
fn test_loader_hardening_successful_init() {
|
||||
let mut vm = VirtualMachine::default();
|
||||
vm.pc = 123; // Pollution
|
||||
let code = assemble("HALT").expect("assemble");
|
||||
|
||||
let header = prometeu_bytecode::model::BytecodeModule {
|
||||
version: 0,
|
||||
const_pool: vec![],
|
||||
functions: vec![],
|
||||
code: vec![],
|
||||
functions: vec![FunctionMeta {
|
||||
code_offset: 0,
|
||||
code_len: code.len() as u32,
|
||||
..Default::default()
|
||||
}],
|
||||
code,
|
||||
debug_info: None,
|
||||
exports: vec![],
|
||||
syscalls: vec![],
|
||||
}
|
||||
.serialize();
|
||||
|
||||
let res = vm.initialize(header, "");
|
||||
let res = vm.initialize(header);
|
||||
assert!(res.is_ok());
|
||||
assert_eq!(vm.pc, 0);
|
||||
assert_eq!(vm.program.rom.len(), 0);
|
||||
assert_eq!(vm.program.rom.len(), 2);
|
||||
assert_eq!(vm.cycles, 0);
|
||||
}
|
||||
|
||||
@@ -2692,7 +2696,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert!(res.is_ok(), "patched hostcall should initialize");
|
||||
|
||||
@@ -2718,7 +2722,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2758,7 +2762,7 @@ mod tests {
|
||||
],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2790,7 +2794,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2820,7 +2824,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2853,7 +2857,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2888,7 +2892,7 @@ mod tests {
|
||||
}],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -2959,7 +2963,7 @@ mod tests {
|
||||
let mut vm = VirtualMachine::default();
|
||||
vm.set_capabilities(prometeu_hal::syscalls::caps::ALL);
|
||||
let bytes = serialized_single_hostcall_module(syscall);
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
assert!(res.is_ok(), "status-first signature must be accepted: {:?}", res);
|
||||
}
|
||||
}
|
||||
@@ -3015,7 +3019,7 @@ mod tests {
|
||||
let mut vm = VirtualMachine::default();
|
||||
vm.set_capabilities(prometeu_hal::syscalls::caps::ALL);
|
||||
let bytes = serialized_single_hostcall_module(syscall.clone());
|
||||
let err = vm.initialize(bytes, "").expect_err("legacy ABI must be rejected");
|
||||
let err = vm.initialize(bytes).expect_err("legacy ABI must be rejected");
|
||||
match err {
|
||||
VmInitError::LoaderPatchFailed(crate::vm_init_error::LoaderPatchError::ResolveFailed(
|
||||
prometeu_hal::syscalls::DeclaredLoadError::AbiMismatch {
|
||||
@@ -3048,7 +3052,7 @@ mod tests {
|
||||
let mut header = vec![0u8; 32];
|
||||
header[0..4].copy_from_slice(b"PBS\0");
|
||||
|
||||
let res = vm.initialize(header, "");
|
||||
let res = vm.initialize(header);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
@@ -3080,7 +3084,7 @@ mod tests {
|
||||
],
|
||||
);
|
||||
|
||||
let res = vm.initialize(bytes, "");
|
||||
let res = vm.initialize(bytes);
|
||||
|
||||
assert_eq!(
|
||||
res,
|
||||
|
||||
Reference in New Issue
Block a user