A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
add tests and fixes for wasi filesystem datetime overflow (#14403)
Pat Hickey5bf31cb85f5d
diff --git a/crates/test-programs/src/bin/p2_file_settime_overflow.rs b/crates/test-programs/src/bin/p2_file_settime_overflow.rsnew file mode 100644index 0000000000..9f59c0f708--- /dev/null+++ b/crates/test-programs/src/bin/p2_file_settime_overflow.rs@@ -0,0 +1,36 @@+use test_programs::wasi::filesystem::preopens;+use test_programs::wasi::filesystem::types::{+ Datetime, DescriptorFlags, ErrorCode, NewTimestamp, OpenFlags, PathFlags,+};+fn main() {+ let preopens = preopens::get_directories();+ let (dir, _) = &preopens[0];++ let filename = "test.txt";+ let file = dir+ .open_at(+ PathFlags::empty(),+ filename,+ OpenFlags::CREATE,+ DescriptorFlags::READ | DescriptorFlags::WRITE,+ )+ .unwrap();+ let err = file+ .set_times(+ NewTimestamp::Timestamp(Datetime {+ seconds: u64::MAX,+ nanoseconds: 1_000_000_000,+ }),+ NewTimestamp::Timestamp(Datetime {+ seconds: 0,+ nanoseconds: 0,+ }),+ )+ .err()+ .expect("expect set_times with overflowing timestamp to error");+ assert_eq!(+ err,+ ErrorCode::Overflow,+ "expect set_times error to be an overflow"+ );+}diff --git a/crates/test-programs/src/bin/p3_file_settime_overflow.rs b/crates/test-programs/src/bin/p3_file_settime_overflow.rsnew file mode 100644index 0000000000..08cf070a37--- /dev/null+++ b/crates/test-programs/src/bin/p3_file_settime_overflow.rs@@ -0,0 +1,50 @@+use test_programs::p3::wasi::filesystem::types::{+ DescriptorFlags, ErrorCode, Instant, NewTimestamp, OpenFlags, PathFlags,+};+use test_programs::p3::{self, wasi};++struct Component;++p3::export!(Component);++impl p3::exports::wasi::cli::run::Guest for Component {+ async fn run() -> Result<(), ()> {+ let preopens = wasi::filesystem::preopens::get_directories();+ let (dir, _) = &preopens[0];++ let filename = "test.txt".to_owned();+ let file = dir+ .open_at(+ PathFlags::empty(),+ filename,+ OpenFlags::CREATE,+ DescriptorFlags::READ | DescriptorFlags::WRITE,+ )+ .await+ .unwrap();+ let err = file+ .set_times(+ NewTimestamp::Timestamp(Instant {+ seconds: i64::MAX,+ nanoseconds: 1_000_000_000,+ }),+ NewTimestamp::Timestamp(Instant {+ seconds: 0,+ nanoseconds: 0,+ }),+ )+ .await+ .err()+ .expect("expect set_times with overflowing timestamp to error");+ std::assert_matches!(+ err,+ ErrorCode::Overflow,+ "expect set_times error to be an overflow"+ );+ Ok(())+ }+}++fn main() {+ unreachable!()+}diff --git a/crates/wasi/src/p2/host/filesystem.rs b/crates/wasi/src/p2/host/filesystem.rsindex 56e9fda916..1988cd1072 100644--- a/crates/wasi/src/p2/host/filesystem.rs+++ b/crates/wasi/src/p2/host/filesystem.rs@@ -715,8 +715,16 @@ fn descriptortype_from(ft: crate::filesystem::primitives::FileType) -> types::De}fn systemtime_from(t: wall_clock::Datetime) -> Result<std::time::SystemTime, ErrorCode> {+ // Catch nanoseconds-into-seconds Overflow error explicitly:+ // unfortunately, Duration::new panics when input overflows+ let duration = core::time::Duration::new(+ t.seconds+ .checked_add(u64::from(t.nanoseconds / 1_000_000_000))+ .ok_or(ErrorCode::Overflow)?,+ t.nanoseconds % 1_000_000_000,+ );std::time::SystemTime::UNIX_EPOCH- .checked_add(core::time::Duration::new(t.seconds, t.nanoseconds))+ .checked_add(duration).ok_or(ErrorCode::Overflow)}diff --git a/crates/wasi/src/p3/filesystem/host.rs b/crates/wasi/src/p3/filesystem/host.rsindex 92f30d1989..7bf55ba4f9 100644--- a/crates/wasi/src/p3/filesystem/host.rs+++ b/crates/wasi/src/p3/filesystem/host.rs@@ -59,16 +59,28 @@ fn get_writable_file(table: &ResourceTable, fd: &Resource<Descriptor>) -> Filesy}fn systemtime_from(t: system_clock::Instant) -> Result<std::time::SystemTime, ErrorCode> {- if let Ok(seconds) = t.seconds.try_into() {+ if let Ok(seconds) = <i64 as TryInto<u64>>::try_into(t.seconds) {+ // Catch nanoseconds-into-seconds Overflow error explicitly:+ // unfortunately, Duration::new panics when input overflows+ let duration = core::time::Duration::new(+ seconds+ .checked_add(u64::from(t.nanoseconds / 1_000_000_000))+ .ok_or(ErrorCode::Overflow)?,+ t.nanoseconds % 1_000_000_000,+ );std::time::SystemTime::UNIX_EPOCH- .checked_add(core::time::Duration::new(seconds, t.nanoseconds))+ .checked_add(duration).ok_or(ErrorCode::Overflow)} else {+ let duration = core::time::Duration::new(+ t.seconds+ .unsigned_abs()+ .checked_add(u64::from(t.nanoseconds / 1_000_000_000))+ .ok_or(ErrorCode::Overflow)?,+ t.nanoseconds % 1_000_000_000,+ );std::time::SystemTime::UNIX_EPOCH- .checked_sub(core::time::Duration::new(- t.seconds.unsigned_abs(),- t.nanoseconds,- ))+ .checked_sub(duration).ok_or(ErrorCode::Overflow)}}diff --git a/crates/wasi/tests/all/p2/async_.rs b/crates/wasi/tests/all/p2/async_.rsindex b026abc825..c2d059b4d5 100644--- a/crates/wasi/tests/all/p2/async_.rs+++ b/crates/wasi/tests/all/p2/async_.rs@@ -426,6 +426,12 @@ async fn p2_udp_send_too_much() {"unpermitted: argument exceeds permitted size")}+#[test_log::test(tokio::test(flavor = "multi_thread"))]+async fn p2_file_settime_overflow() {+ run(P2_FILE_SETTIME_OVERFLOW_COMPONENT, |_| {})+ .await+ .unwrap()+}#[test_log::test(tokio::test(flavor = "multi_thread"))]async fn p1_file_truncation_readonly() {diff --git a/crates/wasi/tests/all/p2/sync.rs b/crates/wasi/tests/all/p2/sync.rsindex 4b4ab8d594..9e6d3e510c 100644--- a/crates/wasi/tests/all/p2/sync.rs+++ b/crates/wasi/tests/all/p2/sync.rs@@ -398,6 +398,10 @@ fn p2_udp_send_too_much() {"unpermitted: argument exceeds permitted size")}+#[test_log::test]+fn p2_file_settime_overflow() {+ run(P2_FILE_SETTIME_OVERFLOW_COMPONENT, |_| {}).unwrap()+}#[test_log::test]fn p1_file_truncation_readonly() {diff --git a/crates/wasi/tests/all/p3/mod.rs b/crates/wasi/tests/all/p3/mod.rsindex 801bb5db84..ecd83df4ab 100644--- a/crates/wasi/tests/all/p3/mod.rs+++ b/crates/wasi/tests/all/p3/mod.rs@@ -191,6 +191,10 @@ async fn p3_file_write_blocking() -> wasmtime::Result<()> {async fn p3_file_write_chunked() -> wasmtime::Result<()> {run(P3_FILE_WRITE_CHUNKED_COMPONENT).await}+#[test_log::test(tokio::test(flavor = "multi_thread"))]+async fn p3_file_settime_overflow() -> wasmtime::Result<()> {+ run(P3_FILE_SETTIME_OVERFLOW_COMPONENT).await+}#[test_log::test(tokio::test(flavor = "multi_thread"))]async fn p3_file_truncation_readonly() -> wasmtime::Result<()> {