3 files changed, 34 insertions, 12 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index c70db0b5ae4..c1baee4f1ef 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -28,11 +28,8 @@ $authBackend = new OC_Connector_Sabre_Auth();
 $lockBackend = new OC_Connector_Sabre_Locks();
 $requestBackend = new OC_Connector_Sabre_Request();
 
-// Create ownCloud Dir
-$rootDir = new OC_Connector_Sabre_Directory('');
-$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir);
-
 // Fire up server
+$objectTree = new \OC\Connector\Sabre\ObjectTree();
 $server = new OC_Connector_Sabre_Server($objectTree);
 $server->httpRequest = $requestBackend;
 $server->setBaseUri($baseuri);
@@ -43,10 +40,21 @@ $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName())
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false));
 $server->addPlugin(new OC_Connector_Sabre_FilesPlugin());
-$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin());
-$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
 $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
 
+// wait with registering these until auth is handled and the filesystem is setup
+$server->subscribeEvent('beforeMethod', function () use ($server, $objectTree) {
+	$view = \OC\Files\Filesystem::getView();
+	$rootInfo = $view->getFileInfo('');
+
+	// Create ownCloud Dir
+	$rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo);
+	$objectTree->init($rootDir, $view);
+
+	$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin($view));
+	$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view));
+}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
+
 // And off we go!
 $server->exec();
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 717b66b86af..a29ef831a52 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -510,7 +510,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	 */
 	public static function loginHelper($user, $create = false, $password = false) {
 		if ($create) {
-			\OC_User::createUser($user, $user);
+			try {
+				\OC_User::createUser($user, $user);
+			} catch(\Exception $e) { // catch username is already being used from previous aborted runs
+
+			}
 		}
 
 		if ($password === false) {
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 8e8b9c53cee..1fe4c13d59e 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -33,6 +33,7 @@ use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Webdav
+ *
  * @brief this class provide basic webdav tests for PUT,GET and DELETE
  */
 class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
@@ -48,6 +49,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	public $dataShort;
 	public $stateFilesTrashbin;
 
+	private static $storage;
+
 	public static function setUpBeforeClass() {
 		// reset backend
 		\OC_User::clearBackends();
@@ -65,6 +68,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 
 		// create test user
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
+
+		self::$storage = new \OC\Files\Storage\Temporary(array());
 	}
 
 	function setUp() {
@@ -96,8 +101,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		}
-		else {
+		} else {
 			OC_App::disable('files_trashbin');
 		}
 	}
@@ -153,7 +157,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
 
 		// get decrypted file contents
-		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files'. $filename);
+		$decrypt = file_get_contents('crypt:///' . $this->userId . '/files' . $filename);
 
 		// check if file content match with the written content
 		$this->assertEquals($this->dataShort, $decrypt);
@@ -225,7 +229,12 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$requestBackend = new OC_Connector_Sabre_Request();
 
 		// Create ownCloud Dir
-		$publicDir = new OC_Connector_Sabre_Directory('');
+		$root = '/' . $this->userId . '/files';
+		\OC\Files\Filesystem::mount(self::$storage, array(), $root);
+		$view = new \OC\Files\View($root);
+		$publicDir = new OC_Connector_Sabre_Directory($view, $view->getFileInfo(''));
+		$objectTree = new \OC\Connector\Sabre\ObjectTree();
+		$objectTree->init($publicDir, $view);
 
 		// Fire up server
 		$server = new Sabre_DAV_Server($publicDir);
@@ -236,8 +245,9 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 		$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 		$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
-		$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
+		$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view));
 		$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+		$server->debugExceptions = true;
 
 		// And off we go!
 		if ($body) {