Skip to content

fix(tests): copy the runner, not /bin/cat, as the POSIX blocked image #1921

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
OhOkThisIsFine wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tests): copy the runner, not /bin/cat, as the POSIX blocked image #1921

Show file tree
Hide file tree
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
19 changes: 16 additions & 3 deletions tests/test_daemon_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,9 @@ static bool runtime_test_copy_executable(const char *source, const char *destina
return ok;
}

/* PATH must be a copy of this runner: the child runs the
* __cbm_runtime_image_holder mode, which blocks reading the release pipe
* wired to its stdin. */
static pid_t runtime_test_spawn_blocked_executable(const char *path, int *release_fd_out) {
int ready[2] = {-1, -1};
int input[2] = {-1, -1};
Expand Down Expand Up @@ -427,7 +430,7 @@ static pid_t runtime_test_spawn_blocked_executable(const char *path, int *releas
if (input[0] != STDIN_FILENO) {
(void)posix_spawn_file_actions_addclose(&actions, input[0]);
}
char *const child_argv[] = {(char *)path, NULL};
char *const child_argv[] = {(char *)path, "__cbm_runtime_image_holder", NULL};
pid_t child = -1;
if (posix_spawn(&child, path, &actions, NULL, child_argv, environ) != 0) {
child = -1;
Expand Down Expand Up @@ -4518,10 +4521,20 @@ TEST(daemon_runtime_process_fingerprint_never_hashes_replacement_path) {
int replacement_written =
setup ? snprintf(replacement_path, sizeof(replacement_path), "%s/replacement", directory)
: -1;
/* The copied image is this runner in holder mode, not a system utility:
* a multi-call coreutils /bin/cat (uutils) prints "unknown program" and
* exits when executed under the copied name. */
setup = setup && image_written > 0 && image_written < (int)sizeof(image_path) &&
replacement_written > 0 && replacement_written < (int)sizeof(replacement_path) &&
runtime_test_copy_executable("/bin/cat", image_path) &&
runtime_test_copy_executable("/bin/echo", replacement_path);
runtime_test_copy_self_image(image_path);

FILE *replacement_file = setup ? cbm_fopen(replacement_path, "wb") : NULL;
bool replacement_written_ok =
replacement_file && fputs("cbm-posix-replacement-image", replacement_file) >= 0;
if (replacement_file) {
replacement_written_ok = fclose(replacement_file) == 0 && replacement_written_ok;
}
setup = setup && replacement_written_ok;

char original[CBM_DAEMON_BUILD_FINGERPRINT_SIZE] = {0};
char replacement[CBM_DAEMON_BUILD_FINGERPRINT_SIZE] = {0};
Expand Down
16 changes: 13 additions & 3 deletions tests/test_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,19 @@ static int tf_maybe_run_runtime_image_holder(int argc, char **argv) {
Sleep(INFINITE);
return 25;
#else
(void)argc;
(void)argv;
return -1;
/* POSIX copied-image holder: block reading stdin until the parent closes
* the release pipe, exactly like the cat(1) donor this replaced. A system
* utility cannot serve as the copied image — a multi-call coreutils
* binary (uutils cat) refuses to execute under the copied name. */
if (argc != 2 || strcmp(argv[1], "__cbm_runtime_image_holder") != 0) {
return -1;
}
char release[16];
ssize_t count;
do {
count = read(STDIN_FILENO, release, sizeof(release));
} while (count > 0 || (count < 0 && errno == EINTR));
return count == 0 ? 0 : 25;
#endif
}

Expand Down
Loading