Properly setup the filesystem for put operations (#762)

Properly setup the filesystem for put operations

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index d485895c..cca4607d 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -444,9 +444,9 @@ class WopiController extends Controller {
 			}
 
 			$content = fopen('php://input', 'rb');
-
 			// Set the user to register the change under his name
 			$this->userScopeService->setUserScope($wopi->getEditorUid());
+			$this->userScopeService->setFilesystemScope($isPutRelative ? $wopi->getEditorUid() : $wopi->getOwnerUid());
 
 			try {
 				$this->retryOperation(function () use ($file, $content){
@@ -481,6 +481,8 @@ class WopiController extends Controller {
 	 * Just actually routes to the PutFile, the implementation of PutFile
 	 * handles both saving and saving as.* Given an access token and a fileId, replaces the files with the request body.
 	 *
+	 * FIXME Cleanup this code as is a lot of shared logic between putFile and putRelativeFile
+	 *
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 *
@@ -582,9 +584,9 @@ class WopiController extends Controller {
 			}
 
 			$content = fopen('php://input', 'rb');
-
 			// Set the user to register the change under his name
 			$this->userScopeService->setUserScope($wopi->getEditorUid());
+			$this->userScopeService->setFilesystemScope($isPutRelative ? $wopi->getEditorUid() : $wopi->getOwnerUid());
 
 			try {
 				$this->retryOperation(function () use ($file, $content){
diff --git a/lib/Service/UserScopeService.php b/lib/Service/UserScopeService.php
index 769f2c9f..90cc73f8 100644
--- a/lib/Service/UserScopeService.php
+++ b/lib/Service/UserScopeService.php
@@ -52,4 +52,17 @@ class UserScopeService {
 		}
 		$this->userSession->setUser($user);
 	}
+
+	/**
+	 * Setup the FS which is needed to emit hooks
+	 *
+	 * This is required for versioning/activity as the legacy filesystem hooks
+	 * are not emitted if filesystem operations are executed though \OCP\Files\Node\File
+	 *
+	 * @param string $owner
+	 */
+	public function setFilesystemScope(string $owner): void {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($owner);
+	}
 }