nextcloud / server

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Indentation +165 added lines, -165 removed lines

@@ -18,169 +18,169 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	private ?IShare $share = null;
-	private bool $enabled = false;
-
-	public function setShare(IShare $share): void {
-		$this->share = $share;
-	}
-
-	public function enable(): void {
-		$this->enabled = true;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 * It is ONLY initialized by the server on a file drop request.
-	 */
-	public function initialize(\Sabre\DAV\Server $server): void {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
-		$server->on('method:MKCOL', [$this, 'onMkcol']);
-		$this->enabled = false;
-	}
-
-	public function onMkcol(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled || $this->share === null) {
-			return;
-		}
-
-		$node = $this->share->getNode();
-		if (!($node instanceof Folder)) {
-			return;
-		}
-
-		// If this is a folder creation request we need
-		// to fake a success so we can pretend every
-		// folder now exists.
-		$response->setStatus(201);
-		return false;
-	}
-
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled || $this->share === null) {
-			return;
-		}
-
-		$node = $this->share->getNode();
-		if (!($node instanceof Folder)) {
-			return;
-		}
-
-		// Retrieve the nickname from the request
-		$nickname = $request->hasHeader('X-NC-Nickname')
-			? trim(urldecode($request->getHeader('X-NC-Nickname')))
-			: null;
-
-		//
-		if ($request->getMethod() !== 'PUT') {
-			// If uploading subfolders we need to ensure they get created
-			// within the nickname folder
-			if ($request->getMethod() === 'MKCOL') {
-				if (!$nickname) {
-					throw new MethodNotAllowed('A nickname header is required when uploading subfolders');
-				}
-			} else {
-				throw new MethodNotAllowed('Only PUT is allowed on files drop');
-			}
-		}
-
-		// If this is a folder creation request
-		// let's stop there and let the onMkcol handle it
-		if ($request->getMethod() === 'MKCOL') {
-			return;
-		}
-
-		// Now if we create a file, we need to create the
-		// full path along the way. We'll only handle conflict
-		// resolution on file conflicts, but not on folders.
-
-		// e.g files/dCP8yn3N86EK9sL/Folder/image.jpg
-		$path = $request->getPath();
-		$token = $this->share->getToken();
-
-		// e.g files/dCP8yn3N86EK9sL
-		$rootPath = substr($path, 0, strpos($path, $token) + strlen($token));
-		// e.g /Folder/image.jpg
-		$relativePath = substr($path, strlen($rootPath));
-		$isRootUpload = substr_count($relativePath, '/') === 1;
-
-		// Extract the attributes for the file request
-		$isFileRequest = false;
-		$attributes = $this->share->getAttributes();
-		if ($attributes !== null) {
-			$isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
-		}
-
-		// We need a valid nickname for file requests
-		if ($isFileRequest && !$nickname) {
-			throw new MethodNotAllowed('A nickname header is required for file requests');
-		}
-
-		// We're only allowing the upload of
-		// long path with subfolders if a nickname is set.
-		// This prevents confusion when uploading files and help
-		// classify them by uploaders.
-		if (!$nickname && !$isRootUpload) {
-			throw new MethodNotAllowed('A nickname header is required when uploading subfolders');
-		}
-
-		// If we have a nickname, let's put everything inside
-		if ($nickname) {
-			// Put all files in the subfolder
-			$relativePath = '/' . $nickname . '/' . $relativePath;
-			$relativePath = str_replace('//', '/', $relativePath);
-		}
-
-		// Create the folders along the way
-		$folder = $node;
-		$pathSegments = $this->getPathSegments(dirname($relativePath));
-		foreach ($pathSegments as $pathSegment) {
-			if ($pathSegment === '') {
-				continue;
-			}
-
-			try {
-				// get the current folder
-				$currentFolder = $folder->get($pathSegment);
-				// check target is a folder
-				if ($currentFolder instanceof Folder) {
-					$folder = $currentFolder;
-				} else {
-					// otherwise look in the parent folder if we already create an unique folder name
-					foreach ($folder->getDirectoryListing() as $child) {
-						// we look for folders which match "NAME (SUFFIX)"
-						if ($child instanceof Folder && str_starts_with($child->getName(), $pathSegment)) {
-							$suffix = substr($child->getName(), strlen($pathSegment));
-							if (preg_match('/^ \(\d+\)$/', $suffix)) {
-								// we found the unique folder name and can use it
-								$folder = $child;
-								break;
-							}
-						}
-					}
-					// no folder found so we need to create a new unique folder name
-					if (!isset($child) || $child !== $folder) {
-						$folder = $folder->newFolder($folder->getNonExistingName($pathSegment));
-					}
-				}
-			} catch (NotFoundException) {
-				// the folder does simply not exist so we create it
-				$folder = $folder->newFolder($pathSegment);
-			}
-		}
-
-		// Finally handle conflicts on the end files
-		$uniqueName = $folder->getNonExistingName(basename($relativePath));
-		$relativePath = substr($folder->getPath(), strlen($node->getPath()));
-		$path = '/files/' . $token . '/' . $relativePath . '/' . $uniqueName;
-		$url = rtrim($request->getBaseUrl(), '/') . str_replace('//', '/', $path);
-		$request->setUrl($url);
-	}
-
-	private function getPathSegments(string $path): array {
-		// Normalize slashes and remove trailing slash
-		$path = trim(str_replace('\\', '/', $path), '/');
-
-		return explode('/', $path);
-	}
+    private ?IShare $share = null;
+    private bool $enabled = false;
+
+    public function setShare(IShare $share): void {
+        $this->share = $share;
+    }
+
+    public function enable(): void {
+        $this->enabled = true;
+    }
+
+    /**
+     * This initializes the plugin.
+     * It is ONLY initialized by the server on a file drop request.
+     */
+    public function initialize(\Sabre\DAV\Server $server): void {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
+        $server->on('method:MKCOL', [$this, 'onMkcol']);
+        $this->enabled = false;
+    }
+
+    public function onMkcol(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled || $this->share === null) {
+            return;
+        }
+
+        $node = $this->share->getNode();
+        if (!($node instanceof Folder)) {
+            return;
+        }
+
+        // If this is a folder creation request we need
+        // to fake a success so we can pretend every
+        // folder now exists.
+        $response->setStatus(201);
+        return false;
+    }
+
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled || $this->share === null) {
+            return;
+        }
+
+        $node = $this->share->getNode();
+        if (!($node instanceof Folder)) {
+            return;
+        }
+
+        // Retrieve the nickname from the request
+        $nickname = $request->hasHeader('X-NC-Nickname')
+            ? trim(urldecode($request->getHeader('X-NC-Nickname')))
+            : null;
+
+        //
+        if ($request->getMethod() !== 'PUT') {
+            // If uploading subfolders we need to ensure they get created
+            // within the nickname folder
+            if ($request->getMethod() === 'MKCOL') {
+                if (!$nickname) {
+                    throw new MethodNotAllowed('A nickname header is required when uploading subfolders');
+                }
+            } else {
+                throw new MethodNotAllowed('Only PUT is allowed on files drop');
+            }
+        }
+
+        // If this is a folder creation request
+        // let's stop there and let the onMkcol handle it
+        if ($request->getMethod() === 'MKCOL') {
+            return;
+        }
+
+        // Now if we create a file, we need to create the
+        // full path along the way. We'll only handle conflict
+        // resolution on file conflicts, but not on folders.
+
+        // e.g files/dCP8yn3N86EK9sL/Folder/image.jpg
+        $path = $request->getPath();
+        $token = $this->share->getToken();
+
+        // e.g files/dCP8yn3N86EK9sL
+        $rootPath = substr($path, 0, strpos($path, $token) + strlen($token));
+        // e.g /Folder/image.jpg
+        $relativePath = substr($path, strlen($rootPath));
+        $isRootUpload = substr_count($relativePath, '/') === 1;
+
+        // Extract the attributes for the file request
+        $isFileRequest = false;
+        $attributes = $this->share->getAttributes();
+        if ($attributes !== null) {
+            $isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
+        }
+
+        // We need a valid nickname for file requests
+        if ($isFileRequest && !$nickname) {
+            throw new MethodNotAllowed('A nickname header is required for file requests');
+        }
+
+        // We're only allowing the upload of
+        // long path with subfolders if a nickname is set.
+        // This prevents confusion when uploading files and help
+        // classify them by uploaders.
+        if (!$nickname && !$isRootUpload) {
+            throw new MethodNotAllowed('A nickname header is required when uploading subfolders');
+        }
+
+        // If we have a nickname, let's put everything inside
+        if ($nickname) {
+            // Put all files in the subfolder
+            $relativePath = '/' . $nickname . '/' . $relativePath;
+            $relativePath = str_replace('//', '/', $relativePath);
+        }
+
+        // Create the folders along the way
+        $folder = $node;
+        $pathSegments = $this->getPathSegments(dirname($relativePath));
+        foreach ($pathSegments as $pathSegment) {
+            if ($pathSegment === '') {
+                continue;
+            }
+
+            try {
+                // get the current folder
+                $currentFolder = $folder->get($pathSegment);
+                // check target is a folder
+                if ($currentFolder instanceof Folder) {
+                    $folder = $currentFolder;
+                } else {
+                    // otherwise look in the parent folder if we already create an unique folder name
+                    foreach ($folder->getDirectoryListing() as $child) {
+                        // we look for folders which match "NAME (SUFFIX)"
+                        if ($child instanceof Folder && str_starts_with($child->getName(), $pathSegment)) {
+                            $suffix = substr($child->getName(), strlen($pathSegment));
+                            if (preg_match('/^ \(\d+\)$/', $suffix)) {
+                                // we found the unique folder name and can use it
+                                $folder = $child;
+                                break;
+                            }
+                        }
+                    }
+                    // no folder found so we need to create a new unique folder name
+                    if (!isset($child) || $child !== $folder) {
+                        $folder = $folder->newFolder($folder->getNonExistingName($pathSegment));
+                    }
+                }
+            } catch (NotFoundException) {
+                // the folder does simply not exist so we create it
+                $folder = $folder->newFolder($pathSegment);
+            }
+        }
+
+        // Finally handle conflicts on the end files
+        $uniqueName = $folder->getNonExistingName(basename($relativePath));
+        $relativePath = substr($folder->getPath(), strlen($node->getPath()));
+        $path = '/files/' . $token . '/' . $relativePath . '/' . $uniqueName;
+        $url = rtrim($request->getBaseUrl(), '/') . str_replace('//', '/', $path);
+        $request->setUrl($url);
+    }
+
+    private function getPathSegments(string $path): array {
+        // Normalize slashes and remove trailing slash
+        $path = trim(str_replace('\\', '/', $path), '/');
+
+        return explode('/', $path);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
 		// If we have a nickname, let's put everything inside
 		if ($nickname) {
 			// Put all files in the subfolder
-			$relativePath = '/' . $nickname . '/' . $relativePath;
+			$relativePath = '/'.$nickname.'/'.$relativePath;
 			$relativePath = str_replace('//', '/', $relativePath);
 		}
 
@@ -172,8 +172,8 @@ 
 		// Finally handle conflicts on the end files
 		$uniqueName = $folder->getNonExistingName(basename($relativePath));
 		$relativePath = substr($folder->getPath(), strlen($node->getPath()));
-		$path = '/files/' . $token . '/' . $relativePath . '/' . $uniqueName;
-		$url = rtrim($request->getBaseUrl(), '/') . str_replace('//', '/', $path);
+		$path = '/files/'.$token.'/'.$relativePath.'/'.$uniqueName;
+		$url = rtrim($request->getBaseUrl(), '/').str_replace('//', '/', $path);
 		$request->setUrl($url);
 	}
 

apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php

Indentation +219 added lines, -219 removed lines

@@ -19,238 +19,238 @@
 
 class FilesDropPluginTest extends TestCase {
 
-	private FilesDropPlugin $plugin;
+    private FilesDropPlugin $plugin;
 
-	private Folder&MockObject $node;
-	private IShare&MockObject $share;
-	private Server&MockObject $server;
-	private RequestInterface&MockObject $request;
-	private ResponseInterface&MockObject $response;
+    private Folder&MockObject $node;
+    private IShare&MockObject $share;
+    private Server&MockObject $server;
+    private RequestInterface&MockObject $request;
+    private ResponseInterface&MockObject $response;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->node = $this->createMock(Folder::class);
-		$this->node->method('getPath')
-			->willReturn('/files/token');
+        $this->node = $this->createMock(Folder::class);
+        $this->node->method('getPath')
+            ->willReturn('/files/token');
 
-		$this->share = $this->createMock(IShare::class);
-		$this->share->expects(self::any())
-			->method('getNode')
-			->willReturn($this->node);
-		$this->server = $this->createMock(Server::class);
-		$this->plugin = new FilesDropPlugin();
+        $this->share = $this->createMock(IShare::class);
+        $this->share->expects(self::any())
+            ->method('getNode')
+            ->willReturn($this->node);
+        $this->server = $this->createMock(Server::class);
+        $this->plugin = new FilesDropPlugin();
 
-		$this->request = $this->createMock(RequestInterface::class);
-		$this->response = $this->createMock(ResponseInterface::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $this->response = $this->createMock(ResponseInterface::class);
 
-		$attributes = $this->createMock(IAttributes::class);
-		$this->share->expects($this->any())
-			->method('getAttributes')
-			->willReturn($attributes);
+        $attributes = $this->createMock(IAttributes::class);
+        $this->share->expects($this->any())
+            ->method('getAttributes')
+            ->willReturn($attributes);
 
-		$this->share
-			->method('getToken')
-			->willReturn('token');
-	}
+        $this->share
+            ->method('getToken')
+            ->willReturn('token');
+    }
 
