From: Robin Appelman <robin@icewind.nl>
Date: Mon, 15 Aug 2022 18:52:12 +0000 (+0200)
Subject: optimize search post-processing for jail wrapper
X-Git-Tag: v24.0.5rc1~7^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9deae5b17a89376176ce2452c4c0b4050410639c;p=nextcloud-server.git

optimize search post-processing for jail wrapper

don't both asking the wrapped cache if we know it's not in our jail anyway

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 7183a6c0d2a..2c8a5b4dbf0 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -324,11 +324,13 @@ class CacheJail extends CacheWrapper {
 	}
 
 	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
-		$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
-		if ($rawEntry) {
-			$jailedPath = $this->getJailedPath($rawEntry->getPath());
-			if ($jailedPath !== null) {
-				return $this->formatCacheEntry(clone $rawEntry) ?: null;
+		if ($this->getGetUnjailedRoot() === '' || strpos($rawEntry->getPath(), $this->getGetUnjailedRoot()) === 0) {
+			$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
+			if ($rawEntry) {
+				$jailedPath = $this->getJailedPath($rawEntry->getPath());
+				if ($jailedPath !== null) {
+					return $this->formatCacheEntry(clone $rawEntry) ?: null;
+				}
 			}
 		}