mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update 

Still throw a locked exception when the path is not relative to $user/files/
This commit is contained in:
Morris Jobke 2017-09-04 14:05:34 +02:00 committed by GitHub
parent 2060ff591b b9b88aa666
commit c04a494ea7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/private/Files/View.php
View File

@ -1941,11 +1941,18 @@ class View {
); );
} }
} catch (\OCP\Lock\LockedException $e) { } catch (\OCP\Lock\LockedException $e) {
// rethrow with the a human-readable path try {
throw new \OCP\Lock\LockedException( // rethrow with the a human-readable path
$this->getPathRelativeToFiles($absolutePath), throw new \OCP\Lock\LockedException(
$e $this->getPathRelativeToFiles($absolutePath),
); $e
);
} catch (\InvalidArgumentException $e) {
throw new \OCP\Lock\LockedException(
$absolutePath,
$e
);
}
} }
} }
@ -2050,7 +2057,7 @@ class View {
return ($pathSegments[2] === 'files') && (count($pathSegments) > 3); return ($pathSegments[2] === 'files') && (count($pathSegments) > 3);
} }
return true; return strpos($path, '/appdata_') !== 0;
} }
/** /**