Skip to content

[PHP] fix: preserve unix socket path ownership in stat #753

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

Open
brandonpayton wants to merge 1 commit into
base: integration/kd-6nz-php-phpt-harness-only-base
Choose a base branch
from
+43 −62
Open

[PHP] fix: preserve unix socket path ownership in stat #753

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
105 changes: 43 additions & 62 deletions crates/kernel/src/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4010,6 +4010,34 @@ fn match_pty_stat(resolved: &[u8], uid: u32, gid: u32) -> Option<WasmStat> {
}
}

fn unix_socket_path_stat(
proc: &Process,
host: &mut dyn HostIO,
resolved: &[u8],
follow: bool,
) -> Result<Option<WasmStat>, Errno> {
let registry = unsafe { crate::unix_socket::global_unix_socket_registry() };
if !registry.contains(resolved) {
return Ok(None);
}

// Filesystem-backed AF_UNIX sockets have ordinary path metadata. The
// socket registry tells Kandelo that the path should report S_IFSOCK, but
// uid/gid/mode/timestamps still come from the underlying VFS inode so
// chown(2), chmod(2), and stat(2) round-trip like a POSIX socket node.
check_search_path(proc, host, resolved)?;
let mut st = if follow {
host.host_stat(resolved)?
} else {
host.host_lstat(resolved)?
};
st.st_mode = wasm_posix_shared::mode::S_IFSOCK | (st.st_mode & 0o7777);
if st.st_nlink == 0 {
st.st_nlink = 1;
}
Ok(Some(st))
}

pub fn sys_stat(proc: &mut Process, host: &mut dyn HostIO, path: &[u8]) -> Result<WasmStat, Errno> {
let resolved = resolve_path(path, &proc.cwd);
if let Some(dev) = match_virtual_device(&resolved) {
Expand Down Expand Up @@ -4046,27 +4074,8 @@ pub fn sys_stat(proc: &mut Process, host: &mut dyn HostIO, path: &[u8]) -> Resul
if let Some(st) = synthetic_file_stat(&resolved, proc.euid, proc.egid) {
return Ok(st);
}
// Check Unix socket registry
{
let registry = unsafe { crate::unix_socket::global_unix_socket_registry() };
if registry.contains(&resolved) {
return Ok(WasmStat {
st_dev: 0,
st_ino: 0x554E5800, // "UNX\0"
st_mode: wasm_posix_shared::mode::S_IFSOCK | 0o755,
st_nlink: 1,
st_uid: proc.euid,
st_gid: proc.egid,
st_size: 0,
st_atime_sec: 0,
st_atime_nsec: 0,
st_mtime_sec: 0,
st_mtime_nsec: 0,
st_ctime_sec: 0,
st_ctime_nsec: 0,
_pad: 0,
});
}
if let Some(st) = unix_socket_path_stat(proc, host, &resolved, true)? {
return Ok(st);
}
// VFS is the source of truth for ownership: host_stat already returns the
// file's real uid/gid, so just propagate.
Expand Down Expand Up @@ -4114,27 +4123,8 @@ pub fn sys_lstat(
if let Some(st) = synthetic_file_stat(&resolved, proc.euid, proc.egid) {
return Ok(st);
}
// Check Unix socket registry
{
let registry = unsafe { crate::unix_socket::global_unix_socket_registry() };
if registry.contains(&resolved) {
return Ok(WasmStat {
st_dev: 0,
st_ino: 0x554E5800, // "UNX\0"
st_mode: wasm_posix_shared::mode::S_IFSOCK | 0o755,
st_nlink: 1,
st_uid: proc.euid,
st_gid: proc.egid,
st_size: 0,
st_atime_sec: 0,
st_atime_nsec: 0,
st_mtime_sec: 0,
st_mtime_nsec: 0,
st_ctime_sec: 0,
st_ctime_nsec: 0,
_pad: 0,
});
}
if let Some(st) = unix_socket_path_stat(proc, host, &resolved, false)? {
return Ok(st);
}
// VFS is the source of truth for ownership: host_lstat already returns the
// link's real uid/gid, so just propagate.
Expand Down Expand Up @@ -8255,27 +8245,10 @@ pub fn sys_fstatat(
if let Some(st) = synthetic_file_stat(&resolved, proc.euid, proc.egid) {
return Ok(st);
}
// Check Unix socket registry
if let Some(st) =
unix_socket_path_stat(proc, host, &resolved, flags & AT_SYMLINK_NOFOLLOW == 0)?
{
let registry = unsafe { crate::unix_socket::global_unix_socket_registry() };
if registry.contains(&resolved) {
return Ok(WasmStat {
st_dev: 0,
st_ino: 0x554E5800, // "UNX\0"
st_mode: wasm_posix_shared::mode::S_IFSOCK | 0o755,
st_nlink: 1,
st_uid: proc.euid,
st_gid: proc.egid,
st_size: 0,
st_atime_sec: 0,
st_atime_nsec: 0,
st_mtime_sec: 0,
st_mtime_nsec: 0,
st_ctime_sec: 0,
st_ctime_nsec: 0,
_pad: 0,
});
}
return Ok(st);
}
// VFS is the source of truth for ownership: host_stat / host_lstat
// already return the real uid/gid, so just propagate.
Expand Down Expand Up @@ -16661,6 +16634,14 @@ mod tests {
st.st_mode & wasm_posix_shared::mode::S_IFMT,
wasm_posix_shared::mode::S_IFSOCK
);
sys_chown(&mut proc, &mut host, b"/tmp/stat.sock", 1234, 5678).unwrap();
let st = sys_stat(&mut proc, &mut host, b"/tmp/stat.sock").unwrap();
assert_eq!(st.st_uid, 1234);
assert_eq!(st.st_gid, 5678);
assert_eq!(
st.st_mode & wasm_posix_shared::mode::S_IFMT,
wasm_posix_shared::mode::S_IFSOCK
);

// Cleanup
let registry = unsafe { crate::unix_socket::global_unix_socket_registry() };
Expand Down
Loading