nextcloud / server

lib/private/Security/CSRF/CsrfToken.php

Indentation +38 added lines, -38 removed lines

@@ -36,46 +36,46 @@
  * @package OC\Security\CSRF
  */
 class CsrfToken {
-	/** @var string */
-	private $value;
-	/** @var string */
-	private $encryptedValue = '';
+    /** @var string */
+    private $value;
+    /** @var string */
+    private $encryptedValue = '';
 
-	/**
-	 * @param string $value Value of the token. Can be encrypted or not encrypted.
-	 */
-	public function __construct(string $value) {
-		$this->value = $value;
-	}
+    /**
+     * @param string $value Value of the token. Can be encrypted or not encrypted.
+     */
+    public function __construct(string $value) {
+        $this->value = $value;
+    }
 
-	/**
-	 * Encrypted value of the token. This is used to mitigate BREACH alike
-	 * vulnerabilities. For display measures do use this functionality.
-	 *
-	 * @return string
-	 */
-	public function getEncryptedValue(): string {
-		if ($this->encryptedValue === '') {
-			$sharedSecret = random_bytes(\strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
-		}
+    /**
+     * Encrypted value of the token. This is used to mitigate BREACH alike
+     * vulnerabilities. For display measures do use this functionality.
+     *
+     * @return string
+     */
+    public function getEncryptedValue(): string {
+        if ($this->encryptedValue === '') {
+            $sharedSecret = random_bytes(\strlen($this->value));
+            $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+        }
 
-		return $this->encryptedValue;
-	}
+        return $this->encryptedValue;
+    }
 
-	/**
-	 * The unencrypted value of the token. Used for decrypting an already
-	 * encrypted token.
-	 *
-	 * @return string
-	 */
-	public function getDecryptedValue(): string {
-		$token = explode(':', $this->value);
-		if (\count($token) !== 2) {
-			return '';
-		}
-		$obfuscatedToken = $token[0];
-		$secret = $token[1];
-		return base64_decode($obfuscatedToken) ^ base64_decode($secret);
-	}
+    /**
+     * The unencrypted value of the token. Used for decrypting an already
+     * encrypted token.
+     *
+     * @return string
+     */
+    public function getDecryptedValue(): string {
+        $token = explode(':', $this->value);
+        if (\count($token) !== 2) {
+            return '';
+        }
+        $obfuscatedToken = $token[0];
+        $secret = $token[1];
+        return base64_decode($obfuscatedToken) ^ base64_decode($secret);
+    }
 }

lib/private/Security/CSRF/TokenStorage/SessionStorage.php

Indentation +49 added lines, -49 removed lines

@@ -35,59 +35,59 @@
  * @package OC\Security\CSRF\TokenStorage
  */
 class SessionStorage {
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/**
-	 * @param ISession $session
-	 */
-	public function __construct(ISession $session) {
-		$this->session = $session;
-	}
+    /**
+     * @param ISession $session
+     */
+    public function __construct(ISession $session) {
+        $this->session = $session;
+    }
 
-	/**
-	 * @param ISession $session
-	 */
-	public function setSession(ISession $session) {
-		$this->session = $session;
-	}
+    /**
+     * @param ISession $session
+     */
+    public function setSession(ISession $session) {
+        $this->session = $session;
+    }
 
-	/**
-	 * Returns the current token or throws an exception if none is found.
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getToken(): string {
-		$token = $this->session->get('requesttoken');
-		if (empty($token)) {
-			throw new \Exception('Session does not contain a requesttoken');
-		}
+    /**
+     * Returns the current token or throws an exception if none is found.
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getToken(): string {
+        $token = $this->session->get('requesttoken');
+        if (empty($token)) {
+            throw new \Exception('Session does not contain a requesttoken');
+        }
 
-		return $token;
-	}
+        return $token;
+    }
 
-	/**
-	 * Set the valid current token to $value.
-	 *
-	 * @param string $value
-	 */
-	public function setToken(string $value) {
-		$this->session->set('requesttoken', $value);
-	}
+    /**
+     * Set the valid current token to $value.
+     *
+     * @param string $value
+     */
+    public function setToken(string $value) {
+        $this->session->set('requesttoken', $value);
+    }
 
-	/**
-	 * Removes the current token.
-	 */
-	public function removeToken() {
-		$this->session->remove('requesttoken');
-	}
-	/**
-	 * Whether the storage has a storage.
-	 *
-	 * @return bool
-	 */
-	public function hasToken(): bool {
-		return $this->session->exists('requesttoken');
-	}
+    /**
+     * Removes the current token.
+     */
+    public function removeToken() {
+        $this->session->remove('requesttoken');
+    }
+    /**
+     * Whether the storage has a storage.
+     *
+     * @return bool
+     */
+    public function hasToken(): bool {
+        return $this->session->exists('requesttoken');
+    }
 }

lib/private/Security/CSRF/CsrfTokenManager.php

Indentation +66 added lines, -66 removed lines

@@ -34,78 +34,78 @@
  * @package OC\Security\CSRF
  */
 class CsrfTokenManager {
-	/** @var CsrfTokenGenerator */
-	private $tokenGenerator;
-	/** @var SessionStorage */
-	private $sessionStorage;
-	/** @var CsrfToken|null */
-	private $csrfToken = null;
+    /** @var CsrfTokenGenerator */
+    private $tokenGenerator;
+    /** @var SessionStorage */
+    private $sessionStorage;
+    /** @var CsrfToken|null */
+    private $csrfToken = null;
 
-	/**
-	 * @param CsrfTokenGenerator $tokenGenerator
-	 * @param SessionStorage $storageInterface
-	 */
-	public function __construct(CsrfTokenGenerator $tokenGenerator,
-								SessionStorage $storageInterface) {
-		$this->tokenGenerator = $tokenGenerator;
-		$this->sessionStorage = $storageInterface;
-	}
+    /**
+     * @param CsrfTokenGenerator $tokenGenerator
+     * @param SessionStorage $storageInterface
+     */
+    public function __construct(CsrfTokenGenerator $tokenGenerator,
+                                SessionStorage $storageInterface) {
+        $this->tokenGenerator = $tokenGenerator;
+        $this->sessionStorage = $storageInterface;
+    }
 
-	/**
-	 * Returns the current CSRF token, if none set it will create a new one.
-	 *
-	 * @return CsrfToken
-	 */
-	public function getToken(): CsrfToken {
-		if (!\is_null($this->csrfToken)) {
-			return $this->csrfToken;
-		}
+    /**
+     * Returns the current CSRF token, if none set it will create a new one.
+     *
+     * @return CsrfToken
+     */
+    public function getToken(): CsrfToken {
+        if (!\is_null($this->csrfToken)) {
+            return $this->csrfToken;
+        }
 
-		if ($this->sessionStorage->hasToken()) {
-			$value = $this->sessionStorage->getToken();
-		} else {
-			$value = $this->tokenGenerator->generateToken();
-			$this->sessionStorage->setToken($value);
-		}
+        if ($this->sessionStorage->hasToken()) {
+            $value = $this->sessionStorage->getToken();
+        } else {
+            $value = $this->tokenGenerator->generateToken();
+            $this->sessionStorage->setToken($value);
+        }
 
-		$this->csrfToken = new CsrfToken($value);
-		return $this->csrfToken;
-	}
+        $this->csrfToken = new CsrfToken($value);
+        return $this->csrfToken;
+    }
 
-	/**
-	 * Invalidates any current token and sets a new one.
-	 *
-	 * @return CsrfToken
-	 */
-	public function refreshToken(): CsrfToken {
-		$value = $this->tokenGenerator->generateToken();
-		$this->sessionStorage->setToken($value);
-		$this->csrfToken = new CsrfToken($value);
-		return $this->csrfToken;
-	}
+    /**
+     * Invalidates any current token and sets a new one.
+     *
+     * @return CsrfToken
+     */
+    public function refreshToken(): CsrfToken {
+        $value = $this->tokenGenerator->generateToken();
+        $this->sessionStorage->setToken($value);
+        $this->csrfToken = new CsrfToken($value);
+        return $this->csrfToken;
+    }
 
-	/**
-	 * Remove the current token from the storage.
-	 */
-	public function removeToken() {
-		$this->csrfToken = null;
-		$this->sessionStorage->removeToken();
-	}
+    /**
+     * Remove the current token from the storage.
+     */
+    public function removeToken() {
+        $this->csrfToken = null;
+        $this->sessionStorage->removeToken();
+    }
 
-	/**
-	 * Verifies whether the provided token is valid.
-	 *
-	 * @param CsrfToken $token
-	 * @return bool
-	 */
-	public function isTokenValid(CsrfToken $token): bool {
-		if (!$this->sessionStorage->hasToken()) {
-			return false;
-		}
+    /**
+     * Verifies whether the provided token is valid.
+     *
+     * @param CsrfToken $token
+     * @return bool
+     */
+    public function isTokenValid(CsrfToken $token): bool {
+        if (!$this->sessionStorage->hasToken()) {
+            return false;
+        }
 
-		return hash_equals(
-			$this->sessionStorage->getToken(),
-			$token->getDecryptedValue()
-		);
-	}
+        return hash_equals(
+            $this->sessionStorage->getToken(),
+            $token->getDecryptedValue()
+        );
+    }
 }

lib/private/Command/QueueBus.php

Indentation +40 added lines, -40 removed lines

@@ -27,48 +27,48 @@
 use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
-	/**
-	 * @var ICommand[]|callable[]
-	 */
-	private $queue = [];
+    /**
+     * @var ICommand[]|callable[]
+     */
+    private $queue = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		$this->queue[] = $command;
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        $this->queue[] = $command;
+    }
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			// ensure the command can be serialized
-			$serialized = serialize($command);
-			if (strlen($serialized) > 4000) {
-				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
-			}
-			$unserialized = unserialize($serialized);
-			$unserialized->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            // ensure the command can be serialized
+            $serialized = serialize($command);
+            if (strlen($serialized) > 4000) {
+                throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
+            }
+            $unserialized = unserialize($serialized);
+            $unserialized->handle();
+        } else {
+            $command();
+        }
+    }
 
