Skip to content

fix(files): Don't try to hash invalid paths #46845

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

Closed
solracsf wants to merge 5 commits into from
Closed

fix(files): Don't try to hash invalid paths #46845

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5727edc
fix(files): Catch null possibilities before hash
solracsf Jul 29, 2024
9d6cb8a
fix: add phpDoc
solracsf Aug 1, 2024
596111c
fix: remove check for null
solracsf Aug 1, 2024
a4f4cbe
fix: stronger type hint
solracsf Aug 14, 2024
44afd9c
fix: lint
solracsf Aug 14, 2024
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
Next Next commit
fix(files): Catch null possibilities before hash 
Signed-off-by: Git'Fellow <[email protected]>

fix: don't use OCP

Signed-off-by: Git'Fellow <[email protected]>

fix: Also check if null

Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf
solracsf committed Jul 29, 2024
commit 5727edcedc79172addf0c3b9c6f531254ebbf1cf
16 changes: 14 additions & 2 deletions lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,20 @@ public function fopen($path, $mode) {
return $result;
}

public function hash($type, $path, $raw = false) {
return hash_file($type, $this->getSourcePath($path), $raw);
public function hash($type, $path, $raw = false): string|bool {
$sourcePath = $this->getSourcePath($path);
if ($sourcePath === null || !file_exists($sourcePath) || !is_readable($sourcePath)) {
\OC::$server->get(LoggerInterface::class)->error('Source path does not exist or is not readable: ' . $sourcePath, ['app' => 'core']);
return false;
}

$validAlgorithms = hash_algos();
if (!in_array($type, $validAlgorithms)) {
\OC::$server->get(LoggerInterface::class)->error('Invalid hash algorithm: ' . $type, ['app' => 'core']);
return false;
}

return hash_file($type, $sourcePath, $raw);
}

public function free_space($path) {
Expand Down