Merge pull request #6805 from nextcloud/can-not-change-encryption-directory
Can not change encryption directory
This commit is contained in:
commit
1953a11dfa
|
@ -143,11 +143,11 @@ class ChangeKeyStorageRoot extends Command {
|
||||||
|
|
||||||
$result = $this->rootView->file_put_contents(
|
$result = $this->rootView->file_put_contents(
|
||||||
$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
|
$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
|
||||||
'ownCloud will detect this folder as key storage root only if this file exists'
|
'Nextcloud will detect this folder as key storage root only if this file exists'
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($result === false) {
|
if (!$result) {
|
||||||
throw new \Exception("Can't write to new root folder. Please check the permissions and try again");
|
throw new \Exception("Can't access the new root folder. Please check the permissions and make sure that the folder is in your data folder");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,7 @@ class ChangeKeyStorageRootTest extends TestCase {
|
||||||
|
|
||||||
$this->view->expects($this->once())->method('file_put_contents')
|
$this->view->expects($this->once())->method('file_put_contents')
|
||||||
->with('newRoot/' . \OC\Encryption\Keys\Storage::KEY_STORAGE_MARKER,
|
->with('newRoot/' . \OC\Encryption\Keys\Storage::KEY_STORAGE_MARKER,
|
||||||
'ownCloud will detect this folder as key storage root only if this file exists');
|
'Nextcloud will detect this folder as key storage root only if this file exists')->willReturn(true);
|
||||||
|
|
||||||
$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
|
$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
|
||||||
}
|
}
|
||||||
|
@ -198,6 +198,7 @@ class ChangeKeyStorageRootTest extends TestCase {
|
||||||
public function dataTestPrepareNewRootException() {
|
public function dataTestPrepareNewRootException() {
|
||||||
return [
|
return [
|
||||||
[true, false],
|
[true, false],
|
||||||
|
[true, null],
|
||||||
[false, true]
|
[false, true]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue