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]>
nextcloud · Jul 29, 2024 · 5727edc · 5727edc
1 parent 13d2b67
commit 5727edc
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -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) {