-	public function run() {
-		while ($command = array_shift($this->queue)) {
-			$this->runCommand($command);
-		}
-	}
+    public function run() {
+        while ($command = array_shift($this->queue)) {
+            $this->runCommand($command);
+        }
+    }
 }

lib/private/Collaboration/Resources/Collection.php

Indentation +190 added lines, -190 removed lines

@@ -38,194 +38,194 @@
 
 class Collection implements ICollection {
 
-	/** @var IManager|Manager */
-	protected $manager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var int */
-	protected $id;
-
-	/** @var string */
-	protected $name;
-
-	/** @var IUser|null */
-	protected $userForAccess;
-
-	/** @var bool|null */
-	protected $access;
-
-	/** @var IResource[] */
-	protected $resources;
-
-	public function __construct(
-		IManager $manager,
-		IDBConnection $connection,
-		int $id,
-		string $name,
-		?IUser $userForAccess = null,
-		?bool $access = null
-	) {
-		$this->manager = $manager;
-		$this->connection = $connection;
-		$this->id = $id;
-		$this->name = $name;
-		$this->userForAccess = $userForAccess;
-		$this->access = $access;
-		$this->resources = [];
-	}
-
-	/**
-	 * @return int
-	 * @since 16.0.0
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @param string $name
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(Manager::TABLE_COLLECTIONS)
-			->set('name', $query->createNamedParameter($name))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->name = $name;
-	}
-
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array {
-		if (empty($this->resources)) {
-			$this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
-		}
-
-		return $this->resources;
-	}
-
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @param IResource $resource
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
-			if ($this->isSameResource($r, $resource)) {
-				throw new ResourceException('Already part of the collection');
-			}
-		}, $this->getResources());
-
-		$this->resources[] = $resource;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(Manager::TABLE_RESOURCES)
-			->values([
-				'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-			]);
-
-		try {
-			$query->execute();
-		} catch (ConstraintViolationException $e) {
-			throw new ResourceException('Already part of the collection');
-		}
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-	}
-
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @param IResource $resource
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
-			return !$this->isSameResource($r, $resource);
-		});
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_RESOURCES)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->execute();
-
-		if (empty($this->resources)) {
-			$this->removeCollection();
-		} else {
-			$this->manager->invalidateAccessCacheForCollection($this);
-		}
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function isSameResource(IResource $resource1, IResource $resource2): bool {
-		return $resource1->getType() === $resource2->getType() &&
-			$resource1->getId() === $resource2->getId();
-	}
-
-	protected function removeCollection(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-		$this->id = 0;
-	}
+    /** @var IManager|Manager */
+    protected $manager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var int */
+    protected $id;
+
+    /** @var string */
+    protected $name;
+
+    /** @var IUser|null */
+    protected $userForAccess;
+
+    /** @var bool|null */
+    protected $access;
+
+    /** @var IResource[] */
+    protected $resources;
+
+    public function __construct(
+        IManager $manager,
+        IDBConnection $connection,
+        int $id,
+        string $name,
+        ?IUser $userForAccess = null,
+        ?bool $access = null
+    ) {
+        $this->manager = $manager;
+        $this->connection = $connection;
+        $this->id = $id;
+        $this->name = $name;
+        $this->userForAccess = $userForAccess;
+        $this->access = $access;
+        $this->resources = [];
+    }
+
+    /**
+     * @return int
+     * @since 16.0.0
+     */
+    public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     * @since 16.0.0
+     */
+    public function setName(string $name): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(Manager::TABLE_COLLECTIONS)
+            ->set('name', $query->createNamedParameter($name))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->name = $name;
+    }
+
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array {
+        if (empty($this->resources)) {
+            $this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
+        }
+
+        return $this->resources;
+    }
+
+    /**
+     * Adds a resource to a collection
+     *
+     * @param IResource $resource
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void {
+        array_map(function (IResource $r) use ($resource) {
+            if ($this->isSameResource($r, $resource)) {
+                throw new ResourceException('Already part of the collection');
+            }
+        }, $this->getResources());
+
+        $this->resources[] = $resource;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(Manager::TABLE_RESOURCES)
+            ->values([
+                'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (ConstraintViolationException $e) {
+            throw new ResourceException('Already part of the collection');
+        }
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+    }
+
+    /**
+     * Removes a resource from a collection
+     *
+     * @param IResource $resource
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void {
+        $this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+            return !$this->isSameResource($r, $resource);
+        });
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_RESOURCES)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
+        $query->execute();
+
+        if (empty($this->resources)) {
+            $this->removeCollection();
+        } else {
+            $this->manager->invalidateAccessCacheForCollection($this);
+        }
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function isSameResource(IResource $resource1, IResource $resource2): bool {
+        return $resource1->getType() === $resource2->getType() &&
+            $resource1->getId() === $resource2->getId();
+    }
+
+    protected function removeCollection(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+        $this->id = 0;
+    }
 }

lib/private/OCS/Provider.php

Indentation +81 added lines, -81 removed lines

@@ -25,92 +25,92 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if ($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if ($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if ($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

lib/private/Authentication/Login/LoginResult.php

Indentation +41 added lines, -41 removed lines

@@ -27,56 +27,56 @@
 
 class LoginResult {
 
-	/** @var bool */
-	private $success;
+    /** @var bool */
+    private $success;
 
