Fix getting cache entry in copyFromStorage

Use the permissions from the unmasked permissions entry since the
masked entry doesn't always have the correct permissions.

Author: CarlSchwan

lib/private/Files/Cache/Cache.php

@@ -42,7 +42,6 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
-use OCP\Constants;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Cache\CacheEntryInsertedEvent;
@@ -1017,14 +1016,6 @@ public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, str
 			throw new \RuntimeException("Invalid source cache entry on copyFromCache");
 		}
 		$data = $this->cacheEntryToArray($sourceEntry);
-		$targetParentEntry = $this->get(dirname($targetPath));
-		if ($targetParentEntry !== false && $targetParentEntry !== null) {
-			if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-				$data['permissions'] = $targetParentEntry->getPermissions();
-			} else {
-				$data['permissions'] = $targetParentEntry->getPermissions() & ~Constants::PERMISSION_CREATE;
-			}
-		}
 		$fileId = $this->put($targetPath, $data);
 		if ($fileId <= 0) {
 			throw new \RuntimeException("Failed to copy to " . $targetPath . " from cache with source data " . json_encode($data) . " ");

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -35,6 +35,7 @@
 use OC\Files\Cache\Cache;
 use OC\Files\Cache\CacheEntry;
 use OC\Files\Storage\PolyFill\CopyDirectory;
+use OC\Files\Storage\Wrapper\Jail;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
@@ -539,7 +540,13 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
 			/** @var ObjectStoreStorage $sourceStorage */
 			if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
+				/** @var CacheEntry $sourceEntry */
 				$sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
+				$sourceEntryData = $sourceEntry->getData();
+				if (is_array($sourceEntryData) && $sourceEntryData['scan_permissions']) {
+					$sourceEntryData['permissions'] = $sourceEntryData['scan_permissions'];
+				}
+				$sourceEntry = new CacheEntry($sourceEntryData);
 				$this->copyInner($sourceEntry, $targetInternalPath);
 				return true;
 			}