nextcloud / server

apps/dav/appinfo/v1/caldav.php

Indentation +30 added lines, -30 removed lines

@@ -35,25 +35,25 @@ 
 use Psr\Log\LoggerInterface;
 
 $authBackend = new Auth(
-	Server::get(ISession::class),
-	Server::get(IUserSession::class),
-	Server::get(IRequest::class),
-	Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-	Server::get(IThrottler::class),
-	'principals/'
+    Server::get(ISession::class),
+    Server::get(IUserSession::class),
+    Server::get(IRequest::class),
+    Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+    Server::get(IThrottler::class),
+    'principals/'
 );
 $principalBackend = new Principal(
-	Server::get(IUserManager::class),
-	Server::get(IGroupManager::class),
-	Server::get(IAccountManager::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(IUserSession::class),
-	Server::get(IAppManager::class),
-	Server::get(ProxyMapper::class),
-	Server::get(KnownUserService::class),
-	Server::get(IConfig::class),
-	\OC::$server->getL10NFactory(),
-	'principals/'
+    Server::get(IUserManager::class),
+    Server::get(IGroupManager::class),
+    Server::get(IAccountManager::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(IUserSession::class),
+    Server::get(IAppManager::class),
+    Server::get(ProxyMapper::class),
+    Server::get(KnownUserService::class),
+    Server::get(IConfig::class),
+    \OC::$server->getL10NFactory(),
+    'principals/'
 );
 $db = Server::get(IDBConnection::class);
 $userManager = Server::get(IUserManager::class);
@@ -63,15 +63,15 @@ 
 $config = Server::get(IConfig::class);
 
 $calDavBackend = new CalDavBackend(
-	$db,
-	$principalBackend,
-	$userManager,
-	$random,
-	$logger,
-	$dispatcher,
-	$config,
-	Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
-	true
+    $db,
+    $principalBackend,
+    $userManager,
+    $random,
+    $logger,
+    $dispatcher,
+    $config,
+    Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
+    true
 );
 
 $debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
@@ -85,8 +85,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -102,7 +102,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
@@ -110,7 +110,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(Server::get(IConfig::class), Server::get(LoggerInterface::class), Server::get(DefaultCalendarValidator::class)));
 
 if ($sendInvitations) {
-	$server->addPlugin(Server::get(IMipPlugin::class));
+    $server->addPlugin(Server::get(IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', $logger));
 $server->addPlugin(Server::get(RateLimitingPlugin::class));

apps/dav/lib/Connector/Sabre/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -186,7 +186,7 @@ 
 				$user = $this->userSession->getUser()->getUID();
 				$this->currentUser = $user;
 				$this->session->close();
-				return [true, $this->principalPrefix . $user];
+				return [true, $this->principalPrefix.$user];
 			}
 		}
 
@@ -197,7 +197,7 @@ 
 			$data[1] = substr_replace($data[1], $user, $startPos);
 		} elseif (in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
 			// For ajax requests use dummy auth name to prevent browser popup in case of invalid creditials
-			$response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
+			$response->addHeader('WWW-Authenticate', 'DummyBasic realm="'.$this->realm.'"');
 			$response->setStatus(Http::STATUS_UNAUTHORIZED);
 			throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
 		}

Indentation +175 added lines, -175 removed lines

@@ -28,179 +28,179 @@
 use Sabre\HTTP\ResponseInterface;
 
 class Auth extends AbstractBasic {
-	public const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
-	private ?string $currentUser = null;
-
-	public function __construct(
-		private ISession $session,
-		private Session $userSession,
-		private IRequest $request,
-		private Manager $twoFactorManager,
-		private IThrottler $throttler,
-		string $principalPrefix = 'principals/users/',
-	) {
-		$this->principalPrefix = $principalPrefix;
-
-		// setup realm
-		$defaults = new Defaults();
-		$this->realm = $defaults->getName() ?: 'Nextcloud';
-	}
-
-	/**
-	 * Whether the user has initially authenticated via DAV
-	 *
-	 * This is required for WebDAV clients that resent the cookies even when the
-	 * account was changed.
-	 *
-	 * @see https://github.com/owncloud/core/issues/13245
-	 */
-	public function isDavAuthenticated(string $username): bool {
-		return !is_null($this->session->get(self::DAV_AUTHENTICATED))
-		&& $this->session->get(self::DAV_AUTHENTICATED) === $username;
-	}
-
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return bool
-	 * @throws PasswordLoginForbidden
-	 */
-	protected function validateUserPass($username, $password) {
-		if ($this->userSession->isLoggedIn()
-			&& $this->isDavAuthenticated($this->userSession->getUser()->getUID())
-		) {
-			$this->session->close();
-			return true;
-		} else {
-			try {
-				if ($this->userSession->logClientIn($username, $password, $this->request, $this->throttler)) {
-					$this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID());
-					$this->session->close();
-					return true;
-				} else {
-					$this->session->close();
-					return false;
-				}
-			} catch (PasswordLoginForbiddenException $ex) {
-				$this->session->close();
-				throw new PasswordLoginForbidden();
-			} catch (MaxDelayReached $ex) {
-				$this->session->close();
-				throw new TooManyRequests();
-			}
-		}
-	}
-
-	/**
-	 * @return array{bool, string}
-	 * @throws NotAuthenticated
-	 * @throws ServiceUnavailable
-	 */
-	public function check(RequestInterface $request, ResponseInterface $response) {
-		try {
-			return $this->auth($request, $response);
-		} catch (NotAuthenticated $e) {
-			throw $e;
-		} catch (Exception $e) {
-			$class = get_class($e);
-			$msg = $e->getMessage();
-			Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-			throw new ServiceUnavailable("$class: $msg");
-		}
-	}
-
-	/**
-	 * Checks whether a CSRF check is required on the request
-	 */
-	private function requiresCSRFCheck(): bool {
-
-		$methodsWithoutCsrf = ['GET', 'HEAD', 'OPTIONS'];
-		if (in_array($this->request->getMethod(), $methodsWithoutCsrf)) {
-			return false;
-		}
-
-		// Official Nextcloud clients require no checks
-		if ($this->request->isUserAgent([
-			IRequest::USER_AGENT_CLIENT_DESKTOP,
-			IRequest::USER_AGENT_CLIENT_ANDROID,
-			IRequest::USER_AGENT_CLIENT_IOS,
-		])) {
-			return false;
-		}
-
-		// If not logged-in no check is required
-		if (!$this->userSession->isLoggedIn()) {
-			return false;
-		}
-
-		// POST always requires a check
-		if ($this->request->getMethod() === 'POST') {
-			return true;
-		}
-
-		// If logged-in AND DAV authenticated no check is required
-		if ($this->userSession->isLoggedIn()
-			&& $this->isDavAuthenticated($this->userSession->getUser()->getUID())) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return array{bool, string}
-	 * @throws NotAuthenticated
-	 */
-	private function auth(RequestInterface $request, ResponseInterface $response): array {
-		$forcedLogout = false;
-
-		if (!$this->request->passesCSRFCheck()
-			&& $this->requiresCSRFCheck()) {
-			// In case of a fail with POST we need to recheck the credentials
-			if ($this->request->getMethod() === 'POST') {
-				$forcedLogout = true;
-			} else {
-				$response->setStatus(Http::STATUS_UNAUTHORIZED);
-				throw new \Sabre\DAV\Exception\NotAuthenticated('CSRF check not passed.');
-			}
-		}
-
-		if ($forcedLogout) {
-			$this->userSession->logout();
-		} else {
-			if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
-				throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
-			}
-			if (
-				//Fix for broken webdav clients
-				($this->userSession->isLoggedIn() && is_null($this->session->get(self::DAV_AUTHENTICATED)))
-				//Well behaved clients that only send the cookie are allowed
-				|| ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && empty($request->getHeader('Authorization')))
-				|| \OC_User::handleApacheAuth()
-			) {
-				$user = $this->userSession->getUser()->getUID();
-				$this->currentUser = $user;
-				$this->session->close();
-				return [true, $this->principalPrefix . $user];
-			}
-		}
-
-		$data = parent::check($request, $response);
-		if ($data[0] === true) {
-			$startPos = strrpos($data[1], '/') + 1;
-			$user = $this->userSession->getUser()->getUID();
-			$data[1] = substr_replace($data[1], $user, $startPos);
-		} elseif (in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
-			// For ajax requests use dummy auth name to prevent browser popup in case of invalid creditials
-			$response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
-			$response->setStatus(Http::STATUS_UNAUTHORIZED);
-			throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
-		}
-		return $data;
-	}
+    public const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
+    private ?string $currentUser = null;
+
+    public function __construct(
+        private ISession $session,
+        private Session $userSession,
+        private IRequest $request,
+        private Manager $twoFactorManager,
+        private IThrottler $throttler,
+        string $principalPrefix = 'principals/users/',
+    ) {
+        $this->principalPrefix = $principalPrefix;
+
+        // setup realm
+        $defaults = new Defaults();
+        $this->realm = $defaults->getName() ?: 'Nextcloud';
+    }
+
+    /**
+     * Whether the user has initially authenticated via DAV
+     *
+     * This is required for WebDAV clients that resent the cookies even when the
+     * account was changed.
+     *
+     * @see https://github.com/owncloud/core/issues/13245
+     */
+    public function isDavAuthenticated(string $username): bool {
+        return !is_null($this->session->get(self::DAV_AUTHENTICATED))
+        && $this->session->get(self::DAV_AUTHENTICATED) === $username;
+    }
+
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     * @throws PasswordLoginForbidden
+     */
+    protected function validateUserPass($username, $password) {
+        if ($this->userSession->isLoggedIn()
+            && $this->isDavAuthenticated($this->userSession->getUser()->getUID())
+        ) {
+            $this->session->close();
+            return true;
+        } else {
+            try {
+                if ($this->userSession->logClientIn($username, $password, $this->request, $this->throttler)) {
+                    $this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID());
+                    $this->session->close();
+                    return true;
+                } else {
+                    $this->session->close();
+                    return false;
+                }
+            } catch (PasswordLoginForbiddenException $ex) {
+                $this->session->close();
+                throw new PasswordLoginForbidden();
+            } catch (MaxDelayReached $ex) {
+                $this->session->close();
+                throw new TooManyRequests();
+            }
+        }
+    }
+
+    /**
+     * @return array{bool, string}
+     * @throws NotAuthenticated
+     * @throws ServiceUnavailable
+     */
+    public function check(RequestInterface $request, ResponseInterface $response) {
+        try {
+            return $this->auth($request, $response);
+        } catch (NotAuthenticated $e) {
+            throw $e;
+        } catch (Exception $e) {
+            $class = get_class($e);
+            $msg = $e->getMessage();
+            Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+            throw new ServiceUnavailable("$class: $msg");
+        }
+    }
+
+    /**
+     * Checks whether a CSRF check is required on the request
+     */
+    private function requiresCSRFCheck(): bool {
+
+        $methodsWithoutCsrf = ['GET', 'HEAD', 'OPTIONS'];
+        if (in_array($this->request->getMethod(), $methodsWithoutCsrf)) {
+            return false;
+        }
+
+        // Official Nextcloud clients require no checks
+        if ($this->request->isUserAgent([
+            IRequest::USER_AGENT_CLIENT_DESKTOP,
+            IRequest::USER_AGENT_CLIENT_ANDROID,
+            IRequest::USER_AGENT_CLIENT_IOS,
+        ])) {
+            return false;
+        }
+
+        // If not logged-in no check is required
+        if (!$this->userSession->isLoggedIn()) {
+            return false;
+        }
+
+        // POST always requires a check
+        if ($this->request->getMethod() === 'POST') {
+            return true;
+        }
+
+        // If logged-in AND DAV authenticated no check is required
+        if ($this->userSession->isLoggedIn()
+            && $this->isDavAuthenticated($this->userSession->getUser()->getUID())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return array{bool, string}
+     * @throws NotAuthenticated
+     */
+    private function auth(RequestInterface $request, ResponseInterface $response): array {
+        $forcedLogout = false;
+
+        if (!$this->request->passesCSRFCheck()
+            && $this->requiresCSRFCheck()) {
+            // In case of a fail with POST we need to recheck the credentials
+            if ($this->request->getMethod() === 'POST') {
+                $forcedLogout = true;
+            } else {
+                $response->setStatus(Http::STATUS_UNAUTHORIZED);
+                throw new \Sabre\DAV\Exception\NotAuthenticated('CSRF check not passed.');
+            }
+        }
+
+        if ($forcedLogout) {
+            $this->userSession->logout();
+        } else {
+            if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
+                throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
+            }
+            if (
+                //Fix for broken webdav clients
+                ($this->userSession->isLoggedIn() && is_null($this->session->get(self::DAV_AUTHENTICATED)))
+                //Well behaved clients that only send the cookie are allowed
+                || ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && empty($request->getHeader('Authorization')))
+                || \OC_User::handleApacheAuth()
+            ) {
+                $user = $this->userSession->getUser()->getUID();
+                $this->currentUser = $user;
+                $this->session->close();
+                return [true, $this->principalPrefix . $user];
+            }
+        }
+
+        $data = parent::check($request, $response);
+        if ($data[0] === true) {
+            $startPos = strrpos($data[1], '/') + 1;
+            $user = $this->userSession->getUser()->getUID();
+            $data[1] = substr_replace($data[1], $user, $startPos);
+        } elseif (in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
+            // For ajax requests use dummy auth name to prevent browser popup in case of invalid creditials
+            $response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
+            $response->setStatus(Http::STATUS_UNAUTHORIZED);
+            throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
+        }
+        return $data;
+    }
 }

