blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-10-31 02:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(test/socket_activate): inherit env vars

Browse source 
This should fix coverage test.
This commit is contained in:
oxalica 2024-09-22 06:36:02 -04:00
parent 475bd59117
commit b93ff2882e
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
blahd/tests/socket_activate.rs
View file

@ -68,6 +68,17 @@ fn socket_activate(#[case] unix_socket: bool) {
memfd.write_all(CONFIG.as_bytes()).unwrap(); memfd.write_all(CONFIG.as_bytes()).unwrap();
memfd.rewind().unwrap(); memfd.rewind().unwrap();
// Inherit environment variables.
let envs = std::env::vars()
.filter(|(name, _)| !name.starts_with("LISTEN_"))
.map(|(name, value)| CString::new(format!("{name}={value}")).unwrap())
.collect::<Vec<_>>();
let mut env_ptrs = envs
.iter()
.map(|s| s.as_ptr())
.chain([c"LISTEN_FDS=1".as_ptr(), null(), null()])
.collect::<Vec<_>>();
// Unfortunately we have to deal with raw `fork(2)` here, because no library supports passing // Unfortunately we have to deal with raw `fork(2)` here, because no library supports passing
// child PID in environment variables for child. // child PID in environment variables for child.
// SAFETY: Between `fork()` and `execve()`, all syscalls are async-signal-safe: // SAFETY: Between `fork()` and `execve()`, all syscalls are async-signal-safe:
@ -94,11 +105,13 @@ fn socket_activate(#[case] unix_socket: bool) {
]; ];
let mut buf = [0u8; 64]; let mut buf = [0u8; 64];
let _ = write!(&mut buf[..], "LISTEN_PID={}\0", getpid().as_raw()); let _ = write!(&mut buf[..], "LISTEN_PID={}\0", getpid().as_raw());
let envs = [c"LISTEN_FDS=1".as_ptr(), buf.as_ptr().cast(), null()]; let pos = env_ptrs.len() - 2;
env_ptrs[pos] = buf.as_ptr().cast();
// NB. Do raw libc call, not the wrapper fn that does allocation inside. // NB. Do raw libc call, not the wrapper fn that does allocation inside.
// SAFETY: Valid NULL-terminated array of NULL-terminated strings. // SAFETY: Valid NULL-terminated array of NULL-terminated strings.
unsafe { unsafe {
execve(server_exe_c.as_ptr(), args.as_ptr(), envs.as_ptr()); execve(server_exe_c.as_ptr(), args.as_ptr(), env_ptrs.as_ptr());
// If exec fail, the drop guard will abort the process anyway. Do nothing. // If exec fail, the drop guard will abort the process anyway. Do nothing.
} }
} }