-	public function testNotEnabled(): void {
-		$this->request->expects($this->never())
-			->method($this->anything());
+    public function testNotEnabled(): void {
+        $this->request->expects($this->never())
+            ->method($this->anything());
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 
-	public function testValid(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
+    public function testValid(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
 
-		$this->request->method('getMethod')
-			->willReturn('PUT');
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
 
-		$this->request->method('getPath')
-			->willReturn('/files/token/file.txt');
+        $this->request->method('getPath')
+            ->willReturn('/files/token/file.txt');
 
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
 
-		$this->node->expects(self::once())
-			->method('getNonExistingName')
-			->with('file.txt')
-			->willReturn('file.txt');
-
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with('https://example.com/files/token/file.txt');
-
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testFileAlreadyExistsValid(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->request->method('getMethod')
-			->willReturn('PUT');
-
-		$this->request->method('getPath')
-			->willReturn('/files/token/file.txt');
-
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
-
-		$this->node->method('getNonExistingName')
-			->with('file.txt')
-			->willReturn('file (2).txt');
-
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with($this->equalTo('https://example.com/files/token/file (2).txt'));
-
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testNoMKCOLWithoutNickname(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->request->method('getMethod')
-			->willReturn('MKCOL');
-
-		$this->expectException(MethodNotAllowed::class);
-
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testMKCOLWithNickname(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->request->method('getMethod')
-			->willReturn('MKCOL');
-
-		$this->request->method('hasHeader')
-			->with('X-NC-Nickname')
-			->willReturn(true);
-		$this->request->method('getHeader')
-			->with('X-NC-Nickname')
-			->willReturn('nickname');
-
-		$this->expectNotToPerformAssertions();
-
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testSubdirPut(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->request->method('getMethod')
-			->willReturn('PUT');
-
-		$this->request->method('hasHeader')
-			->with('X-NC-Nickname')
-			->willReturn(true);
-		$this->request->method('getHeader')
-			->with('X-NC-Nickname')
-			->willReturn('nickname');
-
-		$this->request->method('getPath')
-			->willReturn('/files/token/folder/file.txt');
-
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
-
-		$nodeName = $this->createMock(Folder::class);
-		$nodeFolder = $this->createMock(Folder::class);
-		$nodeFolder->expects(self::once())
-			->method('getPath')
-			->willReturn('/files/token/nickname/folder');
-		$nodeFolder->method('getNonExistingName')
-			->with('file.txt')
-			->willReturn('file.txt');
-		$nodeName->expects(self::once())
-			->method('get')
-			->with('folder')
-			->willThrowException(new NotFoundException());
-		$nodeName->expects(self::once())
-			->method('newFolder')
-			->with('folder')
-			->willReturn($nodeFolder);
-
-		$this->node->expects(self::once())
-			->method('get')
-			->willThrowException(new NotFoundException());
-		$this->node->expects(self::once())
-			->method('newFolder')
-			->with('nickname')
-			->willReturn($nodeName);
-
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with($this->equalTo('https://example.com/files/token/nickname/folder/file.txt'));
-
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testRecursiveFolderCreation(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->request->method('getMethod')
-			->willReturn('PUT');
-		$this->request->method('hasHeader')
-			->with('X-NC-Nickname')
-			->willReturn(true);
-		$this->request->method('getHeader')
-			->with('X-NC-Nickname')
-			->willReturn('nickname');
+        $this->node->expects(self::once())
+            ->method('getNonExistingName')
+            ->with('file.txt')
+            ->willReturn('file.txt');
+
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with('https://example.com/files/token/file.txt');
+
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testFileAlreadyExistsValid(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
+
+        $this->request->method('getPath')
+            ->willReturn('/files/token/file.txt');
+
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
+
+        $this->node->method('getNonExistingName')
+            ->with('file.txt')
+            ->willReturn('file (2).txt');
+
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://example.com/files/token/file (2).txt'));
+
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testNoMKCOLWithoutNickname(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->request->method('getMethod')
+            ->willReturn('MKCOL');
+
+        $this->expectException(MethodNotAllowed::class);
+
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testMKCOLWithNickname(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->request->method('getMethod')
+            ->willReturn('MKCOL');
+
+        $this->request->method('hasHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn(true);
+        $this->request->method('getHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn('nickname');
+
+        $this->expectNotToPerformAssertions();
+
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testSubdirPut(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
+
+        $this->request->method('hasHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn(true);
+        $this->request->method('getHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn('nickname');
+
+        $this->request->method('getPath')
+            ->willReturn('/files/token/folder/file.txt');
+
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
+
+        $nodeName = $this->createMock(Folder::class);
+        $nodeFolder = $this->createMock(Folder::class);
+        $nodeFolder->expects(self::once())
+            ->method('getPath')
+            ->willReturn('/files/token/nickname/folder');
+        $nodeFolder->method('getNonExistingName')
+            ->with('file.txt')
+            ->willReturn('file.txt');
+        $nodeName->expects(self::once())
+            ->method('get')
+            ->with('folder')
+            ->willThrowException(new NotFoundException());
+        $nodeName->expects(self::once())
+            ->method('newFolder')
+            ->with('folder')
+            ->willReturn($nodeFolder);
+
+        $this->node->expects(self::once())
+            ->method('get')
+            ->willThrowException(new NotFoundException());
+        $this->node->expects(self::once())
+            ->method('newFolder')
+            ->with('nickname')
+            ->willReturn($nodeName);
+
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://example.com/files/token/nickname/folder/file.txt'));
+
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testRecursiveFolderCreation(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
+        $this->request->method('hasHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn(true);
+        $this->request->method('getHeader')
+            ->with('X-NC-Nickname')
+            ->willReturn('nickname');
 		
-		$this->request->method('getPath')
-			->willReturn('/files/token/folder/subfolder/file.txt');
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
-
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with($this->equalTo('https://example.com/files/token/nickname/folder/subfolder/file.txt'));
-
-		$subfolder = $this->createMock(Folder::class);
-		$subfolder->expects(self::once())
-			->method('getNonExistingName')
-			->with('file.txt')
-			->willReturn('file.txt');
-		$subfolder->expects(self::once())
-			->method('getPath')
-			->willReturn('/files/token/nickname/folder/subfolder');
-
-		$folder = $this->createMock(Folder::class);
-		$folder->expects(self::once())
-			->method('get')
-			->with('subfolder')
-			->willReturn($subfolder);
-
-		$nickname = $this->createMock(Folder::class);
-		$nickname->expects(self::once())
-			->method('get')
-			->with('folder')
-			->willReturn($folder);
-
-		$this->node->method('get')
-			->with('nickname')
-			->willReturn($nickname);
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
-
-	public function testOnMkcol(): void {
-		$this->plugin->enable();
-		$this->plugin->setShare($this->share);
-
-		$this->response->expects($this->once())
-			->method('setStatus')
-			->with(201);
-
-		$response = $this->plugin->onMkcol($this->request, $this->response);
-		$this->assertFalse($response);
-	}
+        $this->request->method('getPath')
+            ->willReturn('/files/token/folder/subfolder/file.txt');
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
+
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://example.com/files/token/nickname/folder/subfolder/file.txt'));
+
+        $subfolder = $this->createMock(Folder::class);
+        $subfolder->expects(self::once())
+            ->method('getNonExistingName')
+            ->with('file.txt')
+            ->willReturn('file.txt');
+        $subfolder->expects(self::once())
+            ->method('getPath')
+            ->willReturn('/files/token/nickname/folder/subfolder');
+
+        $folder = $this->createMock(Folder::class);
+        $folder->expects(self::once())
+            ->method('get')
+            ->with('subfolder')
+            ->willReturn($subfolder);
+
+        $nickname = $this->createMock(Folder::class);
+        $nickname->expects(self::once())
+            ->method('get')
+            ->with('folder')
+            ->willReturn($folder);
+
+        $this->node->method('get')
+            ->with('nickname')
+            ->willReturn($nickname);
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
+
+    public function testOnMkcol(): void {
+        $this->plugin->enable();
+        $this->plugin->setShare($this->share);
+
+        $this->response->expects($this->once())
+            ->method('setStatus')
+            ->with(201);
+
+        $response = $this->plugin->onMkcol($this->request, $this->response);
+        $this->assertFalse($response);
+    }
 }

apps/dav/appinfo/v2/publicremote.php

Indentation +70 added lines, -70 removed lines

@@ -52,26 +52,26 @@ 
 
 // Backends
 $authBackend = new PublicAuth(
-	$request,
-	Server::get(IManager::class),
-	$session,
-	Server::get(IThrottler::class),
-	Server::get(LoggerInterface::class)
+    $request,
+    Server::get(IManager::class),
+    $session,
+    Server::get(IThrottler::class),
+    Server::get(LoggerInterface::class)
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
 $l10nFactory = Server::get(IFactory::class);
 $serverFactory = new ServerFactory(
-	Server::get(IConfig::class),
-	Server::get(LoggerInterface::class),
-	Server::get(IDBConnection::class),
-	Server::get(IUserSession::class),
-	Server::get(IMountManager::class),
-	Server::get(ITagManager::class),
-	$request,
-	Server::get(IPreview::class),
-	$eventDispatcher,
-	$l10nFactory->get('dav'),
+    Server::get(IConfig::class),
+    Server::get(LoggerInterface::class),
+    Server::get(IDBConnection::class),
+    Server::get(IUserSession::class),
+    Server::get(IMountManager::class),
+    Server::get(ITagManager::class),
+    $request,
+    Server::get(IPreview::class),
+    $eventDispatcher,
+    $l10nFactory->get('dav'),
 );
 
 
@@ -80,61 +80,61 @@ 
 
 /** @var string $baseuri defined in public.php */
 $server = $serverFactory->createServer(true, $baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	// GET must be allowed for e.g. showing images and allowing Zip downloads
-	if ($server->httpRequest->getMethod() !== 'GET') {
-		// If this is *not* a GET request we only allow access to public DAV from AJAX or when Server2Server is allowed
-		$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
-		$federatedShareProvider = Server::get(FederatedShareProvider::class);
-		if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && $isAjax === false) {
-			// this is what is thrown when trying to access a non-existing share
-			throw new NotAuthenticated();
-		}
-	}
-
-	$share = $authBackend->getShare();
-	$owner = $share->getShareOwner();
-	$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
-	$fileId = $share->getNodeId();
-
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	/** @psalm-suppress InternalMethod */
-	$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
-
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
-	});
-
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
-		return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
-	});
-
-	// Ensure that also private shares have the `getShare` method
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('getShare', function ($mountPoint, $storage) use ($share) {
-		return new PublicShareWrapper(['storage' => $storage, 'share' => $share]);
-	}, 0);
-
-	/** @psalm-suppress InternalMethod */
-	Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-	$rootFolder = Server::get(IRootFolder::class);
-	$userFolder = $rootFolder->getUserFolder($owner);
-	$node = $userFolder->getFirstNodeById($fileId);
-	if (!$node) {
-		throw new NotFound();
-	}
-	$linkCheckPlugin->setFileInfo($node);
-
-	// If not readable (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
-	$filesDropPlugin->setShare($share);
-
-	$view = new View($node->getPath());
-	return $view;
+    // GET must be allowed for e.g. showing images and allowing Zip downloads
+    if ($server->httpRequest->getMethod() !== 'GET') {
+        // If this is *not* a GET request we only allow access to public DAV from AJAX or when Server2Server is allowed
+        $isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
+        $federatedShareProvider = Server::get(FederatedShareProvider::class);
+        if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && $isAjax === false) {
+            // this is what is thrown when trying to access a non-existing share
+            throw new NotAuthenticated();
+        }
+    }
+
+    $share = $authBackend->getShare();
+    $owner = $share->getShareOwner();
+    $isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
+    $fileId = $share->getNodeId();
+
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    /** @psalm-suppress InternalMethod */
+    $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
+
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
+    });
+
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+        return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
+    });
+
+    // Ensure that also private shares have the `getShare` method
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('getShare', function ($mountPoint, $storage) use ($share) {
+        return new PublicShareWrapper(['storage' => $storage, 'share' => $share]);
+    }, 0);
+
+    /** @psalm-suppress InternalMethod */
+    Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+    $rootFolder = Server::get(IRootFolder::class);
+    $userFolder = $rootFolder->getUserFolder($owner);
+    $node = $userFolder->getFirstNodeById($fileId);
+    if (!$node) {
+        throw new NotFound();
+    }
+    $linkCheckPlugin->setFileInfo($node);
+
+    // If not readable (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
+    $filesDropPlugin->setShare($share);
+
+    $view = new View($node->getPath());
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

apps/dav/appinfo/v1/publicwebdav.php

Indentation +53 added lines, -53 removed lines

@@ -40,10 +40,10 @@ 
 
 // Backends
 $authBackend = new LegacyPublicAuth(
-	Server::get(IRequest::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(ISession::class),
-	Server::get(IThrottler::class)
+    Server::get(IRequest::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(ISession::class),
+    Server::get(IThrottler::class)
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
@@ -51,16 +51,16 @@ 
 $eventDispatcher = Server::get(IEventDispatcher::class);
 
 $serverFactory = new ServerFactory(
-	Server::get(IConfig::class),
-	Server::get(LoggerInterface::class),
-	Server::get(IDBConnection::class),
-	Server::get(IUserSession::class),
-	Server::get(IMountManager::class),
-	Server::get(ITagManager::class),
-	Server::get(IRequest::class),
-	Server::get(IPreview::class),
-	$eventDispatcher,
-	\OC::$server->getL10N('dav')
+    Server::get(IConfig::class),
+    Server::get(LoggerInterface::class),
+    Server::get(IDBConnection::class),
+    Server::get(IUserSession::class),
+    Server::get(IMountManager::class),
+    Server::get(ITagManager::class),
+    Server::get(IRequest::class),
+    Server::get(IPreview::class),
+    $eventDispatcher,
+    \OC::$server->getL10N('dav')
 );
 
 $requestUri = Server::get(IRequest::class)->getRequestUri();
@@ -69,45 +69,45 @@ 
 $filesDropPlugin = new FilesDropPlugin();
 
 $server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
-	/** @var FederatedShareProvider $shareProvider */
-	$federatedShareProvider = Server::get(FederatedShareProvider::class);
-	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
-		// this is what is thrown when trying to access a non-existing share
-		throw new \Sabre\DAV\Exception\NotAuthenticated();
-	}
-
-	$share = $authBackend->getShare();
-	$owner = $share->getShareOwner();
-	$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
-	$fileId = $share->getNodeId();
-
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
-	Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
-	});
-	Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
-		return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
-	});
-	Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-	$rootFolder = Server::get(IRootFolder::class);
-	$userFolder = $rootFolder->getUserFolder($owner);
-	$node = $userFolder->getFirstNodeById($fileId);
-	if (!$node) {
-		throw new \Sabre\DAV\Exception\NotFound();
-	}
-	$linkCheckPlugin->setFileInfo($node);
-
-	// If not readable (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
-	$filesDropPlugin->setShare($share);
-
-	$view = new View($node->getPath());
-	return $view;
+    $isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
+    /** @var FederatedShareProvider $shareProvider */
+    $federatedShareProvider = Server::get(FederatedShareProvider::class);
+    if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+        // this is what is thrown when trying to access a non-existing share
+        throw new \Sabre\DAV\Exception\NotAuthenticated();
+    }
+
+    $share = $authBackend->getShare();
+    $owner = $share->getShareOwner();
+    $isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
+    $fileId = $share->getNodeId();
+
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
+    Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
+    });
+    Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+        return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
+    });
+    Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+    $rootFolder = Server::get(IRootFolder::class);
+    $userFolder = $rootFolder->getUserFolder($owner);
+    $node = $userFolder->getFirstNodeById($fileId);
+    if (!$node) {
+        throw new \Sabre\DAV\Exception\NotFound();
+    }
+    $linkCheckPlugin->setFileInfo($node);
+
+    // If not readable (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
+    $filesDropPlugin->setShare($share);
+
+    $view = new View($node->getPath());
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);