lib/private/Cache/File.php

Indentation +161 added lines, -161 removed lines

@@ -16,175 +16,175 @@
 use Psr\Log\LoggerInterface;
 
 class File implements ICache {
-	/** @var View */
-	protected $storage;
+    /** @var View */
+    protected $storage;
 
-	/**
-	 * Returns the cache storage for the logged in user
-	 *
-	 * @return \OC\Files\View cache storage
-	 * @throws \OC\ForbiddenException
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function getStorage() {
-		if ($this->storage !== null) {
-			return $this->storage;
-		}
-		$session = Server::get(IUserSession::class);
-		if ($session->isLoggedIn()) {
-			$rootView = new View();
-			$userId = $session->getUser()->getUID();
-			Filesystem::initMountPoints($userId);
-			if (!$rootView->file_exists('/' . $userId . '/cache')) {
-				$rootView->mkdir('/' . $userId . '/cache');
-			}
-			$this->storage = new View('/' . $userId . '/cache');
-			return $this->storage;
-		} else {
-			Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
-			throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
-		}
-	}
+    /**
+     * Returns the cache storage for the logged in user
+     *
+     * @return \OC\Files\View cache storage
+     * @throws \OC\ForbiddenException
+     * @throws \OC\User\NoUserException
+     */
+    protected function getStorage() {
+        if ($this->storage !== null) {
+            return $this->storage;
+        }
+        $session = Server::get(IUserSession::class);
+        if ($session->isLoggedIn()) {
+            $rootView = new View();
+            $userId = $session->getUser()->getUID();
+            Filesystem::initMountPoints($userId);
+            if (!$rootView->file_exists('/' . $userId . '/cache')) {
+                $rootView->mkdir('/' . $userId . '/cache');
+            }
+            $this->storage = new View('/' . $userId . '/cache');
+            return $this->storage;
+        } else {
+            Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
+            throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 * @throws \OC\ForbiddenException
-	 */
-	public function get($key) {
-		$result = null;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->file_get_contents($key);
-		}
-		return $result;
-	}
+    /**
+     * @param string $key
+     * @return mixed|null
+     * @throws \OC\ForbiddenException
+     */
+    public function get($key) {
+        $result = null;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->file_get_contents($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the size of the stored/cached data
-	 *
-	 * @param string $key
-	 * @return int
-	 */
-	public function size($key) {
-		$result = 0;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->filesize($key);
-		}
-		return $result;
-	}
+    /**
+     * Returns the size of the stored/cached data
+     *
+     * @param string $key
+     * @return int
+     */
+    public function size($key) {
+        $result = 0;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->filesize($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$storage = $this->getStorage();
-		$result = false;
-		// unique id to avoid chunk collision, just in case
-		$uniqueId = Server::get(ISecureRandom::class)->generate(
-			16,
-			ISecureRandom::CHAR_ALPHANUMERIC
-		);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function set($key, $value, $ttl = 0) {
+        $storage = $this->getStorage();
+        $result = false;
+        // unique id to avoid chunk collision, just in case
+        $uniqueId = Server::get(ISecureRandom::class)->generate(
+            16,
+            ISecureRandom::CHAR_ALPHANUMERIC
+        );
 
-		// use part file to prevent hasKey() to find the key
-		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
-		if ($storage && $storage->file_put_contents($keyPart, $value)) {
-			if ($ttl === 0) {
-				$ttl = 86400; // 60*60*24
-			}
-			$result = $storage->touch($keyPart, time() + $ttl);
-			$result &= $storage->rename($keyPart, $key);
-		}
-		return $result;
-	}
+        // use part file to prevent hasKey() to find the key
+        // while it is being written
+        $keyPart = $key . '.' . $uniqueId . '.part';
+        if ($storage && $storage->file_put_contents($keyPart, $value)) {
+            if ($ttl === 0) {
+                $ttl = 86400; // 60*60*24
+            }
+            $result = $storage->touch($keyPart, time() + $ttl);
+            $result &= $storage->rename($keyPart, $key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function hasKey($key) {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $key
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function hasKey($key) {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function remove($key) {
-		$storage = $this->getStorage();
-		if (!$storage) {
-			return false;
-		}
-		return $storage->unlink($key);
-	}
+    /**
+     * @param string $key
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function remove($key) {
+        $storage = $this->getStorage();
+        if (!$storage) {
+            return false;
+        }
+        return $storage->unlink($key);
+    }
 
-	/**
-	 * @param string $prefix
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function clear($prefix = '') {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_dir('/')) {
-			$dh = $storage->opendir('/');
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if ($file !== '.' && $file !== '..' && ($prefix === '' || str_starts_with($file, $prefix))) {
-						$storage->unlink('/' . $file);
-					}
-				}
-			}
-		}
-		return true;
-	}
+    /**
+     * @param string $prefix
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function clear($prefix = '') {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_dir('/')) {
+            $dh = $storage->opendir('/');
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if ($file !== '.' && $file !== '..' && ($prefix === '' || str_starts_with($file, $prefix))) {
+                        $storage->unlink('/' . $file);
+                    }
+                }
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Runs GC
-	 * @throws \OC\ForbiddenException
-	 */
-	public function gc() {
-		$storage = $this->getStorage();
-		if ($storage) {
-			// extra hour safety, in case of stray part chunks that take longer to write,
-			// because touch() is only called after the chunk was finished
-			$now = time() - 3600;
-			$dh = $storage->opendir('/');
-			if (!is_resource($dh)) {
-				return null;
-			}
-			while (($file = readdir($dh)) !== false) {
-				if ($file !== '.' && $file !== '..') {
-					try {
-						$mtime = $storage->filemtime('/' . $file);
-						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
-						}
-					} catch (\OCP\Lock\LockedException $e) {
-						// ignore locked chunks
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\ForbiddenException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Runs GC
+     * @throws \OC\ForbiddenException
+     */
+    public function gc() {
+        $storage = $this->getStorage();
+        if ($storage) {
+            // extra hour safety, in case of stray part chunks that take longer to write,
+            // because touch() is only called after the chunk was finished
+            $now = time() - 3600;
+            $dh = $storage->opendir('/');
+            if (!is_resource($dh)) {
+                return null;
+            }
+            while (($file = readdir($dh)) !== false) {
+                if ($file !== '.' && $file !== '..') {
+                    try {
+                        $mtime = $storage->filemtime('/' . $file);
+                        if ($mtime < $now) {
+                            $storage->unlink('/' . $file);
+                        }
+                    } catch (\OCP\Lock\LockedException $e) {
+                        // ignore locked chunks
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\ForbiddenException $e) {
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\LockNotAcquiredException $e) {
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function isAvailable(): bool {
-		return true;
-	}
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -35,10 +35,10 @@ 
 			$rootView = new View();
 			$userId = $session->getUser()->getUID();
 			Filesystem::initMountPoints($userId);
-			if (!$rootView->file_exists('/' . $userId . '/cache')) {
-				$rootView->mkdir('/' . $userId . '/cache');
+			if (!$rootView->file_exists('/'.$userId.'/cache')) {
+				$rootView->mkdir('/'.$userId.'/cache');
 			}
-			$this->storage = new View('/' . $userId . '/cache');
+			$this->storage = new View('/'.$userId.'/cache');
 			return $this->storage;
 		} else {
 			Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
@@ -93,7 +93,7 @@ 
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage && $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -142,7 +142,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file !== '.' && $file !== '..' && ($prefix === '' || str_starts_with($file, $prefix))) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -167,17 +167,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file !== '.' && $file !== '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\ForbiddenException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+						Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					}
 				}
 			}

lib/private/Cache/CappedMemoryCache.php

Indentation +89 added lines, -89 removed lines

@@ -17,93 +17,93 @@
  * @deprecated 25.0.0 use OCP\Cache\CappedMemoryCache instead
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
-	private $capacity;
-	/** @var T[] */
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key): bool {
-		return isset($this->cache[$key]);
-	}
-
-	/**
-	 * @return ?T
-	 */
-	public function get($key) {
-		return $this->cache[$key] ?? null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param T $value
-	 * @param int $ttl
-	 * @return bool
-	 */
-	public function set($key, $value, $ttl = 0): bool {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-		return true;
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset): bool {
-		return $this->hasKey($offset);
-	}
-
-	/**
-	 * @return T
-	 */
-	#[\ReturnTypeWillChange]
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	/**
-	 * @param string $offset
-	 * @param T $value
-	 * @return void
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset): void {
-		$this->remove($offset);
-	}
-
-	/**
-	 * @return T[]
-	 */
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
-
-	public static function isAvailable(): bool {
-		return true;
-	}
+    private $capacity;
+    /** @var T[] */
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key): bool {
+        return isset($this->cache[$key]);
+    }
+
+    /**
+     * @return ?T
+     */
+    public function get($key) {
+        return $this->cache[$key] ?? null;
+    }
+
+    /**
+     * @param string $key
+     * @param T $value
+     * @param int $ttl
+     * @return bool
+     */
+    public function set($key, $value, $ttl = 0): bool {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+        return true;
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset): bool {
+        return $this->hasKey($offset);
+    }
+
+    /**
+     * @return T
+     */
+    #[\ReturnTypeWillChange]
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    /**
+     * @param string $offset
+     * @param T $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset): void {
+        $this->remove($offset);
+    }
+
+    /**
+     * @return T[]
+     */
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
+
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

build/integration/features/bootstrap/Avatar.php

Spacing +8 added lines, -8 removed lines

@@ -6,7 +6,7 @@ 
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__.'/../../vendor/autoload.php';
 
 trait Avatar {
 	/** @var string * */
@@ -46,7 +46,7 @@ 
 	 */
 	public function userGetsAvatarForUserWithSize(string $user, string $userAvatar, string $size) {
 		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/' . $userAvatar . '/' . $size);
+		$this->sendingToDirectUrl('GET', '/index.php/avatar/'.$userAvatar.'/'.$size);
 		$this->theHTTPStatusCodeShouldBe('200');
 
 		$this->getLastAvatar();
@@ -60,7 +60,7 @@ 
 	 */
 	public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
 		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
+		$this->sendingToDirectUrl('GET', '/index.php/avatar/guest/'.$guestAvatar.'/128');
 		$this->theHTTPStatusCodeShouldBe('201');
 
 		$this->getLastAvatar();
@@ -111,7 +111,7 @@ 
 	 * @param string $path
 	 */
 	public function loggedInUserPostsTemporaryAvatarFromInternalPath(string $path) {
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
+		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path='.$path);
 		$this->theHTTPStatusCodeShouldBe('200');
 	}
 
@@ -133,10 +133,10 @@ 
 	public function loggedInUserCropsTemporaryAvatarWith(string $statusCode, TableNode $crop) {
 		$parameters = [];
 		foreach ($crop->getRowsHash() as $key => $value) {
-			$parameters[] = 'crop[' . $key . ']=' . $value;
+			$parameters[] = 'crop['.$key.']='.$value;
 		}
 
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?' . implode('&', $parameters));
+		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?'.implode('&', $parameters));
 		$this->theHTTPStatusCodeShouldBe($statusCode);
 	}
 
@@ -187,7 +187,7 @@ 
 		$colorFromLastAvatar = $this->getColorFromLastAvatar();
 
 		Assert::assertTrue($this->isSameColor($expectedColor, $colorFromLastAvatar),
-			$this->rgbColorToHexString($colorFromLastAvatar) . ' does not match expected ' . $color);
+			$this->rgbColorToHexString($colorFromLastAvatar).' does not match expected '.$color);
 	}
 
 	private function hexStringToRgbColor($hexString) {
@@ -209,7 +209,7 @@ 
 	private function rgbColorToHexString($rgbColor) {
 		$rgbColorInt = ($rgbColor['red'] << 16) + ($rgbColor['green'] << 8) + ($rgbColor['blue']);
 
-		return '#' . str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
+		return '#'.str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
 	}
 
 	private function getColorFromLastAvatar() {

Indentation +249 added lines, -249 removed lines

@@ -10,253 +10,253 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Avatar {
-	/** @var string * */
-	private $lastAvatar;
-
-	/** @AfterScenario **/
-	public function cleanupLastAvatar() {
-		$this->lastAvatar = null;
-	}
-
-	private function getLastAvatar() {
-		$this->lastAvatar = '';
-
-		$body = $this->response->getBody();
-		while (!$body->eof()) {
-			$this->lastAvatar .= $body->read(8192);
-		}
-		$body->close();
-	}
-
-	/**
-	 * @When user :user gets avatar for user :userAvatar
-	 *
-	 * @param string $user
-	 * @param string $userAvatar
-	 */
-	public function userGetsAvatarForUser(string $user, string $userAvatar) {
-		$this->userGetsAvatarForUserWithSize($user, $userAvatar, '128');
-	}
-
-	/**
-	 * @When user :user gets avatar for user :userAvatar with size :size
-	 *
-	 * @param string $user
-	 * @param string $userAvatar
-	 * @param string $size
-	 */
-	public function userGetsAvatarForUserWithSize(string $user, string $userAvatar, string $size) {
-		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/' . $userAvatar . '/' . $size);
-		$this->theHTTPStatusCodeShouldBe('200');
-
-		$this->getLastAvatar();
-	}
-
-	/**
-	 * @When user :user gets avatar for guest :guestAvatar
-	 *
-	 * @param string $user
-	 * @param string $guestAvatar
-	 */
-	public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
-		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
-		$this->theHTTPStatusCodeShouldBe('201');
-
-		$this->getLastAvatar();
-	}
-
-	/**
-	 * @When logged in user gets temporary avatar
-	 */
-	public function loggedInUserGetsTemporaryAvatar() {
-		$this->loggedInUserGetsTemporaryAvatarWith('200');
-	}
-
-	/**
-	 * @When logged in user gets temporary avatar with :statusCode
-	 *
-	 * @param string $statusCode
-	 */
-	public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) {
-		$this->sendingAToWithRequesttoken('GET', '/index.php/avatar/tmp');
-		$this->theHTTPStatusCodeShouldBe($statusCode);
-
-		$this->getLastAvatar();
-	}
-
-	/**
-	 * @When logged in user posts temporary avatar from file :source
-	 *
-	 * @param string $source
-	 */
-	public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
-		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
-
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
-			[
-				'multipart' => [
-					[
-						'name' => 'files[]',
-						'contents' => $file
-					]
-				]
-			]);
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @When logged in user posts temporary avatar from internal path :path
-	 *
-	 * @param string $path
-	 */
-	public function loggedInUserPostsTemporaryAvatarFromInternalPath(string $path) {
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @When logged in user crops temporary avatar
-	 *
-	 * @param TableNode $crop
-	 */
-	public function loggedInUserCropsTemporaryAvatar(TableNode $crop) {
-		$this->loggedInUserCropsTemporaryAvatarWith('200', $crop);
-	}
-
-	/**
-	 * @When logged in user crops temporary avatar with :statusCode
-	 *
-	 * @param string $statusCode
-	 * @param TableNode $crop
-	 */
-	public function loggedInUserCropsTemporaryAvatarWith(string $statusCode, TableNode $crop) {
-		$parameters = [];
-		foreach ($crop->getRowsHash() as $key => $value) {
-			$parameters[] = 'crop[' . $key . ']=' . $value;
-		}
-
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?' . implode('&', $parameters));
-		$this->theHTTPStatusCodeShouldBe($statusCode);
-	}
-
-	/**
-	 * @When logged in user deletes the user avatar
-	 */
-	public function loggedInUserDeletesTheUserAvatar() {
-		$this->sendingAToWithRequesttoken('DELETE', '/index.php/avatar');
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @Then last avatar is a square of size :size
-	 *
-	 * @param string size
-	 */
-	public function lastAvatarIsASquareOfSize(string $size) {
-		[$width, $height] = getimagesizefromstring($this->lastAvatar);
-
-		Assert::assertEquals($width, $height, 'Expected avatar to be a square');
-		Assert::assertEquals($size, $width);
-	}
-
-	/**
-	 * @Then last avatar is not a square
-	 */
-	public function lastAvatarIsNotASquare() {
-		[$width, $height] = getimagesizefromstring($this->lastAvatar);
-
-		Assert::assertNotEquals($width, $height, 'Expected avatar to not be a square');
-	}
-
-	/**
-	 * @Then last avatar is not a single color
-	 */
-	public function lastAvatarIsNotASingleColor() {
-		Assert::assertEquals(null, $this->getColorFromLastAvatar());
-	}
-
-	/**
-	 * @Then last avatar is a single :color color
-	 *
-	 * @param string $color
-	 * @param string $size
-	 */
-	public function lastAvatarIsASingleColor(string $color) {
-		$expectedColor = $this->hexStringToRgbColor($color);
-		$colorFromLastAvatar = $this->getColorFromLastAvatar();
-
-		Assert::assertTrue($this->isSameColor($expectedColor, $colorFromLastAvatar),
-			$this->rgbColorToHexString($colorFromLastAvatar) . ' does not match expected ' . $color);
-	}
-
-	private function hexStringToRgbColor($hexString) {
-		// Strip initial "#"
-		$hexString = substr($hexString, 1);
-
-		$rgbColorInt = hexdec($hexString);
-
-		// RGBA hex strings are not supported; the given string is assumed to be
-		// an RGB hex string.
-		return [
-			'red' => ($rgbColorInt >> 16) & 0xFF,
-			'green' => ($rgbColorInt >> 8) & 0xFF,
-			'blue' => $rgbColorInt & 0xFF,
-			'alpha' => 0
-		];
-	}
-
-	private function rgbColorToHexString($rgbColor) {
-		$rgbColorInt = ($rgbColor['red'] << 16) + ($rgbColor['green'] << 8) + ($rgbColor['blue']);
-
-		return '#' . str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
-	}
-
-	private function getColorFromLastAvatar() {
-		$image = imagecreatefromstring($this->lastAvatar);
-
-		$firstPixelColorIndex = imagecolorat($image, 0, 0);
-		$firstPixelColor = imagecolorsforindex($image, $firstPixelColorIndex);
-
-		for ($i = 0; $i < imagesx($image); $i++) {
-			for ($j = 0; $j < imagesx($image); $j++) {
-				$currentPixelColorIndex = imagecolorat($image, $i, $j);
-				$currentPixelColor = imagecolorsforindex($image, $currentPixelColorIndex);
-
-				// The colors are compared with a small allowed delta, as even
-				// on solid color images the resizing can cause some small
-				// artifacts that slightly modify the color of certain pixels.
-				if (!$this->isSameColor($firstPixelColor, $currentPixelColor)) {
-					imagedestroy($image);
-
-					return null;
-				}
-			}
-		}
-
-		imagedestroy($image);
-
-		return $firstPixelColor;
-	}
-
-	private function isSameColor(array $firstColor, array $secondColor, int $allowedDelta = 1) {
-		if ($this->isSameColorComponent($firstColor['red'], $secondColor['red'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['green'], $secondColor['green'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['blue'], $secondColor['blue'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['alpha'], $secondColor['alpha'], $allowedDelta)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private function isSameColorComponent(int $firstColorComponent, int $secondColorComponent, int $allowedDelta) {
-		if ($firstColorComponent >= ($secondColorComponent - $allowedDelta)
-			&& $firstColorComponent <= ($secondColorComponent + $allowedDelta)) {
-			return true;
-		}
-
-		return false;
-	}
+    /** @var string * */
+    private $lastAvatar;
+
+    /** @AfterScenario **/
+    public function cleanupLastAvatar() {
+        $this->lastAvatar = null;
+    }
+
+    private function getLastAvatar() {
+        $this->lastAvatar = '';
+
+        $body = $this->response->getBody();
+        while (!$body->eof()) {
+            $this->lastAvatar .= $body->read(8192);
+        }
+        $body->close();
+    }
+
+    /**
+     * @When user :user gets avatar for user :userAvatar
+     *
+     * @param string $user
+     * @param string $userAvatar
+     */
+    public function userGetsAvatarForUser(string $user, string $userAvatar) {
+        $this->userGetsAvatarForUserWithSize($user, $userAvatar, '128');
+    }
+
+    /**
+     * @When user :user gets avatar for user :userAvatar with size :size
+     *
+     * @param string $user
+     * @param string $userAvatar
+     * @param string $size
+     */
+    public function userGetsAvatarForUserWithSize(string $user, string $userAvatar, string $size) {
+        $this->asAn($user);
+        $this->sendingToDirectUrl('GET', '/index.php/avatar/' . $userAvatar . '/' . $size);
+        $this->theHTTPStatusCodeShouldBe('200');
+
+        $this->getLastAvatar();
+    }
+
+    /**
+     * @When user :user gets avatar for guest :guestAvatar
+     *
+     * @param string $user
+     * @param string $guestAvatar
+     */
+    public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
+        $this->asAn($user);
+        $this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
+        $this->theHTTPStatusCodeShouldBe('201');
+
+        $this->getLastAvatar();
+    }
+
+    /**
+     * @When logged in user gets temporary avatar
+     */
+    public function loggedInUserGetsTemporaryAvatar() {
+        $this->loggedInUserGetsTemporaryAvatarWith('200');
+    }
+
+    /**
+     * @When logged in user gets temporary avatar with :statusCode
+     *
+     * @param string $statusCode
+     */
+    public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) {
+        $this->sendingAToWithRequesttoken('GET', '/index.php/avatar/tmp');
+        $this->theHTTPStatusCodeShouldBe($statusCode);
+
+        $this->getLastAvatar();
+    }
+
+    /**
+     * @When logged in user posts temporary avatar from file :source
+     *
+     * @param string $source
+     */
+    public function loggedInUserPostsTemporaryAvatarFromFile(string $source) {
+        $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
+
+        $this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
+            [
+                'multipart' => [
+                    [
+                        'name' => 'files[]',
+                        'contents' => $file
+                    ]
+                ]
+            ]);
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @When logged in user posts temporary avatar from internal path :path
+     *
+     * @param string $path
+     */
+    public function loggedInUserPostsTemporaryAvatarFromInternalPath(string $path) {
+        $this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @When logged in user crops temporary avatar
+     *
+     * @param TableNode $crop
+     */
+    public function loggedInUserCropsTemporaryAvatar(TableNode $crop) {
+        $this->loggedInUserCropsTemporaryAvatarWith('200', $crop);
+    }
+
+    /**
+     * @When logged in user crops temporary avatar with :statusCode
+     *
+     * @param string $statusCode
+     * @param TableNode $crop
+     */
+    public function loggedInUserCropsTemporaryAvatarWith(string $statusCode, TableNode $crop) {
+        $parameters = [];
+        foreach ($crop->getRowsHash() as $key => $value) {
+            $parameters[] = 'crop[' . $key . ']=' . $value;
+        }
+
+        $this->sendingAToWithRequesttoken('POST', '/index.php/avatar/cropped?' . implode('&', $parameters));
+        $this->theHTTPStatusCodeShouldBe($statusCode);
+    }
+
+    /**
+     * @When logged in user deletes the user avatar
+     */
+    public function loggedInUserDeletesTheUserAvatar() {
+        $this->sendingAToWithRequesttoken('DELETE', '/index.php/avatar');
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @Then last avatar is a square of size :size
+     *
+     * @param string size
+     */
+    public function lastAvatarIsASquareOfSize(string $size) {
+        [$width, $height] = getimagesizefromstring($this->lastAvatar);
+
+        Assert::assertEquals($width, $height, 'Expected avatar to be a square');
+        Assert::assertEquals($size, $width);
+    }
+
+    /**
+     * @Then last avatar is not a square
+     */
+    public function lastAvatarIsNotASquare() {
+        [$width, $height] = getimagesizefromstring($this->lastAvatar);
+
+        Assert::assertNotEquals($width, $height, 'Expected avatar to not be a square');
+    }
+
+    /**
+     * @Then last avatar is not a single color
+     */
+    public function lastAvatarIsNotASingleColor() {
+        Assert::assertEquals(null, $this->getColorFromLastAvatar());
+    }
+
+    /**
+     * @Then last avatar is a single :color color
+     *
+     * @param string $color
+     * @param string $size
+     */
+    public function lastAvatarIsASingleColor(string $color) {
+        $expectedColor = $this->hexStringToRgbColor($color);
+        $colorFromLastAvatar = $this->getColorFromLastAvatar();
+
+        Assert::assertTrue($this->isSameColor($expectedColor, $colorFromLastAvatar),
+            $this->rgbColorToHexString($colorFromLastAvatar) . ' does not match expected ' . $color);
+    }
+
+    private function hexStringToRgbColor($hexString) {
+        // Strip initial "#"
+        $hexString = substr($hexString, 1);
+
+        $rgbColorInt = hexdec($hexString);
+
+        // RGBA hex strings are not supported; the given string is assumed to be
+        // an RGB hex string.
+        return [
+            'red' => ($rgbColorInt >> 16) & 0xFF,
+            'green' => ($rgbColorInt >> 8) & 0xFF,
+            'blue' => $rgbColorInt & 0xFF,
+            'alpha' => 0
+        ];
+    }
+
+    private function rgbColorToHexString($rgbColor) {
+        $rgbColorInt = ($rgbColor['red'] << 16) + ($rgbColor['green'] << 8) + ($rgbColor['blue']);
+
+        return '#' . str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
+    }
+
+    private function getColorFromLastAvatar() {
+        $image = imagecreatefromstring($this->lastAvatar);
+
+        $firstPixelColorIndex = imagecolorat($image, 0, 0);
+        $firstPixelColor = imagecolorsforindex($image, $firstPixelColorIndex);
+
+        for ($i = 0; $i < imagesx($image); $i++) {
+            for ($j = 0; $j < imagesx($image); $j++) {
+                $currentPixelColorIndex = imagecolorat($image, $i, $j);
+                $currentPixelColor = imagecolorsforindex($image, $currentPixelColorIndex);
+
+                // The colors are compared with a small allowed delta, as even
+                // on solid color images the resizing can cause some small
+                // artifacts that slightly modify the color of certain pixels.
+                if (!$this->isSameColor($firstPixelColor, $currentPixelColor)) {
+                    imagedestroy($image);
+
+                    return null;
+                }
+            }
+        }
+
+        imagedestroy($image);
+
+        return $firstPixelColor;
+    }
+
+    private function isSameColor(array $firstColor, array $secondColor, int $allowedDelta = 1) {
+        if ($this->isSameColorComponent($firstColor['red'], $secondColor['red'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['green'], $secondColor['green'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['blue'], $secondColor['blue'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['alpha'], $secondColor['alpha'], $allowedDelta)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function isSameColorComponent(int $firstColorComponent, int $secondColorComponent, int $allowedDelta) {
+        if ($firstColorComponent >= ($secondColorComponent - $allowedDelta)
+            && $firstColorComponent <= ($secondColorComponent + $allowedDelta)) {
+            return true;
+        }
+
+        return false;
+    }
 }

apps/dav/appinfo/v1/webdav.php

Indentation +23 added lines, -23 removed lines

@@ -26,7 +26,7 @@ 
 
 // no php execution timeout for webdav
 if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -36,41 +36,41 @@ 
 $dispatcher = 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),
-	$dispatcher,
-	\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),
+    $dispatcher,
+    \OC::$server->getL10N('dav')
 );
 
 // Backends
 $authBackend = new Auth(
-	Server::get(ISession::class),
-	Server::get(IUserSession::class),
-	Server::get(IRequest::class),
-	Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-	Server::get(IThrottler::class),
-	'principals/'
+    Server::get(ISession::class),
+    Server::get(IUserSession::class),
+    Server::get(IRequest::class),
+    Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+    Server::get(IThrottler::class),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new BearerAuth(
-	Server::get(IUserSession::class),
-	Server::get(ISession::class),
-	Server::get(IRequest::class),
-	Server::get(IConfig::class),
+    Server::get(IUserSession::class),
+    Server::get(ISession::class),
+    Server::get(IRequest::class),
+    Server::get(IConfig::class),
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = Server::get(IRequest::class)->getRequestUri();
 
 $server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function () {
-	// use the view for the logged in user
-	return Filesystem::getView();
+    // use the view for the logged in user
+    return Filesystem::getView();
 });
 
 // allow setup of additional plugins

core/Controller/AvatarController.php

Spacing +8 added lines, -8 removed lines

@@ -74,12 +74,12 @@ 
 	public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
 		if ($size <= 64) {
 			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 64;
 		} else {
 			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 512;
 		}
@@ -90,7 +90,7 @@ 
 			$response = new FileDisplayResponse(
 				$avatarFile,
 				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int) $avatar->isCustomAvatar()]
 			);
 		} catch (\Exception $e) {
 			if ($guestFallback) {
@@ -126,12 +126,12 @@ 
 	public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
 		if ($size <= 64) {
 			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 64;
 		} else {
 			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 512;
 		}
@@ -142,7 +142,7 @@ 
 			$response = new FileDisplayResponse(
 				$avatarFile,
 				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int) $avatar->isCustomAvatar()]
 			);
 		} catch (\Exception $e) {
 			if ($guestFallback) {
@@ -311,7 +311,7 @@ 
 			Http::STATUS_OK,
 			['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag((string)crc32($image->data() ?? ''));
+		$resp->setETag((string) crc32($image->data() ?? ''));
 		$resp->cacheFor(0);
 		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
 		return $resp;
@@ -340,7 +340,7 @@ 
 
 		$image = new Image();
 		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+		$image->crop($crop['x'], $crop['y'], (int) round($crop['w']), (int) round($crop['h']));
 		try {
 			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);

Indentation +294 added lines, -294 removed lines

@@ -37,322 +37,322 @@
  * @package OC\Core\Controller
  */
 class AvatarController extends Controller {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected IAvatarManager $avatarManager,
-		protected ICache $cache,
-		protected IL10N $l10n,
-		protected IUserManager $userManager,
-		protected IRootFolder $rootFolder,
-		protected LoggerInterface $logger,
-		protected ?string $userId,
-		protected TimeFactory $timeFactory,
-		protected GuestAvatarController $guestAvatarController,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected IAvatarManager $avatarManager,
+        protected ICache $cache,
+        protected IL10N $l10n,
+        protected IUserManager $userManager,
+        protected IRootFolder $rootFolder,
+        protected LoggerInterface $logger,
+        protected ?string $userId,
+        protected TimeFactory $timeFactory,
+        protected GuestAvatarController $guestAvatarController,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Get the dark avatar
-	 *
-	 * @param string $userId ID of the user
-	 * @param 64|512 $size Size of the avatar
-	 * @param bool $guestFallback Fallback to guest avatar if not found
-	 * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
-	 *
-	 * 200: Avatar returned
-	 * 201: Avatar returned
-	 * 404: Avatar not found
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}/dark')]
-	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
-	public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
+    /**
+     * @NoSameSiteCookieRequired
+     *
+     * Get the dark avatar
+     *
+     * @param string $userId ID of the user
+     * @param 64|512 $size Size of the avatar
+     * @param bool $guestFallback Fallback to guest avatar if not found
+     * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+     *
+     * 200: Avatar returned
+     * 201: Avatar returned
+     * 404: Avatar not found
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}/dark')]
+    #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
+    public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
-			$avatarFile = $avatar->getFile($size, true);
-			$response = new FileDisplayResponse(
-				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
-			);
-		} catch (\Exception $e) {
-			if ($guestFallback) {
-				return $this->guestAvatarController->getAvatarDark($userId, $size);
-			}
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId);
+            $avatarFile = $avatar->getFile($size, true);
+            $response = new FileDisplayResponse(
+                $avatarFile,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+            );
+        } catch (\Exception $e) {
+            if ($guestFallback) {
+                return $this->guestAvatarController->getAvatarDark($userId, $size);
+            }
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24, false, true);
-		return $response;
-	}
+        // Cache for 1 day
+        $response->cacheFor(60 * 60 * 24, false, true);
+        return $response;
+    }
 
 
-	/**
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Get the avatar
-	 *
-	 * @param string $userId ID of the user
-	 * @param 64|512 $size Size of the avatar
-	 * @param bool $guestFallback Fallback to guest avatar if not found
-	 * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
-	 *
-	 * 200: Avatar returned
-	 * 201: Avatar returned
-	 * 404: Avatar not found
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}')]
-	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
-	public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
+    /**
+     * @NoSameSiteCookieRequired
+     *
+     * Get the avatar
+     *
+     * @param string $userId ID of the user
+     * @param 64|512 $size Size of the avatar
+     * @param bool $guestFallback Fallback to guest avatar if not found
+     * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+     *
+     * 200: Avatar returned
+     * 201: Avatar returned
+     * 404: Avatar not found
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}')]
+    #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
+    public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
-			$avatarFile = $avatar->getFile($size);
-			$response = new FileDisplayResponse(
-				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
-			);
-		} catch (\Exception $e) {
-			if ($guestFallback) {
-				return $this->guestAvatarController->getAvatar($userId, $size);
-			}
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId);
+            $avatarFile = $avatar->getFile($size);
+            $response = new FileDisplayResponse(
+                $avatarFile,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+            );
+        } catch (\Exception $e) {
+            if ($guestFallback) {
+                return $this->guestAvatarController->getAvatar($userId, $size);
+            }
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24, false, true);
-		return $response;
-	}
+        // Cache for 1 day
+        $response->cacheFor(60 * 60 * 24, false, true);
+        return $response;
+    }
 
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'POST', url: '/avatar/')]
-	public function postAvatar(?string $path = null): JSONResponse {
-		$files = $this->request->getUploadedFile('files');
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'POST', url: '/avatar/')]
+    public function postAvatar(?string $path = null): JSONResponse {
+        $files = $this->request->getUploadedFile('files');
 
-		if (isset($path)) {
-			$path = stripslashes($path);
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var File $node */
-			$node = $userFolder->get($path);
-			if (!($node instanceof File)) {
-				return new JSONResponse(['data' => ['message' => $this->l10n->t('Please select a file.')]]);
-			}
-			if ($node->getSize() > 20 * 1024 * 1024) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('File is too big')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
+        if (isset($path)) {
+            $path = stripslashes($path);
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var File $node */
+            $node = $userFolder->get($path);
+            if (!($node instanceof File)) {
+                return new JSONResponse(['data' => ['message' => $this->l10n->t('Please select a file.')]]);
+            }
+            if ($node->getSize() > 20 * 1024 * 1024) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('File is too big')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
 
-			if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('The selected file is not an image.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
+            if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('The selected file is not an image.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
 
-			try {
-				$content = $node->getContent();
-			} catch (NotPermittedException $e) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('The selected file cannot be read.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} elseif (!is_null($files)) {
-			if (
-				$files['error'][0] === 0
-				 && is_uploaded_file($files['tmp_name'][0])
-			) {
-				if ($files['size'][0] > 20 * 1024 * 1024) {
-					return new JSONResponse(
-						['data' => ['message' => $this->l10n->t('File is too big')]],
-						Http::STATUS_BAD_REQUEST
-					);
-				}
-				$this->cache->set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
-				$content = $this->cache->get('avatar_upload');
-				unlink($files['tmp_name'][0]);
-			} else {
-				$phpFileUploadErrors = [
-					UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
-					UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
-					UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-					UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
-					UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
-					UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
-					UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
-					UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
-				];
-				$message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l10n->t('Invalid file provided');
-				$this->logger->warning($message, ['app' => 'core']);
-				return new JSONResponse(
-					['data' => ['message' => $message]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} else {
-			//Add imgfile
-			return new JSONResponse(
-				['data' => ['message' => $this->l10n->t('No image or file provided')]],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+            try {
+                $content = $node->getContent();
+            } catch (NotPermittedException $e) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('The selected file cannot be read.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } elseif (!is_null($files)) {
+            if (
+                $files['error'][0] === 0
+                 && is_uploaded_file($files['tmp_name'][0])
+            ) {
+                if ($files['size'][0] > 20 * 1024 * 1024) {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l10n->t('File is too big')]],
+                        Http::STATUS_BAD_REQUEST
+                    );
+                }
+                $this->cache->set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
+                $content = $this->cache->get('avatar_upload');
+                unlink($files['tmp_name'][0]);
+            } else {
+                $phpFileUploadErrors = [
+                    UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
+                    UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+                    UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+                    UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
+                    UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
+                    UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
+                    UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
+                    UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
+                ];
+                $message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l10n->t('Invalid file provided');
+                $this->logger->warning($message, ['app' => 'core']);
+                return new JSONResponse(
+                    ['data' => ['message' => $message]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } else {
+            //Add imgfile
+            return new JSONResponse(
+                ['data' => ['message' => $this->l10n->t('No image or file provided')]],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		try {
-			$image = new Image();
-			$image->loadFromData($content);
-			$image->readExif($content);
-			$image->fixOrientation();
+        try {
+            $image = new Image();
+            $image->loadFromData($content);
+            $image->readExif($content);
+            $image->fixOrientation();
 
-			if ($image->valid()) {
-				$mimeType = $image->mimeType();
-				if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
-					return new JSONResponse(
-						['data' => ['message' => $this->l10n->t('Unknown filetype')]],
-						Http::STATUS_OK
-					);
-				}
+            if ($image->valid()) {
+                $mimeType = $image->mimeType();
+                if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l10n->t('Unknown filetype')]],
+                        Http::STATUS_OK
+                    );
+                }
 
-				if ($image->width() === $image->height()) {
-					try {
-						$avatar = $this->avatarManager->getAvatar($this->userId);
-						$avatar->set($image);
-						// Clean up
-						$this->cache->remove('tmpAvatar');
-						return new JSONResponse(['status' => 'success']);
-					} catch (\Throwable $e) {
-						$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-						return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-					}
-				}
+                if ($image->width() === $image->height()) {
+                    try {
+                        $avatar = $this->avatarManager->getAvatar($this->userId);
+                        $avatar->set($image);
+                        // Clean up
+                        $this->cache->remove('tmpAvatar');
+                        return new JSONResponse(['status' => 'success']);
+                    } catch (\Throwable $e) {
+                        $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+                        return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+                    }
+                }
 
-				$this->cache->set('tmpAvatar', $image->data(), 7200);
-				return new JSONResponse(
-					['data' => 'notsquare'],
-					Http::STATUS_OK
-				);
-			} else {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('Invalid image')]],
-					Http::STATUS_OK
-				);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
-		}
-	}
+                $this->cache->set('tmpAvatar', $image->data(), 7200);
+                return new JSONResponse(
+                    ['data' => 'notsquare'],
+                    Http::STATUS_OK
+                );
+            } else {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('Invalid image')]],
+                    Http::STATUS_OK
+                );
+            }
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
+        }
+    }
 
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'DELETE', url: '/avatar/')]
-	public function deleteAvatar(): JSONResponse {
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->remove();
-			return new JSONResponse();
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'DELETE', url: '/avatar/')]
+    public function deleteAvatar(): JSONResponse {
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->remove();
+            return new JSONResponse();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
 
-	/**
-	 * @return JSONResponse|DataDisplayResponse
-	 */
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'GET', url: '/avatar/tmp')]
-	public function getTmpAvatar() {
-		$tmpAvatar = $this->cache->get('tmpAvatar');
-		if (is_null($tmpAvatar)) {
-			return new JSONResponse(['data' => [
-				'message' => $this->l10n->t('No temporary profile picture available, try again')
-			]],
-				Http::STATUS_NOT_FOUND);
-		}
+    /**
+     * @return JSONResponse|DataDisplayResponse
+     */
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'GET', url: '/avatar/tmp')]
+    public function getTmpAvatar() {
+        $tmpAvatar = $this->cache->get('tmpAvatar');
+        if (is_null($tmpAvatar)) {
+            return new JSONResponse(['data' => [
+                'message' => $this->l10n->t('No temporary profile picture available, try again')
+            ]],
+                Http::STATUS_NOT_FOUND);
+        }
 
-		$image = new Image();
-		$image->loadFromData($tmpAvatar);
+        $image = new Image();
+        $image->loadFromData($tmpAvatar);
 
-		$resp = new DataDisplayResponse(
-			$image->data() ?? '',
-			Http::STATUS_OK,
-			['Content-Type' => $image->mimeType()]);
+        $resp = new DataDisplayResponse(
+            $image->data() ?? '',
+            Http::STATUS_OK,
+            ['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag((string)crc32($image->data() ?? ''));
-		$resp->cacheFor(0);
-		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
-		return $resp;
-	}
+        $resp->setETag((string)crc32($image->data() ?? ''));
+        $resp->cacheFor(0);
+        $resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
+        return $resp;
+    }
 
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'POST', url: '/avatar/cropped')]
-	public function postCroppedAvatar(?array $crop = null): JSONResponse {
-		if (is_null($crop)) {
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('No crop data provided')]],
-				Http::STATUS_BAD_REQUEST);
-		}
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'POST', url: '/avatar/cropped')]
+    public function postCroppedAvatar(?array $crop = null): JSONResponse {
+        if (is_null($crop)) {
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('No crop data provided')]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('No valid crop data provided')]],
-				Http::STATUS_BAD_REQUEST);
-		}
+        if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('No valid crop data provided')]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		$tmpAvatar = $this->cache->get('tmpAvatar');
-		if (is_null($tmpAvatar)) {
-			return new JSONResponse(['data' => [
-				'message' => $this->l10n->t('No temporary profile picture available, try again')
-			]],
-				Http::STATUS_BAD_REQUEST);
-		}
+        $tmpAvatar = $this->cache->get('tmpAvatar');
+        if (is_null($tmpAvatar)) {
+            return new JSONResponse(['data' => [
+                'message' => $this->l10n->t('No temporary profile picture available, try again')
+            ]],
+                Http::STATUS_BAD_REQUEST);
+        }
 
-		$image = new Image();
-		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->set($image);
-			// Clean up
-			$this->cache->remove('tmpAvatar');
-			return new JSONResponse(['status' => 'success']);
-		} catch (NotSquareException $e) {
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('Crop is not square')]],
-				Http::STATUS_BAD_REQUEST);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
+        $image = new Image();
+        $image->loadFromData($tmpAvatar);
+        $image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->set($image);
+            // Clean up
+            $this->cache->remove('tmpAvatar');
+            return new JSONResponse(['status' => 'success']);
+        } catch (NotSquareException $e) {
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('Crop is not square')]],
+                Http::STATUS_BAD_REQUEST);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/dav/appinfo/v1/carddav.php

Indentation +25 added lines, -25 removed lines

@@ -36,33 +36,33 @@ 
 use Sabre\CardDAV\Plugin;
 
 $authBackend = new Auth(
-	Server::get(ISession::class),
-	Server::get(IUserSession::class),
-	Server::get(IRequest::class),
-	Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-	Server::get(IThrottler::class),
-	'principals/'
+    Server::get(ISession::class),
+    Server::get(IUserSession::class),
+    Server::get(IRequest::class),
+    Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+    Server::get(IThrottler::class),
+    'principals/'
 );
 $principalBackend = new Principal(
-	Server::get(IUserManager::class),
-	Server::get(IGroupManager::class),
-	Server::get(IAccountManager::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(IUserSession::class),
-	Server::get(IAppManager::class),
-	Server::get(ProxyMapper::class),
-	Server::get(KnownUserService::class),
-	Server::get(IConfig::class),
-	\OC::$server->getL10NFactory(),
-	'principals/'
+    Server::get(IUserManager::class),
+    Server::get(IGroupManager::class),
+    Server::get(IAccountManager::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(IUserSession::class),
+    Server::get(IAppManager::class),
+    Server::get(ProxyMapper::class),
+    Server::get(KnownUserService::class),
+    Server::get(IConfig::class),
+    \OC::$server->getL10NFactory(),
+    'principals/'
 );
 $db = Server::get(IDBConnection::class);
 $cardDavBackend = new CardDavBackend(
-	$db,
-	$principalBackend,
-	Server::get(IUserManager::class),
-	Server::get(IEventDispatcher::class),
-	Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
+    $db,
+    $principalBackend,
+    Server::get(IUserManager::class),
+    Server::get(IEventDispatcher::class),
+    Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
 );
 
 $debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
@@ -76,8 +76,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -92,7 +92,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());

tests/lib/Cache/CappedMemoryCacheTest.php

Indentation +36 added lines, -36 removed lines

@@ -15,50 +15,50 @@
  * @package Test\Cache
  */
 class CappedMemoryCacheTest extends TestCache {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->instance = new CappedMemoryCache();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->instance = new CappedMemoryCache();
+    }
 
-	public function testSetOverCap(): void {
-		$instance = new CappedMemoryCache(3);
+    public function testSetOverCap(): void {
+        $instance = new CappedMemoryCache(3);
 
-		$instance->set('1', 'a');
-		$instance->set('2', 'b');
-		$instance->set('3', 'c');
-		$instance->set('4', 'd');
-		$instance->set('5', 'e');
+        $instance->set('1', 'a');
+        $instance->set('2', 'b');
+        $instance->set('3', 'c');
+        $instance->set('4', 'd');
+        $instance->set('5', 'e');
 
-		$this->assertFalse($instance->hasKey('1'));
-		$this->assertFalse($instance->hasKey('2'));
-		$this->assertTrue($instance->hasKey('3'));
-		$this->assertTrue($instance->hasKey('4'));
-		$this->assertTrue($instance->hasKey('5'));
-	}
+        $this->assertFalse($instance->hasKey('1'));
+        $this->assertFalse($instance->hasKey('2'));
+        $this->assertTrue($instance->hasKey('3'));
+        $this->assertTrue($instance->hasKey('4'));
+        $this->assertTrue($instance->hasKey('5'));
+    }
 
-	public function testClear(): void {
-		$value = 'ipsum lorum';
-		$this->instance->set('1_value1', $value);
-		$this->instance->set('1_value2', $value);
-		$this->instance->set('2_value1', $value);
-		$this->instance->set('3_value1', $value);
+    public function testClear(): void {
+        $value = 'ipsum lorum';
+        $this->instance->set('1_value1', $value);
+        $this->instance->set('1_value2', $value);
+        $this->instance->set('2_value1', $value);
+        $this->instance->set('3_value1', $value);
 
-		$this->assertTrue($this->instance->clear());
-		$this->assertFalse($this->instance->hasKey('1_value1'));
-		$this->assertFalse($this->instance->hasKey('1_value2'));
-		$this->assertFalse($this->instance->hasKey('2_value1'));
-		$this->assertFalse($this->instance->hasKey('3_value1'));
-	}
+        $this->assertTrue($this->instance->clear());
+        $this->assertFalse($this->instance->hasKey('1_value1'));
+        $this->assertFalse($this->instance->hasKey('1_value2'));
+        $this->assertFalse($this->instance->hasKey('2_value1'));
+        $this->assertFalse($this->instance->hasKey('3_value1'));
+    }
 
-	public function testIndirectSet(): void {
-		$this->instance->set('array', []);
+    public function testIndirectSet(): void {
+        $this->instance->set('array', []);
 
-		$this->instance['array'][] = 'foo';
+        $this->instance['array'][] = 'foo';
 
-		$this->assertEquals(['foo'], $this->instance->get('array'));
+        $this->assertEquals(['foo'], $this->instance->get('array'));
 
-		$this->instance['array']['bar'] = 'qwerty';
+        $this->instance['array']['bar'] = 'qwerty';
 
-		$this->assertEquals(['foo', 'bar' => 'qwerty'], $this->instance->get('array'));
-	}
+        $this->assertEquals(['foo', 'bar' => 'qwerty'], $this->instance->get('array'));
+    }
 }