Skip to content

fix: avoid filesystem null reads #447

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

Merged
chubes4 merged 1 commit into from
May 26, 2026
Merged

fix: avoid filesystem null reads #447

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
15 changes: 4 additions & 11 deletions inc/Runtime/WordPressRuntimeInspector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public function ls( array $input ): array|\WP_Error {
* @return array<string,mixed>|\WP_Error
*/
public function read( array $input ): array|\WP_Error {
global $wp_filesystem;
$path = (string) ( $input['path'] ?? '' );
$max_size = $this->clampInt($input['max_size'] ?? self::DEFAULT_MAX_READ_SIZE, 1, self::DEFAULT_MAX_READ_SIZE);
$offset = $this->clampInt($input['offset'] ?? 1, 1, PHP_INT_MAX);
Expand All @@ -151,11 +150,8 @@ public function read( array $input ): array|\WP_Error {
);
}

if ( is_readable($resolved['real_path']) ) {
$sample = $wp_filesystem->get_contents($resolved['real_path'], false, null, 0, min($size, 8192));
} else {
$sample = false;
}
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents,WordPress.PHP.NoSilencedErrors.Discouraged -- Path is validated by resolveAllowedPath().
$sample = @file_get_contents($resolved['real_path'], false, null, 0, min($size, 8192));
if ( false === $sample ) {
return new \WP_Error('datamachine_runtime_unreadable', 'File is not readable.');
}
Expand All @@ -164,11 +160,8 @@ public function read( array $input ): array|\WP_Error {
return new \WP_Error('datamachine_runtime_binary_file', 'Binary file reading is denied.', array( 'path' => $resolved['relative_path'] ));
}

if ( is_readable($resolved['real_path']) ) {
$lines = file($resolved['real_path'], FILE_IGNORE_NEW_LINES);
} else {
$lines = false;
}
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file,WordPress.PHP.NoSilencedErrors.Discouraged -- Path is validated by resolveAllowedPath().
$lines = @file($resolved['real_path'], FILE_IGNORE_NEW_LINES);
if ( false === $lines ) {
return new \WP_Error('datamachine_runtime_unreadable', 'File is not readable.');
}
Expand Down
17 changes: 4 additions & 13 deletions inc/Workspace/WorkspaceWorktreeLifecycle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,20 +1247,15 @@ private function try_rebase_worktree( string $wt_path, array &$response, bool $c
* @return string|null Branch name (e.g. `fix/foo`), or null when unknown.
*/
private function resolve_worktree_branch_from_head_file( string $wt_path ): ?string {
global $wp_filesystem;
$git_pointer = rtrim($wt_path, '/') . '/.git';
if ( ! is_file($git_pointer) && ! is_dir($git_pointer) ) {
return null;
}

$gitdir = null;
if ( is_file($git_pointer) ) {
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- Reading .git pointer file in a controlled worktree.
if ( is_readable($git_pointer) ) {
$pointer = $wp_filesystem->get_contents($git_pointer);
} else {
$pointer = false;
}
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents,WordPress.PHP.NoSilencedErrors.Discouraged -- Reading .git pointer file in a controlled worktree.
$pointer = @file_get_contents($git_pointer);
if ( false === $pointer ) {
return null;
}
Expand All @@ -1285,12 +1280,8 @@ private function resolve_worktree_branch_from_head_file( string $wt_path ): ?str
return null;
}

// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- Reading .git HEAD file in a controlled worktree.
if ( is_readable($head_file) ) {
$head = $wp_filesystem->get_contents($head_file);
} else {
$head = false;
}
// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents,WordPress.PHP.NoSilencedErrors.Discouraged -- Reading .git HEAD file in a controlled worktree.
$head = @file_get_contents($head_file);
if ( false === $head ) {
return null;
}
Expand Down
Loading