wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move error message to log entry

Browse source 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2017-03-20 11:06:08 +01:00
parent fc57d4b96c
commit ab9e3525cc
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/Files/View.php
View file

@ -96,8 +96,12 @@ class View {
private $updaterEnabled = true; private $updaterEnabled = true;
/** @var \OC\User\Manager */
private $userManager; private $userManager;
/** @var \OCP\ILogger */
private $logger;
/** /**
* @param string $root * @param string $root
* @throws \Exception If $root contains an invalid path * @throws \Exception If $root contains an invalid path
@ -114,6 +118,7 @@ class View {
$this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingProvider = \OC::$server->getLockingProvider();
$this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider); $this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
$this->userManager = \OC::$server->getUserManager(); $this->userManager = \OC::$server->getUserManager();
$this->logger = \OC::$server->getLogger();
} }
public function getAbsolutePath($path = '/') { public function getAbsolutePath($path = '/') {
@ -2068,7 +2073,13 @@ class View {
$parts = explode('/', trim($path, '/'), 3); $parts = explode('/', trim($path, '/'), 3);
// "$user", "files", "path/to/dir" // "$user", "files", "path/to/dir"
if (!isset($parts[1]) || $parts[1] !== 'files') { if (!isset($parts[1]) || $parts[1] !== 'files') {
throw new \InvalidArgumentException('"' . $absolutePath . '" must be relative to "files"'); $this->logger->error(
'$absolutePath must be relative to "files", value is "%s"',
[
$absolutePath
]
);
throw new \InvalidArgumentException('$absolutePath must be relative to "files"');
} }
if (isset($parts[2])) { if (isset($parts[2])) {
return $parts[2]; return $parts[2];

2
tests/lib/Files/ViewTest.php
View file

@ -1488,6 +1488,8 @@ class ViewTest extends \Test\TestCase {
/** /**
* @dataProvider pathRelativeToFilesProviderExceptionCases * @dataProvider pathRelativeToFilesProviderExceptionCases
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
* @expectedExceptionMessage $absolutePath must be relative to "files"
* @param string $path
*/ */
public function testGetPathRelativeToFilesWithInvalidArgument($path) { public function testGetPathRelativeToFilesWithInvalidArgument($path) {
$view = new View(); $view = new View();