nextcloud / server

apps/dav/lib/BulkUpload/MultipartRequestParser.php

Indentation +235 added lines, -235 removed lines

@@ -15,239 +15,239 @@
 
 class MultipartRequestParser {
 
-	/** @var resource */
-	private $stream;
-
-	/** @var string */
-	private $boundary = '';
-
-	/** @var string */
-	private $lastBoundary = '';
-
-	/**
-	 * @throws BadRequest
-	 */
-	public function __construct(
-		RequestInterface $request,
-		protected LoggerInterface $logger,
-	) {
-		$stream = $request->getBody();
-		$contentType = $request->getHeader('Content-Type');
-
-		if (!is_resource($stream)) {
-			throw new BadRequest('Body should be of type resource');
-		}
-
-		if ($contentType === null) {
-			throw new BadRequest('Content-Type can not be null');
-		}
-
-		$this->stream = $stream;
-
-		$boundary = $this->parseBoundaryFromHeaders($contentType);
-		$this->boundary = '--' . $boundary . "\r\n";
-		$this->lastBoundary = '--' . $boundary . "--\r\n";
-	}
-
-	/**
-	 * Parse the boundary from the Content-Type header.
-	 * Example: Content-Type: "multipart/related; boundary=boundary_bf38b9b4b10a303a28ed075624db3978"
-	 *
-	 * @throws BadRequest
-	 */
-	private function parseBoundaryFromHeaders(string $contentType): string {
-		try {
-			if (!str_contains($contentType, ';')) {
-				throw new \InvalidArgumentException('No semicolon in header');
-			}
-			[$mimeType, $boundary] = explode(';', $contentType);
-			if (!str_contains($boundary, '=')) {
-				throw new \InvalidArgumentException('No equal in boundary header');
-			}
-			[$boundaryKey, $boundaryValue] = explode('=', $boundary);
-		} catch (\Exception $e) {
-			throw new BadRequest('Error while parsing boundary in Content-Type header.', Http::STATUS_BAD_REQUEST, $e);
-		}
-
-		$boundaryValue = trim($boundaryValue);
-
-		// Remove potential quotes around boundary value.
-		if (str_starts_with($boundaryValue, '"') && str_ends_with($boundaryValue, '"')) {
-			$boundaryValue = substr($boundaryValue, 1, -1);
-		}
-
-		if (trim($mimeType) !== 'multipart/related') {
-			throw new BadRequest('Content-Type must be multipart/related');
-		}
-
-		if (trim($boundaryKey) !== 'boundary') {
-			throw new BadRequest('Boundary is invalid');
-		}
-
-		return $boundaryValue;
-	}
-
-	/**
-	 * Check whether the stream's cursor is sitting right before the provided string.
-	 *
-	 * @throws Exception
-	 */
-	private function isAt(string $expectedContent): bool {
-		$expectedContentLength = strlen($expectedContent);
-
-		$content = fread($this->stream, $expectedContentLength);
-		if ($content === false) {
-			throw new Exception('An error occurred while checking content');
-		}
-
-		$seekBackResult = fseek($this->stream, -$expectedContentLength, SEEK_CUR);
-		if ($seekBackResult === -1) {
-			throw new Exception('Unknown error while seeking content', Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-
-		return $expectedContent === $content;
-	}
-
-
-	/**
-	 * Check whether the stream's cursor is sitting right before the boundary.
-	 */
-	private function isAtBoundary(): bool {
-		return $this->isAt($this->boundary);
-	}
-
-	/**
-	 * Check whether the stream's cursor is sitting right before the last boundary.
-	 */
-	public function isAtLastBoundary(): bool {
-		return $this->isAt($this->lastBoundary);
-	}
-
-	/**
-	 * Parse and return the next part of the multipart headers.
-	 *
-	 * Example:
-	 * --boundary_azertyuiop
-	 * Header1: value
-	 * Header2: value
-	 *
-	 * Content of
-	 * the part
-	 *
-	 */
-	public function parseNextPart(): array {
-		$this->readBoundary();
-
-		$headers = $this->readPartHeaders();
-
-		$length = (int)$headers['content-length'];
-
-		$this->validateHash($length, $headers['x-file-md5'] ?? '', $headers['oc-checksum'] ?? '');
-		$content = $this->readPartContent($length);
-
-		return [$headers, $content];
-	}
-
-	/**
-	 * Read the boundary and check its content.
-	 *
-	 * @throws BadRequest
-	 */
-	private function readBoundary(): string {
-		if (!$this->isAtBoundary()) {
-			throw new BadRequest('Boundary not found where it should be.');
-		}
-
-		return fread($this->stream, strlen($this->boundary));
-	}
-
-	/**
-	 * Return the headers of a part of the multipart body.
-	 *
-	 * @throws Exception
-	 * @throws BadRequest
-	 * @throws LengthRequired
-	 */
-	private function readPartHeaders(): array {
-		$headers = [];
-
-		while (($line = fgets($this->stream)) !== "\r\n") {
-			if ($line === false) {
-				throw new Exception('An error occurred while reading headers of a part');
-			}
-
-			if (!str_contains($line, ':')) {
-				$this->logger->error('Header missing ":" on bulk request: ' . json_encode($line));
-				throw new Exception('An error occurred while reading headers of a part', Http::STATUS_BAD_REQUEST);
-			}
-
-			try {
-				[$key, $value] = explode(':', $line, 2);
-				$headers[strtolower(trim($key))] = trim($value);
-			} catch (\Exception $e) {
-				throw new BadRequest('An error occurred while parsing headers of a part', Http::STATUS_BAD_REQUEST, $e);
-			}
-		}
-
-		if (!isset($headers['content-length'])) {
-			throw new LengthRequired('The Content-Length header must not be null.');
-		}
-
-		// TODO: Drop $md5 condition when the latest desktop client that uses it is no longer supported.
-		if (!isset($headers['x-file-md5']) && !isset($headers['oc-checksum'])) {
-			throw new BadRequest('The hash headers must not be null.');
-		}
-
-		return $headers;
-	}
-
-	/**
-	 * Return the content of a part of the multipart body.
-	 *
-	 * @throws Exception
-	 * @throws BadRequest
-	 */
-	private function readPartContent(int $length): string {
-		if ($length === 0) {
-			$content = '';
-		} else {
-			$content = stream_get_line($this->stream, $length);
-		}
-
-		if ($content === false) {
-			throw new Exception("Fail to read part's content.");
-		}
-
-		if ($length !== 0 && feof($this->stream)) {
-			throw new Exception('Unexpected EOF while reading stream.');
-		}
-
-		// Read '\r\n'.
-		stream_get_contents($this->stream, 2);
-
-		return $content;
-	}
-
-	/**
-	 * Compute the MD5 or checksum hash of the next x bytes.
-	 * TODO: Drop $md5 argument when the latest desktop client that uses it is no longer supported.
-	 */
-	private function validateHash(int $length, string $fileMd5Header, string $checksumHeader): void {
-		if ($checksumHeader !== '') {
-			[$algorithm, $hash] = explode(':', $checksumHeader, 2);
-		} elseif ($fileMd5Header !== '') {
-			$algorithm = 'md5';
-			$hash = $fileMd5Header;
-		} else {
-			throw new BadRequest('No hash provided.');
-		}
-
-		$context = hash_init($algorithm);
-		hash_update_stream($context, $this->stream, $length);
-		fseek($this->stream, -$length, SEEK_CUR);
-		$computedHash = hash_final($context);
-		if ($hash !== $computedHash) {
-			throw new BadRequest("Computed $algorithm hash is incorrect ($computedHash).");
-		}
-	}
+    /** @var resource */
+    private $stream;
+
+    /** @var string */
+    private $boundary = '';
+
+    /** @var string */
+    private $lastBoundary = '';
+
+    /**
+     * @throws BadRequest
+     */
+    public function __construct(
+        RequestInterface $request,
+        protected LoggerInterface $logger,
+    ) {
+        $stream = $request->getBody();
+        $contentType = $request->getHeader('Content-Type');
+
+        if (!is_resource($stream)) {
+            throw new BadRequest('Body should be of type resource');
+        }
+
+        if ($contentType === null) {
+            throw new BadRequest('Content-Type can not be null');
+        }
+
+        $this->stream = $stream;
+
+        $boundary = $this->parseBoundaryFromHeaders($contentType);
+        $this->boundary = '--' . $boundary . "\r\n";
+        $this->lastBoundary = '--' . $boundary . "--\r\n";
+    }
+
+    /**
+     * Parse the boundary from the Content-Type header.
+     * Example: Content-Type: "multipart/related; boundary=boundary_bf38b9b4b10a303a28ed075624db3978"
+     *
+     * @throws BadRequest
+     */
+    private function parseBoundaryFromHeaders(string $contentType): string {
+        try {
+            if (!str_contains($contentType, ';')) {
+                throw new \InvalidArgumentException('No semicolon in header');
+            }
+            [$mimeType, $boundary] = explode(';', $contentType);
+            if (!str_contains($boundary, '=')) {
+                throw new \InvalidArgumentException('No equal in boundary header');
+            }
+            [$boundaryKey, $boundaryValue] = explode('=', $boundary);
+        } catch (\Exception $e) {
+            throw new BadRequest('Error while parsing boundary in Content-Type header.', Http::STATUS_BAD_REQUEST, $e);
+        }
+
+        $boundaryValue = trim($boundaryValue);
+
+        // Remove potential quotes around boundary value.
+        if (str_starts_with($boundaryValue, '"') && str_ends_with($boundaryValue, '"')) {
+            $boundaryValue = substr($boundaryValue, 1, -1);
+        }
+
+        if (trim($mimeType) !== 'multipart/related') {
+            throw new BadRequest('Content-Type must be multipart/related');
+        }
+
+        if (trim($boundaryKey) !== 'boundary') {
+            throw new BadRequest('Boundary is invalid');
+        }
+
+        return $boundaryValue;
+    }
+
+    /**
+     * Check whether the stream's cursor is sitting right before the provided string.
+     *
+     * @throws Exception
+     */
+    private function isAt(string $expectedContent): bool {
+        $expectedContentLength = strlen($expectedContent);
+
+        $content = fread($this->stream, $expectedContentLength);
+        if ($content === false) {
+            throw new Exception('An error occurred while checking content');
+        }
+
+        $seekBackResult = fseek($this->stream, -$expectedContentLength, SEEK_CUR);
+        if ($seekBackResult === -1) {
+            throw new Exception('Unknown error while seeking content', Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+
+        return $expectedContent === $content;
+    }
+
+
+    /**
+     * Check whether the stream's cursor is sitting right before the boundary.
+     */
+    private function isAtBoundary(): bool {
+        return $this->isAt($this->boundary);
+    }
+
+    /**
+     * Check whether the stream's cursor is sitting right before the last boundary.
+     */
+    public function isAtLastBoundary(): bool {
+        return $this->isAt($this->lastBoundary);
+    }
+
+    /**
+     * Parse and return the next part of the multipart headers.
+     *
+     * Example:
+     * --boundary_azertyuiop
+     * Header1: value
+     * Header2: value
+     *
+     * Content of
+     * the part
+     *
+     */
+    public function parseNextPart(): array {
+        $this->readBoundary();
+
+        $headers = $this->readPartHeaders();
+
+        $length = (int)$headers['content-length'];
+
+        $this->validateHash($length, $headers['x-file-md5'] ?? '', $headers['oc-checksum'] ?? '');
+        $content = $this->readPartContent($length);
+
+        return [$headers, $content];
+    }
+
+    /**
+     * Read the boundary and check its content.
+     *
+     * @throws BadRequest
+     */
+    private function readBoundary(): string {
+        if (!$this->isAtBoundary()) {
+            throw new BadRequest('Boundary not found where it should be.');
+        }
+
+        return fread($this->stream, strlen($this->boundary));
+    }
+
+    /**
+     * Return the headers of a part of the multipart body.
+     *
+     * @throws Exception
+     * @throws BadRequest
+     * @throws LengthRequired
+     */
+    private function readPartHeaders(): array {
+        $headers = [];
+
+        while (($line = fgets($this->stream)) !== "\r\n") {
+            if ($line === false) {
+                throw new Exception('An error occurred while reading headers of a part');
+            }
+
+            if (!str_contains($line, ':')) {
+                $this->logger->error('Header missing ":" on bulk request: ' . json_encode($line));
+                throw new Exception('An error occurred while reading headers of a part', Http::STATUS_BAD_REQUEST);
+            }
+
+            try {
+                [$key, $value] = explode(':', $line, 2);
+                $headers[strtolower(trim($key))] = trim($value);
+            } catch (\Exception $e) {
+                throw new BadRequest('An error occurred while parsing headers of a part', Http::STATUS_BAD_REQUEST, $e);
+            }
+        }
+
+        if (!isset($headers['content-length'])) {
+            throw new LengthRequired('The Content-Length header must not be null.');
+        }
+
+        // TODO: Drop $md5 condition when the latest desktop client that uses it is no longer supported.
+        if (!isset($headers['x-file-md5']) && !isset($headers['oc-checksum'])) {
+            throw new BadRequest('The hash headers must not be null.');
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Return the content of a part of the multipart body.
+     *
+     * @throws Exception
+     * @throws BadRequest
+     */
+    private function readPartContent(int $length): string {
+        if ($length === 0) {
+            $content = '';
+        } else {
+            $content = stream_get_line($this->stream, $length);
+        }
+
+        if ($content === false) {
+            throw new Exception("Fail to read part's content.");
+        }
+
+        if ($length !== 0 && feof($this->stream)) {
+            throw new Exception('Unexpected EOF while reading stream.');
+        }
+
+        // Read '\r\n'.
+        stream_get_contents($this->stream, 2);
+
+        return $content;
+    }
+
+    /**
+     * Compute the MD5 or checksum hash of the next x bytes.
+     * TODO: Drop $md5 argument when the latest desktop client that uses it is no longer supported.
+     */
+    private function validateHash(int $length, string $fileMd5Header, string $checksumHeader): void {
+        if ($checksumHeader !== '') {
+            [$algorithm, $hash] = explode(':', $checksumHeader, 2);
+        } elseif ($fileMd5Header !== '') {
+            $algorithm = 'md5';
+            $hash = $fileMd5Header;
+        } else {
+            throw new BadRequest('No hash provided.');
+        }
+
+        $context = hash_init($algorithm);
+        hash_update_stream($context, $this->stream, $length);
+        fseek($this->stream, -$length, SEEK_CUR);
+        $computedHash = hash_final($context);
+        if ($hash !== $computedHash) {
+            throw new BadRequest("Computed $algorithm hash is incorrect ($computedHash).");
+        }
+    }
 }

apps/dav/tests/unit/Connector/Sabre/AuthTest.php

Indentation +575 added lines, -575 removed lines

@@ -30,579 +30,579 @@
  * @group DB
  */
 class AuthTest extends TestCase {
-	private ISession&MockObject $session;
-	private Session&MockObject $userSession;
-	private IRequest&MockObject $request;
-	private Manager&MockObject $twoFactorManager;
-	private IThrottler&MockObject $throttler;
-	private Auth $auth;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->session = $this->createMock(ISession::class);
-		$this->userSession = $this->createMock(Session::class);
-		$this->request = $this->createMock(IRequest::class);
-		$this->twoFactorManager = $this->createMock(Manager::class);
-		$this->throttler = $this->createMock(IThrottler::class);
-		$this->auth = new Auth(
-			$this->session,
-			$this->userSession,
-			$this->request,
-			$this->twoFactorManager,
-			$this->throttler
-		);
-	}
-
-	public function testIsDavAuthenticatedWithoutDavSession(): void {
-		$this->session
-			->expects($this->once())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn(null);
-
-		$this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
-	}
-
-	public function testIsDavAuthenticatedWithWrongDavSession(): void {
-		$this->session
-			->expects($this->exactly(2))
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('AnotherUser');
-
-		$this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
-	}
-
-	public function testIsDavAuthenticatedWithCorrectDavSession(): void {
-		$this->session
-			->expects($this->exactly(2))
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('MyTestUser');
-
-		$this->assertTrue(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
-	}
-
-	public function testValidateUserPassOfAlreadyDAVAuthenticatedUser(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->exactly(1))
-			->method('getUID')
-			->willReturn('MyTestUser');
-		$this->userSession
-			->expects($this->once())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->userSession
-			->expects($this->exactly(1))
-			->method('getUser')
-			->willReturn($user);
-		$this->session
-			->expects($this->exactly(2))
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('MyTestUser');
-		$this->session
-			->expects($this->once())
-			->method('close');
-
-		$this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
-	}
-
-	public function testValidateUserPassOfInvalidDAVAuthenticatedUser(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn('MyTestUser');
-		$this->userSession
-			->expects($this->once())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->session
-			->expects($this->exactly(2))
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('AnotherUser');
-		$this->session
-			->expects($this->once())
-			->method('close');
-
-		$this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
-	}
-
-	public function testValidateUserPassOfInvalidDAVAuthenticatedUserWithValidPassword(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('MyTestUser');
-		$this->userSession
-			->expects($this->once())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->userSession
-			->expects($this->exactly(2))
-			->method('getUser')
-			->willReturn($user);
-		$this->session
-			->expects($this->exactly(2))
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('AnotherUser');
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('MyTestUser', 'MyTestPassword', $this->request)
-			->willReturn(true);
-		$this->session
-			->expects($this->once())
-			->method('set')
-			->with('AUTHENTICATED_TO_DAV_BACKEND', 'MyTestUser');
-		$this->session
-			->expects($this->once())
-			->method('close');
-
-		$this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
-	}
-
-	public function testValidateUserPassWithInvalidPassword(): void {
-		$this->userSession
-			->expects($this->once())
-			->method('isLoggedIn')
-			->willReturn(false);
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('MyTestUser', 'MyTestPassword')
-			->willReturn(false);
-		$this->session
-			->expects($this->once())
-			->method('close');
-
-		$this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
-	}
-
-
-	public function testValidateUserPassWithPasswordLoginForbidden(): void {
-		$this->expectException(PasswordLoginForbidden::class);
-
-		$this->userSession
-			->expects($this->once())
-			->method('isLoggedIn')
-			->willReturn(false);
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('MyTestUser', 'MyTestPassword')
-			->will($this->throwException(new PasswordLoginForbiddenException()));
-		$this->session
-			->expects($this->once())
-			->method('close');
-
-		self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']);
-	}
-
-	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGet(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('POST');
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn(null);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('MyWrongDavUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(false);
-
-		$expectedResponse = [
-			false,
-			"No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured",
-		];
-		$response = $this->auth->check($request, $response);
-		$this->assertSame($expectedResponse, $response);
-	}
-
-	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndCorrectlyDavAuthenticated(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('PROPFIND');
-		$this->request
-			->expects($this->any())
-			->method('isUserAgent')
-			->willReturn(false);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('LoggedInUser');
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('LoggedInUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(false);
-		$this->auth->check($request, $response);
-	}
-
-
-	public function testAuthenticateAlreadyLoggedInWithoutTwoFactorChallengePassed(): void {
-		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		$this->expectExceptionMessage('2FA challenge not passed.');
-
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('PROPFIND');
-		$this->request
-			->expects($this->any())
-			->method('isUserAgent')
-			->willReturn(false);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('LoggedInUser');
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('LoggedInUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(true);
-		$this->twoFactorManager->expects($this->once())
-			->method('needsSecondFactor')
-			->with($user)
-			->willReturn(true);
-		$this->auth->check($request, $response);
-	}
-
-
-	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDavAuthenticated(): void {
-		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		$this->expectExceptionMessage('CSRF check not passed.');
-
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('PROPFIND');
-		$this->request
-			->expects($this->any())
-			->method('isUserAgent')
-			->willReturn(false);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('AnotherUser');
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('LoggedInUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(false);
-		$this->auth->check($request, $response);
-	}
-
-	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGetAndDesktopClient(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('POST');
-		$this->request
-			->expects($this->any())
-			->method('isUserAgent')
-			->willReturn(true);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn(null);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('MyWrongDavUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(false);
-
-		$this->auth->check($request, $response);
-	}
-
-	public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForGet(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn(null);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('MyWrongDavUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->any())
-			->method('getMethod')
-			->willReturn('GET');
-
-		$response = $this->auth->check($request, $response);
-		$this->assertEquals([true, 'principals/users/MyWrongDavUser'], $response);
-	}
-
-	public function testAuthenticateAlreadyLoggedInWithCsrfTokenForGet(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->session
-			->expects($this->any())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn(null);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('MyWrongDavUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(true);
-
-		$response = $this->auth->check($request, $response);
-		$this->assertEquals([true, 'principals/users/MyWrongDavUser'], $response);
-	}
-
-	public function testAuthenticateNoBasicAuthenticateHeadersProvided(): void {
-		$server = $this->createMock(Server::class);
-		$server->httpRequest = $this->createMock(RequestInterface::class);
-		$server->httpResponse = $this->createMock(ResponseInterface::class);
-		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
-		$this->assertEquals([false, 'No \'Authorization: Basic\' header found. Either the client didn\'t send one, or the server is misconfigured'], $response);
-	}
-
-
-	public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjax(): void {
-		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		$this->expectExceptionMessage('Cannot authenticate over ajax calls');
-
-		/** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
-		$httpRequest = $this->createMock(RequestInterface::class);
-		/** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
-		$httpResponse = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(false);
-		$httpRequest
-			->expects($this->exactly(2))
-			->method('getHeader')
-			->willReturnMap([
-				['X-Requested-With', 'XMLHttpRequest'],
-				['Authorization', null],
-			]);
-
-		$this->auth->check($httpRequest, $httpResponse);
-	}
-
-	public function testAuthenticateWithBasicAuthenticateHeadersProvidedWithAjax(): void {
-		// No CSRF
-		$this->request
-			->expects($this->once())
-			->method('passesCSRFCheck')
-			->willReturn(false);
-
-		/** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
-		$httpRequest = $this->createMock(RequestInterface::class);
-		/** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
-		$httpResponse = $this->createMock(ResponseInterface::class);
-		$httpRequest
-			->expects($this->any())
-			->method('getHeader')
-			->willReturnMap([
-				['X-Requested-With', 'XMLHttpRequest'],
-				['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
-			]);
-
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('MyDavUser');
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(false);
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('username', 'password')
-			->willReturn(true);
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-
-		$this->auth->check($httpRequest, $httpResponse);
-	}
-
-	public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjaxButUserIsStillLoggedIn(): void {
-		/** @var \Sabre\HTTP\RequestInterface $httpRequest */
-		$httpRequest = $this->createMock(RequestInterface::class);
-		/** @var \Sabre\HTTP\ResponseInterface $httpResponse */
-		$httpResponse = $this->createMock(ResponseInterface::class);
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('MyTestUser');
-		$this->userSession
-			->expects($this->any())
-			->method('isLoggedIn')
-			->willReturn(true);
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->session
-			->expects($this->atLeastOnce())
-			->method('get')
-			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->willReturn('MyTestUser');
-		$this->request
-			->expects($this->once())
-			->method('getMethod')
-			->willReturn('GET');
-		$httpRequest
-			->expects($this->atLeastOnce())
-			->method('getHeader')
-			->with('Authorization')
-			->willReturn(null);
-		$this->assertEquals(
-			[true, 'principals/users/MyTestUser'],
-			$this->auth->check($httpRequest, $httpResponse)
-		);
-	}
-
-	public function testAuthenticateValidCredentials(): void {
-		$server = $this->createMock(Server::class);
-		$server->httpRequest = $this->createMock(RequestInterface::class);
-		$server->httpRequest
-			->expects($this->once())
-			->method('getHeader')
-			->with('Authorization')
-			->willReturn('basic dXNlcm5hbWU6cGFzc3dvcmQ=');
-
-		$server->httpResponse = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('username', 'password')
-			->willReturn(true);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('MyTestUser');
-		$this->userSession
-			->expects($this->exactly(3))
-			->method('getUser')
-			->willReturn($user);
-		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
-		$this->assertEquals([true, 'principals/users/MyTestUser'], $response);
-	}
-
-	public function testAuthenticateInvalidCredentials(): void {
-		$server = $this->createMock(Server::class);
-		$server->httpRequest = $this->createMock(RequestInterface::class);
-		$server->httpRequest
-			->expects($this->exactly(2))
-			->method('getHeader')
-			->willReturnMap([
-				['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
-				['X-Requested-With', null],
-			]);
-		$server->httpResponse = $this->createMock(ResponseInterface::class);
-		$this->userSession
-			->expects($this->once())
-			->method('logClientIn')
-			->with('username', 'password')
-			->willReturn(false);
-		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
-		$this->assertEquals([false, 'Username or password was incorrect'], $response);
-	}
+    private ISession&MockObject $session;
+    private Session&MockObject $userSession;
+    private IRequest&MockObject $request;
+    private Manager&MockObject $twoFactorManager;
+    private IThrottler&MockObject $throttler;
+    private Auth $auth;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->session = $this->createMock(ISession::class);
+        $this->userSession = $this->createMock(Session::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->twoFactorManager = $this->createMock(Manager::class);
+        $this->throttler = $this->createMock(IThrottler::class);
+        $this->auth = new Auth(
+            $this->session,
+            $this->userSession,
+            $this->request,
+            $this->twoFactorManager,
+            $this->throttler
+        );
+    }
+
+    public function testIsDavAuthenticatedWithoutDavSession(): void {
+        $this->session
+            ->expects($this->once())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn(null);
+
+        $this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+    }
+
+    public function testIsDavAuthenticatedWithWrongDavSession(): void {
+        $this->session
+            ->expects($this->exactly(2))
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('AnotherUser');
+
+        $this->assertFalse(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+    }
+
+    public function testIsDavAuthenticatedWithCorrectDavSession(): void {
+        $this->session
+            ->expects($this->exactly(2))
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('MyTestUser');
+
+        $this->assertTrue(self::invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
+    }
+
+    public function testValidateUserPassOfAlreadyDAVAuthenticatedUser(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->exactly(1))
+            ->method('getUID')
+            ->willReturn('MyTestUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->userSession
+            ->expects($this->exactly(1))
+            ->method('getUser')
+            ->willReturn($user);
+        $this->session
+            ->expects($this->exactly(2))
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('MyTestUser');
+        $this->session
+            ->expects($this->once())
+            ->method('close');
+
+        $this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+    }
+
+    public function testValidateUserPassOfInvalidDAVAuthenticatedUser(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())
+            ->method('getUID')
+            ->willReturn('MyTestUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->session
+            ->expects($this->exactly(2))
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('AnotherUser');
+        $this->session
+            ->expects($this->once())
+            ->method('close');
+
+        $this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+    }
+
+    public function testValidateUserPassOfInvalidDAVAuthenticatedUserWithValidPassword(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('MyTestUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->userSession
+            ->expects($this->exactly(2))
+            ->method('getUser')
+            ->willReturn($user);
+        $this->session
+            ->expects($this->exactly(2))
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('AnotherUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('MyTestUser', 'MyTestPassword', $this->request)
+            ->willReturn(true);
+        $this->session
+            ->expects($this->once())
+            ->method('set')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND', 'MyTestUser');
+        $this->session
+            ->expects($this->once())
+            ->method('close');
+
+        $this->assertTrue(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+    }
+
+    public function testValidateUserPassWithInvalidPassword(): void {
+        $this->userSession
+            ->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('MyTestUser', 'MyTestPassword')
+            ->willReturn(false);
+        $this->session
+            ->expects($this->once())
+            ->method('close');
+
+        $this->assertFalse(self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']));
+    }
+
+
+    public function testValidateUserPassWithPasswordLoginForbidden(): void {
+        $this->expectException(PasswordLoginForbidden::class);
+
+        $this->userSession
+            ->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('MyTestUser', 'MyTestPassword')
+            ->will($this->throwException(new PasswordLoginForbiddenException()));
+        $this->session
+            ->expects($this->once())
+            ->method('close');
+
+        self::invokePrivate($this->auth, 'validateUserPass', ['MyTestUser', 'MyTestPassword']);
+    }
+
+    public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGet(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('POST');
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn(null);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('MyWrongDavUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(false);
+
+        $expectedResponse = [
+            false,
+            "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured",
+        ];
+        $response = $this->auth->check($request, $response);
+        $this->assertSame($expectedResponse, $response);
+    }
+
+    public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndCorrectlyDavAuthenticated(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('PROPFIND');
+        $this->request
+            ->expects($this->any())
+            ->method('isUserAgent')
+            ->willReturn(false);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('LoggedInUser');
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('LoggedInUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(false);
+        $this->auth->check($request, $response);
+    }
+
+
+    public function testAuthenticateAlreadyLoggedInWithoutTwoFactorChallengePassed(): void {
+        $this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+        $this->expectExceptionMessage('2FA challenge not passed.');
+
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('PROPFIND');
+        $this->request
+            ->expects($this->any())
+            ->method('isUserAgent')
+            ->willReturn(false);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('LoggedInUser');
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('LoggedInUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(true);
+        $this->twoFactorManager->expects($this->once())
+            ->method('needsSecondFactor')
+            ->with($user)
+            ->willReturn(true);
+        $this->auth->check($request, $response);
+    }
+
+
+    public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenAndIncorrectlyDavAuthenticated(): void {
+        $this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+        $this->expectExceptionMessage('CSRF check not passed.');
+
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('PROPFIND');
+        $this->request
+            ->expects($this->any())
+            ->method('isUserAgent')
+            ->willReturn(false);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('AnotherUser');
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('LoggedInUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(false);
+        $this->auth->check($request, $response);
+    }
+
+    public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForNonGetAndDesktopClient(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('POST');
+        $this->request
+            ->expects($this->any())
+            ->method('isUserAgent')
+            ->willReturn(true);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn(null);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('MyWrongDavUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(false);
+
+        $this->auth->check($request, $response);
+    }
+
+    public function testAuthenticateAlreadyLoggedInWithoutCsrfTokenForGet(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn(null);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('MyWrongDavUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->any())
+            ->method('getMethod')
+            ->willReturn('GET');
+
+        $response = $this->auth->check($request, $response);
+        $this->assertEquals([true, 'principals/users/MyWrongDavUser'], $response);
+    }
+
+    public function testAuthenticateAlreadyLoggedInWithCsrfTokenForGet(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->session
+            ->expects($this->any())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn(null);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('MyWrongDavUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(true);
+
+        $response = $this->auth->check($request, $response);
+        $this->assertEquals([true, 'principals/users/MyWrongDavUser'], $response);
+    }
+
+    public function testAuthenticateNoBasicAuthenticateHeadersProvided(): void {
+        $server = $this->createMock(Server::class);
+        $server->httpRequest = $this->createMock(RequestInterface::class);
+        $server->httpResponse = $this->createMock(ResponseInterface::class);
+        $response = $this->auth->check($server->httpRequest, $server->httpResponse);
+        $this->assertEquals([false, 'No \'Authorization: Basic\' header found. Either the client didn\'t send one, or the server is misconfigured'], $response);
+    }
+
+
+    public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjax(): void {
+        $this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+        $this->expectExceptionMessage('Cannot authenticate over ajax calls');
+
+        /** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
+        $httpRequest = $this->createMock(RequestInterface::class);
+        /** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
+        $httpResponse = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $httpRequest
+            ->expects($this->exactly(2))
+            ->method('getHeader')
+            ->willReturnMap([
+                ['X-Requested-With', 'XMLHttpRequest'],
+                ['Authorization', null],
+            ]);
+
+        $this->auth->check($httpRequest, $httpResponse);
+    }
+
+    public function testAuthenticateWithBasicAuthenticateHeadersProvidedWithAjax(): void {
+        // No CSRF
+        $this->request
+            ->expects($this->once())
+            ->method('passesCSRFCheck')
+            ->willReturn(false);
+
+        /** @var \Sabre\HTTP\RequestInterface&MockObject $httpRequest */
+        $httpRequest = $this->createMock(RequestInterface::class);
+        /** @var \Sabre\HTTP\ResponseInterface&MockObject $httpResponse */
+        $httpResponse = $this->createMock(ResponseInterface::class);
+        $httpRequest
+            ->expects($this->any())
+            ->method('getHeader')
+            ->willReturnMap([
+                ['X-Requested-With', 'XMLHttpRequest'],
+                ['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
+            ]);
+
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('MyDavUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('username', 'password')
+            ->willReturn(true);
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->auth->check($httpRequest, $httpResponse);
+    }
+
+    public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjaxButUserIsStillLoggedIn(): void {
+        /** @var \Sabre\HTTP\RequestInterface $httpRequest */
+        $httpRequest = $this->createMock(RequestInterface::class);
+        /** @var \Sabre\HTTP\ResponseInterface $httpResponse */
+        $httpResponse = $this->createMock(ResponseInterface::class);
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('MyTestUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->session
+            ->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('AUTHENTICATED_TO_DAV_BACKEND')
+            ->willReturn('MyTestUser');
+        $this->request
+            ->expects($this->once())
+            ->method('getMethod')
+            ->willReturn('GET');
+        $httpRequest
+            ->expects($this->atLeastOnce())
+            ->method('getHeader')
+            ->with('Authorization')
+            ->willReturn(null);
+        $this->assertEquals(
+            [true, 'principals/users/MyTestUser'],
+            $this->auth->check($httpRequest, $httpResponse)
+        );
+    }
+
+    public function testAuthenticateValidCredentials(): void {
+        $server = $this->createMock(Server::class);
+        $server->httpRequest = $this->createMock(RequestInterface::class);
+        $server->httpRequest
+            ->expects($this->once())
+            ->method('getHeader')
+            ->with('Authorization')
+            ->willReturn('basic dXNlcm5hbWU6cGFzc3dvcmQ=');
+
+        $server->httpResponse = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('username', 'password')
+            ->willReturn(true);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('MyTestUser');
+        $this->userSession
+            ->expects($this->exactly(3))
+            ->method('getUser')
+            ->willReturn($user);
+        $response = $this->auth->check($server->httpRequest, $server->httpResponse);
+        $this->assertEquals([true, 'principals/users/MyTestUser'], $response);
+    }
+
+    public function testAuthenticateInvalidCredentials(): void {
+        $server = $this->createMock(Server::class);
+        $server->httpRequest = $this->createMock(RequestInterface::class);
+        $server->httpRequest
+            ->expects($this->exactly(2))
+            ->method('getHeader')
+            ->willReturnMap([
+                ['Authorization', 'basic dXNlcm5hbWU6cGFzc3dvcmQ='],
+                ['X-Requested-With', null],
+            ]);
+        $server->httpResponse = $this->createMock(ResponseInterface::class);
+        $this->userSession
+            ->expects($this->once())
+            ->method('logClientIn')
+            ->with('username', 'password')
+            ->willReturn(false);
+        $response = $this->auth->check($server->httpRequest, $server->httpResponse);
+        $this->assertEquals([false, 'Username or password was incorrect'], $response);
+    }
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php

Indentation +25 added lines, -25 removed lines

@@ -19,39 +19,39 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
 class DownloadTest extends RequestTestCase {
-	public function testDownload(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testDownload(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+        $view->file_put_contents('foo.txt', 'bar');
 
-		$response = $this->request($view, $user, 'pass', 'GET', '/foo.txt');
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals(stream_get_contents($response->getBody()), 'bar');
-	}
+        $response = $this->request($view, $user, 'pass', 'GET', '/foo.txt');
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+        $this->assertEquals(stream_get_contents($response->getBody()), 'bar');
+    }
 
-	public function testDownloadWriteLocked(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testDownloadWriteLocked(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+        $view->file_put_contents('foo.txt', 'bar');
 
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
+        $view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
 
-		$result = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
-		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
-	}
+        $result = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
+        $this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
+    }
 
-	public function testDownloadReadLocked(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testDownloadReadLocked(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+        $view->file_put_contents('foo.txt', 'bar');
 
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
+        $view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
 
-		$response = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals(stream_get_contents($response->getBody()), 'bar');
-	}
+        $response = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+        $this->assertEquals(stream_get_contents($response->getBody()), 'bar');
+    }
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php

Indentation +15 added lines, -15 removed lines

@@ -18,25 +18,25 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
 class DeleteTest extends RequestTestCase {
-	public function testBasicUpload(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testBasicUpload(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'asd');
-		$mount = $view->getMount('foo.txt');
-		$internalPath = $view->getAbsolutePath();
+        $view->file_put_contents('foo.txt', 'asd');
+        $mount = $view->getMount('foo.txt');
+        $internalPath = $view->getAbsolutePath();
 
-		// create a ghost file
-		$mount->getStorage()->unlink($mount->getInternalPath($internalPath));
+        // create a ghost file
+        $mount->getStorage()->unlink($mount->getInternalPath($internalPath));
 
-		// cache entry still exists
-		$this->assertInstanceOf(\OCP\Files\FileInfo::class, $view->getFileInfo('foo.txt'));
+        // cache entry still exists
+        $this->assertInstanceOf(\OCP\Files\FileInfo::class, $view->getFileInfo('foo.txt'));
 
-		$response = $this->request($view, $user, 'pass', 'DELETE', '/foo.txt');
+        $response = $this->request($view, $user, 'pass', 'DELETE', '/foo.txt');
 
-		$this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
+        $this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
 
-		// no longer in the cache
-		$this->assertFalse($view->getFileInfo('foo.txt'));
-	}
+        // no longer in the cache
+        $this->assertFalse($view->getFileInfo('foo.txt'));
+    }
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php

Indentation +11 added lines, -11 removed lines

@@ -22,16 +22,16 @@
  * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
  */
 class EncryptionUploadTest extends UploadTest {
-	use EncryptionTrait;
+    use EncryptionTrait;
 
-	protected function setupUser($name, $password): View {
-		$this->createUser($name, $password);
-		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		// we use per-user keys
-		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
-		$this->setupForUser($name, $password);
-		$this->loginWithEncryption($name);
-		return new View('/' . $name . '/files');
-	}
+    protected function setupUser($name, $password): View {
+        $this->createUser($name, $password);
+        $tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
+        $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+        // we use per-user keys
+        Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
+        $this->setupForUser($name, $password);
+        $this->loginWithEncryption($name);
+        return new View('/' . $name . '/files');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
 	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/'.$name, ['datadir' => $tmpFolder]);
 		// we use per-user keys
 		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '0');
 		$this->setupForUser($name, $password);
 		$this->loginWithEncryption($name);
-		return new View('/' . $name . '/files');
+		return new View('/'.$name.'/files');
 	}
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php

Indentation +11 added lines, -11 removed lines

@@ -22,16 +22,16 @@
  * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
  */
 class EncryptionMasterKeyUploadTest extends UploadTest {
-	use EncryptionTrait;
+    use EncryptionTrait;
 
-	protected function setupUser($name, $password): View {
-		$this->createUser($name, $password);
-		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		// we use the master key
-		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
-		$this->setupForUser($name, $password);
-		$this->loginWithEncryption($name);
-		return new View('/' . $name . '/files');
-	}
+    protected function setupUser($name, $password): View {
+        $this->createUser($name, $password);
+        $tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
+        $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+        // we use the master key
+        Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
+        $this->setupForUser($name, $password);
+        $this->loginWithEncryption($name);
+        return new View('/' . $name . '/files');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
 	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/'.$name, ['datadir' => $tmpFolder]);
 		// we use the master key
 		Server::get(IConfig::class)->setAppValue('encryption', 'useMasterKey', '1');
 		$this->setupForUser($name, $password);
 		$this->loginWithEncryption($name);
-		return new View('/' . $name . '/files');
+		return new View('/'.$name.'/files');
 	}
 }

apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php

Indentation +111 added lines, -111 removed lines

@@ -29,115 +29,115 @@
 use Test\Traits\UserTrait;
 
 abstract class RequestTestCase extends TestCase {
-	use UserTrait;
-	use MountProviderTrait;
-	protected ServerFactory $serverFactory;
-
-	protected function getStream($string) {
-		$stream = fopen('php://temp', 'r+');
-		fwrite($stream, $string);
-		fseek($stream, 0);
-		return $stream;
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->serverFactory = new ServerFactory(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(LoggerInterface::class),
-			\OCP\Server::get(IDBConnection::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IMountManager::class),
-			\OCP\Server::get(ITagManager::class),
-			$this->createMock(IRequest::class),
-			\OCP\Server::get(IPreview::class),
-			\OCP\Server::get(IEventDispatcher::class),
-			\OCP\Server::get(IFactory::class)->get('dav'),
-		);
-	}
-
-	protected function setupUser($name, $password): View {
-		$this->createUser($name, $password);
-		$tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		self::loginAsUser($name);
-		return new View('/' . $name . '/files');
-	}
-
-	/**
-	 * @param View $view the view to run the webdav server against
-	 * @param string $user
-	 * @param string $password
-	 * @param string $method
-	 * @param string $url
-	 * @param resource|string|null $body
-	 * @param array|null $headers
-	 * @return \Sabre\HTTP\Response
-	 * @throws \Exception
-	 */
-	protected function request($view, $user, $password, $method, $url, $body = null, $headers = []) {
-		if (is_string($body)) {
-			$body = $this->getStream($body);
-		}
-		$this->logout();
-		$exceptionPlugin = new ExceptionPlugin('webdav', \OCP\Server::get(LoggerInterface::class));
-		$server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
-		$request = new Request($method, $url, $headers, $body);
-
-		// since sabre catches all exceptions we need to save them and throw them from outside the sabre server
-
-		$serverParams = [];
-		if (is_array($headers)) {
-			foreach ($headers as $header => $value) {
-				$serverParams['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
-			}
-		}
-		$ncRequest = new \OC\AppFramework\Http\Request([
-			'server' => $serverParams
-		], $this->createMock(IRequestId::class), $this->createMock(IConfig::class), null);
-
-		$this->overwriteService(IRequest::class, $ncRequest);
-
-		$result = $this->makeRequest($server, $request);
-
-		$this->restoreService(IRequest::class);
-
-		foreach ($exceptionPlugin->getExceptions() as $exception) {
-			throw $exception;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param Server $server
-	 * @param Request $request
-	 * @return \Sabre\HTTP\Response
-	 */
-	protected function makeRequest(Server $server, Request $request) {
-		$sapi = new Sapi($request);
-		$server->sapi = $sapi;
-		$server->httpRequest = $request;
-		$server->exec();
-		return $sapi->getResponse();
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $user
-	 * @param string $password
-	 * @param ExceptionPlugin $exceptionPlugin
-	 * @return Server
-	 */
-	protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
-		$authBackend = new Auth($user, $password);
-		$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
-
-		$server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function () use ($view) {
-			return $view;
-		});
-		$server->addPlugin($exceptionPlugin);
-
-		return $server;
-	}
+    use UserTrait;
+    use MountProviderTrait;
+    protected ServerFactory $serverFactory;
+
+    protected function getStream($string) {
+        $stream = fopen('php://temp', 'r+');
+        fwrite($stream, $string);
+        fseek($stream, 0);
+        return $stream;
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->serverFactory = new ServerFactory(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(LoggerInterface::class),
+            \OCP\Server::get(IDBConnection::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IMountManager::class),
+            \OCP\Server::get(ITagManager::class),
+            $this->createMock(IRequest::class),
+            \OCP\Server::get(IPreview::class),
+            \OCP\Server::get(IEventDispatcher::class),
+            \OCP\Server::get(IFactory::class)->get('dav'),
+        );
+    }
+
+    protected function setupUser($name, $password): View {
+        $this->createUser($name, $password);
+        $tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
+        $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+        self::loginAsUser($name);
+        return new View('/' . $name . '/files');
+    }
+
+    /**
+     * @param View $view the view to run the webdav server against
+     * @param string $user
+     * @param string $password
+     * @param string $method
+     * @param string $url
+     * @param resource|string|null $body
+     * @param array|null $headers
+     * @return \Sabre\HTTP\Response
+     * @throws \Exception
+     */
+    protected function request($view, $user, $password, $method, $url, $body = null, $headers = []) {
+        if (is_string($body)) {
+            $body = $this->getStream($body);
+        }
+        $this->logout();
+        $exceptionPlugin = new ExceptionPlugin('webdav', \OCP\Server::get(LoggerInterface::class));
+        $server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
+        $request = new Request($method, $url, $headers, $body);
+
+        // since sabre catches all exceptions we need to save them and throw them from outside the sabre server
+
+        $serverParams = [];
+        if (is_array($headers)) {
+            foreach ($headers as $header => $value) {
+                $serverParams['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
+            }
+        }
+        $ncRequest = new \OC\AppFramework\Http\Request([
+            'server' => $serverParams
+        ], $this->createMock(IRequestId::class), $this->createMock(IConfig::class), null);
+
+        $this->overwriteService(IRequest::class, $ncRequest);
+
+        $result = $this->makeRequest($server, $request);
+
+        $this->restoreService(IRequest::class);
+
+        foreach ($exceptionPlugin->getExceptions() as $exception) {
+            throw $exception;
+        }
+        return $result;
+    }
+
+    /**
+     * @param Server $server
+     * @param Request $request
+     * @return \Sabre\HTTP\Response
+     */
+    protected function makeRequest(Server $server, Request $request) {
+        $sapi = new Sapi($request);
+        $server->sapi = $sapi;
+        $server->httpRequest = $request;
+        $server->exec();
+        return $sapi->getResponse();
+    }
+
+    /**
+     * @param View $view
+     * @param string $user
+     * @param string $password
+     * @param ExceptionPlugin $exceptionPlugin
+     * @return Server
+     */
+    protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
+        $authBackend = new Auth($user, $password);
+        $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
+
+        $server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function () use ($view) {
+            return $view;
+        });
+        $server->addPlugin($exceptionPlugin);
+
+        return $server;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -60,9 +60,9 @@ 
 	protected function setupUser($name, $password): View {
 		$this->createUser($name, $password);
 		$tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/'.$name, ['datadir' => $tmpFolder]);
 		self::loginAsUser($name);
-		return new View('/' . $name . '/files');
+		return new View('/'.$name.'/files');
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 		$serverParams = [];
 		if (is_array($headers)) {
 			foreach ($headers as $header => $value) {
-				$serverParams['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
+				$serverParams['HTTP_'.strtoupper(str_replace('-', '_', $header))] = $value;
 			}
 		}
 		$ncRequest = new \OC\AppFramework\Http\Request([
@@ -133,7 +133,7 @@ 
 		$authBackend = new Auth($user, $password);
 		$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
-		$server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function () use ($view) {
+		$server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function() use ($view) {
 			return $view;
 		});
 		$server->addPlugin($exceptionPlugin);

apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php

Indentation +19 added lines, -19 removed lines

@@ -19,24 +19,24 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
 class PartFileInRootUploadTest extends UploadTest {
-	protected function setUp(): void {
-		$config = Server::get(IConfig::class);
-		$mockConfig = $this->createMock(IConfig::class);
-		$mockConfig->expects($this->any())
-			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
-				if ($key === 'part_file_in_storage') {
-					return false;
-				} else {
-					return $config->getSystemValue($key, $default);
-				}
-			});
-		$this->overwriteService(AllConfig::class, $mockConfig);
-		parent::setUp();
-	}
+    protected function setUp(): void {
+        $config = Server::get(IConfig::class);
+        $mockConfig = $this->createMock(IConfig::class);
+        $mockConfig->expects($this->any())
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) use ($config) {
+                if ($key === 'part_file_in_storage') {
+                    return false;
+                } else {
+                    return $config->getSystemValue($key, $default);
+                }
+            });
+        $this->overwriteService(AllConfig::class, $mockConfig);
+        parent::setUp();
+    }
 
-	protected function tearDown(): void {
-		$this->restoreService('AllConfig');
-		parent::tearDown();
-	}
+    protected function tearDown(): void {
+        $this->restoreService('AllConfig');
+        parent::tearDown();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		$mockConfig = $this->createMock(IConfig::class);
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
+			->willReturnCallback(function($key, $default) use ($config) {
 				if ($key === 'part_file_in_storage') {
 					return false;
 				} else {

apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php

Indentation +40 added lines, -40 removed lines

@@ -19,60 +19,60 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
  */
 class UploadTest extends RequestTestCase {
-	public function testBasicUpload(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testBasicUpload(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$this->assertFalse($view->file_exists('foo.txt'));
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
+        $this->assertFalse($view->file_exists('foo.txt'));
+        $response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertTrue($view->file_exists('foo.txt'));
-		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+        $this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
+        $this->assertTrue($view->file_exists('foo.txt'));
+        $this->assertEquals('asd', $view->file_get_contents('foo.txt'));
 
-		$info = $view->getFileInfo('foo.txt');
-		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
-		$this->assertEquals(3, $info->getSize());
-	}
+        $info = $view->getFileInfo('foo.txt');
+        $this->assertInstanceOf('\OC\Files\FileInfo', $info);
+        $this->assertEquals(3, $info->getSize());
+    }
 
-	public function testUploadOverWrite(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testUploadOverWrite(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'foobar');
+        $view->file_put_contents('foo.txt', 'foobar');
 
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
+        $response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
-		$this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
-		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+        $this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
+        $this->assertEquals('asd', $view->file_get_contents('foo.txt'));
 
-		$info = $view->getFileInfo('foo.txt');
-		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
-		$this->assertEquals(3, $info->getSize());
-	}
+        $info = $view->getFileInfo('foo.txt');
+        $this->assertInstanceOf('\OC\Files\FileInfo', $info);
+        $this->assertEquals(3, $info->getSize());
+    }
 
-	public function testUploadOverWriteReadLocked(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
+    public function testUploadOverWriteReadLocked(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+        $view->file_put_contents('foo.txt', 'bar');
 
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
+        $view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
 
-		$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
-		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
-	}
+        $result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
+        $this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
+    }
 
-	public function testUploadOverWriteWriteLocked(): void {
-		$user = self::getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-		$this->loginAsUser($user);
+    public function testUploadOverWriteWriteLocked(): void {
+        $user = self::getUniqueID();
+        $view = $this->setupUser($user, 'pass');
+        $this->loginAsUser($user);
 
-		$view->file_put_contents('foo.txt', 'bar');
+        $view->file_put_contents('foo.txt', 'bar');
 
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
+        $view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
 
-		$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
-		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
-	}
+        $result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
+        $this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
+    }
 }