-	/** @var LoginData */
-	private $loginData;
+    /** @var LoginData */
+    private $loginData;
 
-	/** @var string|null */
-	private $redirectUrl;
+    /** @var string|null */
+    private $redirectUrl;
 
-	/** @var string|null */
-	private $errorMessage;
+    /** @var string|null */
+    private $errorMessage;
 
-	private function __construct(bool $success, LoginData $loginData) {
-		$this->success = $success;
-		$this->loginData = $loginData;
-	}
+    private function __construct(bool $success, LoginData $loginData) {
+        $this->success = $success;
+        $this->loginData = $loginData;
+    }
 
-	private function setRedirectUrl(string $url) {
-		$this->redirectUrl = $url;
-	}
+    private function setRedirectUrl(string $url) {
+        $this->redirectUrl = $url;
+    }
 
-	private function setErrorMessage(string $msg) {
-		$this->errorMessage = $msg;
-	}
+    private function setErrorMessage(string $msg) {
+        $this->errorMessage = $msg;
+    }
 
-	public static function success(LoginData $data, ?string $redirectUrl = null) {
-		$result = new static(true, $data);
-		if ($redirectUrl !== null) {
-			$result->setRedirectUrl($redirectUrl);
-		}
-		return $result;
-	}
+    public static function success(LoginData $data, ?string $redirectUrl = null) {
+        $result = new static(true, $data);
+        if ($redirectUrl !== null) {
+            $result->setRedirectUrl($redirectUrl);
+        }
+        return $result;
+    }
 
-	public static function failure(LoginData $data, string $msg = null): LoginResult {
-		$result = new static(false, $data);
-		if ($msg !== null) {
-			$result->setErrorMessage($msg);
-		}
-		return $result;
-	}
+    public static function failure(LoginData $data, string $msg = null): LoginResult {
+        $result = new static(false, $data);
+        if ($msg !== null) {
+            $result->setErrorMessage($msg);
+        }
+        return $result;
+    }
 
-	public function isSuccess(): bool {
-		return $this->success;
-	}
+    public function isSuccess(): bool {
+        return $this->success;
+    }
 
-	public function getRedirectUrl(): ?string {
-		return $this->redirectUrl;
-	}
+    public function getRedirectUrl(): ?string {
+        return $this->redirectUrl;
+    }
 
-	public function getErrorMessage(): ?string {
-		return $this->errorMessage;
-	}
+    public function getErrorMessage(): ?string {
+        return $this->errorMessage;
+    }
 }

lib/private/Authentication/TwoFactorAuth/ProviderManager.php

Indentation +49 added lines, -49 removed lines

@@ -35,62 +35,62 @@
 
 class ProviderManager {
 
-	/** @var ProviderLoader */
-	private $providerLoader;
+    /** @var ProviderLoader */
+    private $providerLoader;
 
-	/** @var IRegistry */
-	private $providerRegistry;
+    /** @var IRegistry */
+    private $providerRegistry;
 
-	public function __construct(ProviderLoader $providerLoader, IRegistry $providerRegistry) {
-		$this->providerLoader = $providerLoader;
-		$this->providerRegistry = $providerRegistry;
-	}
+    public function __construct(ProviderLoader $providerLoader, IRegistry $providerRegistry) {
+        $this->providerLoader = $providerLoader;
+        $this->providerRegistry = $providerRegistry;
+    }
 
-	private function getProvider(string $providerId, IUser $user): IProvider {
-		$providers = $this->providerLoader->getProviders($user);
+    private function getProvider(string $providerId, IUser $user): IProvider {
+        $providers = $this->providerLoader->getProviders($user);
 
-		if (!isset($providers[$providerId])) {
-			throw new InvalidProviderException($providerId);
-		}
+        if (!isset($providers[$providerId])) {
+            throw new InvalidProviderException($providerId);
+        }
 
-		return $providers[$providerId];
-	}
+        return $providers[$providerId];
+    }
 
-	/**
-	 * Try to enable the provider with the given id for the given user
-	 *
-	 * @param IUser $user
-	 *
-	 * @return bool whether the provider supports this operation
-	 */
-	public function tryEnableProviderFor(string $providerId, IUser $user): bool {
-		$provider = $this->getProvider($providerId, $user);
+    /**
+     * Try to enable the provider with the given id for the given user
+     *
+     * @param IUser $user
+     *
+     * @return bool whether the provider supports this operation
+     */
+    public function tryEnableProviderFor(string $providerId, IUser $user): bool {
+        $provider = $this->getProvider($providerId, $user);
 
-		if ($provider instanceof IActivatableByAdmin) {
-			$provider->enableFor($user);
-			$this->providerRegistry->enableProviderFor($provider, $user);
-			return true;
-		} else {
-			return false;
-		}
-	}
+        if ($provider instanceof IActivatableByAdmin) {
+            $provider->enableFor($user);
+            $this->providerRegistry->enableProviderFor($provider, $user);
+            return true;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * Try to disable the provider with the given id for the given user
-	 *
-	 * @param IUser $user
-	 *
-	 * @return bool whether the provider supports this operation
-	 */
-	public function tryDisableProviderFor(string $providerId, IUser $user): bool {
-		$provider = $this->getProvider($providerId, $user);
+    /**
+     * Try to disable the provider with the given id for the given user
+     *
+     * @param IUser $user
+     *
+     * @return bool whether the provider supports this operation
+     */
+    public function tryDisableProviderFor(string $providerId, IUser $user): bool {
+        $provider = $this->getProvider($providerId, $user);
 
-		if ($provider instanceof IDeactivatableByAdmin) {
-			$provider->disableFor($user);
-			$this->providerRegistry->disableProviderFor($provider, $user);
-			return true;
-		} else {
-			return false;
-		}
-	}
+        if ($provider instanceof IDeactivatableByAdmin) {
+            $provider->disableFor($user);
+            $this->providerRegistry->disableProviderFor($provider, $user);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php

Indentation +67 added lines, -67 removed lines

@@ -32,82 +32,82 @@
 
 class MandatoryTwoFactor {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IGroupManager */
-	private $groupManager;
+    /** @var IGroupManager */
+    private $groupManager;
 
-	public function __construct(IConfig $config, IGroupManager $groupManager) {
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(IConfig $config, IGroupManager $groupManager) {
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * Get the state of enforced two-factor auth
-	 */
-	public function getState(): EnforcementState {
-		return new EnforcementState(
-			$this->config->getSystemValue('twofactor_enforced', 'false') === 'true',
-			$this->config->getSystemValue('twofactor_enforced_groups', []),
-			$this->config->getSystemValue('twofactor_enforced_excluded_groups', [])
-		);
-	}
+    /**
+     * Get the state of enforced two-factor auth
+     */
+    public function getState(): EnforcementState {
+        return new EnforcementState(
+            $this->config->getSystemValue('twofactor_enforced', 'false') === 'true',
+            $this->config->getSystemValue('twofactor_enforced_groups', []),
+            $this->config->getSystemValue('twofactor_enforced_excluded_groups', [])
+        );
+    }
 
-	/**
-	 * Set the state of enforced two-factor auth
-	 */
-	public function setState(EnforcementState $state) {
-		$this->config->setSystemValue('twofactor_enforced', $state->isEnforced() ? 'true' : 'false');
-		$this->config->setSystemValue('twofactor_enforced_groups', $state->getEnforcedGroups());
-		$this->config->setSystemValue('twofactor_enforced_excluded_groups', $state->getExcludedGroups());
-	}
+    /**
+     * Set the state of enforced two-factor auth
+     */
+    public function setState(EnforcementState $state) {
+        $this->config->setSystemValue('twofactor_enforced', $state->isEnforced() ? 'true' : 'false');
+        $this->config->setSystemValue('twofactor_enforced_groups', $state->getEnforcedGroups());
+        $this->config->setSystemValue('twofactor_enforced_excluded_groups', $state->getExcludedGroups());
+    }
 
-	/**
-	 * Check if two-factor auth is enforced for a specific user
-	 *
-	 * The admin(s) can enforce two-factor auth system-wide, for certain groups only
-	 * and also have the option to exclude users of certain groups. This method will
-	 * check their membership of those groups.
-	 *
-	 * @param IUser $user
-	 *
-	 * @return bool
-	 */
-	public function isEnforcedFor(IUser $user): bool {
-		$state = $this->getState();
-		if (!$state->isEnforced()) {
-			return false;
-		}
-		$uid = $user->getUID();
+    /**
+     * Check if two-factor auth is enforced for a specific user
+     *
+     * The admin(s) can enforce two-factor auth system-wide, for certain groups only
+     * and also have the option to exclude users of certain groups. This method will
+     * check their membership of those groups.
+     *
+     * @param IUser $user
+     *
+     * @return bool
+     */
+    public function isEnforcedFor(IUser $user): bool {
+        $state = $this->getState();
+        if (!$state->isEnforced()) {
+            return false;
+        }
+        $uid = $user->getUID();
 
-		/*
+        /*
 		 * If there is a list of enforced groups, we only enforce 2FA for members of those groups.
 		 * For all the other users it is not enforced (overruling the excluded groups list).
 		 */
-		if (!empty($state->getEnforcedGroups())) {
-			foreach ($state->getEnforcedGroups() as $group) {
-				if ($this->groupManager->isInGroup($uid, $group)) {
-					return true;
-				}
-			}
-			// Not a member of any of these groups -> no 2FA enforced
-			return false;
-		}
+        if (!empty($state->getEnforcedGroups())) {
+            foreach ($state->getEnforcedGroups() as $group) {
+                if ($this->groupManager->isInGroup($uid, $group)) {
+                    return true;
+                }
+            }
+            // Not a member of any of these groups -> no 2FA enforced
+            return false;
+        }
 
-		/**
-		 * If the user is member of an excluded group, 2FA won't be enforced.
-		 */
-		foreach ($state->getExcludedGroups() as $group) {
-			if ($this->groupManager->isInGroup($uid, $group)) {
-				return false;
-			}
-		}
+        /**
+         * If the user is member of an excluded group, 2FA won't be enforced.
+         */
+        foreach ($state->getExcludedGroups() as $group) {
+            if ($this->groupManager->isInGroup($uid, $group)) {
+                return false;
+            }
+        }
 
-		/**
-		 * No enforced groups configured and user not member of an excluded groups,
-		 * so 2FA is enforced.
-		 */
-		return true;
-	}
+        /**
+         * No enforced groups configured and user not member of an excluded groups,
+         * so 2FA is enforced.
+         */
+        return true;
+    }
 }