nextcloud / server

core/Command/TwoFactorAuth/State.php

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
 			return;
 		}
 
-		$output->writeln($title . ":");
+		$output->writeln($title.":");
 		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
+			$output->writeln("- ".$provider);
 		}
 	}
 }

Indentation +69 added lines, -69 removed lines

@@ -33,73 +33,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class State extends Base {
-	private IRegistry $registry;
-
-	public function __construct(IRegistry $registry, IUserManager $userManager) {
-		parent::__construct('twofactorauth:state');
-
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('twofactorauth:state');
-		$this->setDescription('Get the two-factor authentication (2FA) state of a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return 1;
-		}
-
-		$providerStates = $this->registry->getProviderStates($user);
-		$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
-		[$enabled, $disabled] = $filtered;
-
-		if (!empty($enabled)) {
-			$output->writeln("Two-factor authentication is enabled for user $uid");
-		} else {
-			$output->writeln("Two-factor authentication is not enabled for user $uid");
-		}
-
-		$output->writeln("");
-		$this->printProviders("Enabled providers", $enabled, $output);
-		$this->printProviders("Disabled providers", $disabled, $output);
-
-		return 0;
-	}
-
-	private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
-		$enabled = [];
-		$disabled = [];
-
-		foreach ($providerStates as $providerId => $isEnabled) {
-			if ($isEnabled) {
-				$enabled[] = $providerId;
-			} else {
-				$disabled[] = $providerId;
-			}
-		}
-
-		return [$enabled, $disabled];
-	}
-
-	private function printProviders(string $title, array $providers,
-									OutputInterface $output) {
-		if (empty($providers)) {
-			// Ignore and don't print anything
-			return;
-		}
-
-		$output->writeln($title . ":");
-		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
-		}
-	}
+    private IRegistry $registry;
+
+    public function __construct(IRegistry $registry, IUserManager $userManager) {
+        parent::__construct('twofactorauth:state');
+
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('twofactorauth:state');
+        $this->setDescription('Get the two-factor authentication (2FA) state of a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return 1;
+        }
+
+        $providerStates = $this->registry->getProviderStates($user);
+        $filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
+        [$enabled, $disabled] = $filtered;
+
+        if (!empty($enabled)) {
+            $output->writeln("Two-factor authentication is enabled for user $uid");
+        } else {
+            $output->writeln("Two-factor authentication is not enabled for user $uid");
+        }
+
+        $output->writeln("");
+        $this->printProviders("Enabled providers", $enabled, $output);
+        $this->printProviders("Disabled providers", $disabled, $output);
+
+        return 0;
+    }
+
+    private function filterEnabledDisabledUnknownProviders(array $providerStates): array {
+        $enabled = [];
+        $disabled = [];
+
+        foreach ($providerStates as $providerId => $isEnabled) {
+            if ($isEnabled) {
+                $enabled[] = $providerId;
+            } else {
+                $disabled[] = $providerId;
+            }
+        }
+
+        return [$enabled, $disabled];
+    }
+
+    private function printProviders(string $title, array $providers,
+                                    OutputInterface $output) {
+        if (empty($providers)) {
+            // Ignore and don't print anything
+            return;
+        }
+
+        $output->writeln($title . ":");
+        foreach ($providers as $provider) {
+            $output->writeln("- " . $provider);
+        }
+    }
 }

core/Command/Config/System/DeleteConfig.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
 
 		if (count($configNames) > 1) {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
@@ -76,21 +76,21 @@ 
 			try {
 				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
 			} catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+			$output->writeln('<info>System config value '.implode(' => ', $configNames).' deleted</info>');
 			return 0;
 		} else {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.$configName.' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+			$output->writeln('<info>System config value '.$configName.' deleted</info>');
 			return 0;
 		}
 	}

Indentation +66 added lines, -66 removed lines

@@ -30,81 +30,81 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct($systemConfig);
-	}
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct($systemConfig);
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:system:delete')
-			->setDescription('Delete a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to delete, specify multiple for array parameter'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:system:delete')
+            ->setDescription('Delete a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to delete, specify multiple for array parameter'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the config exists before deleting it'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
 
-		if (count($configNames) > 1) {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+        if (count($configNames) > 1) {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$value = $this->systemConfig->getValue($configName);
+            $value = $this->systemConfig->getValue($configName);
 
-			try {
-				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
-			} catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            try {
+                $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
+            } catch (\UnexpectedValueException $e) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
-			return 0;
-		} else {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            $this->systemConfig->setValue($configName, $value);
+            $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+            return 0;
+        } else {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
-			return 0;
-		}
-	}
+            $this->systemConfig->deleteValue($configName);
+            $output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+            return 0;
+        }
+    }
 
-	protected function removeSubValue($keys, $currentValue, $throwError) {
-		$nextKey = array_shift($keys);
+    protected function removeSubValue($keys, $currentValue, $throwError) {
+        $nextKey = array_shift($keys);
 
-		if (is_array($currentValue)) {
-			if (isset($currentValue[$nextKey])) {
-				if (empty($keys)) {
-					unset($currentValue[$nextKey]);
-				} else {
-					$currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
-				}
-			} elseif ($throwError) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-		} elseif ($throwError) {
-			throw new \UnexpectedValueException('Config parameter does not exist');
-		}
+        if (is_array($currentValue)) {
+            if (isset($currentValue[$nextKey])) {
+                if (empty($keys)) {
+                    unset($currentValue[$nextKey]);
+                } else {
+                    $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
+                }
+            } elseif ($throwError) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+        } elseif ($throwError) {
+            throw new \UnexpectedValueException('Config parameter does not exist');
+        }
 
-		return $currentValue;
-	}
+        return $currentValue;
+    }
 }

core/Controller/CssController.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 		if (strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

Indentation +60 added lines, -60 removed lines

@@ -44,73 +44,73 @@
 use OCP\IRequest;
 
 class CssController extends Controller {
-	protected IAppData $appData;
-	protected ITimeFactory $timeFactory;
+    protected IAppData $appData;
+    protected ITimeFactory $timeFactory;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								Factory $appDataFactory,
-								ITimeFactory $timeFactory) {
-		parent::__construct($appName, $request);
+    public function __construct(string $appName,
+                                IRequest $request,
+                                Factory $appDataFactory,
+                                ITimeFactory $timeFactory) {
+        parent::__construct($appName, $request);
 
-		$this->appData = $appDataFactory->get('css');
-		$this->timeFactory = $timeFactory;
-	}
+        $this->appData = $appDataFactory->get('css');
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @param string $fileName css filename with extension
-	 * @param string $appName css folder name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getCss(string $fileName, string $appName): Response {
-		try {
-			$folder = $this->appData->getFolder($appName);
-			$gzip = false;
-			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch (NotFoundException $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @param string $fileName css filename with extension
+     * @param string $appName css folder name
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getCss(string $fileName, string $appName): Response {
+        try {
+            $folder = $this->appData->getFolder($appName);
+            $gzip = false;
+            $file = $this->getFile($folder, $fileName, $gzip);
+        } catch (NotFoundException $e) {
+            return new NotFoundResponse();
+        }
 
-		$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-		if ($gzip) {
-			$response->addHeader('Content-Encoding', 'gzip');
-		}
+        $response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+        if ($gzip) {
+            $response->addHeader('Content-Encoding', 'gzip');
+        }
 
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
+        $ttl = 31536000;
+        $response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
 
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT'.$ttl.'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-		return $response;
-	}
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT'.$ttl.'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+        return $response;
+    }
 
-	/**
-	 * @param ISimpleFolder $folder
-	 * @param string $fileName
-	 * @param bool $gzip is set to true if we use the gzip file
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
-		$encoding = $this->request->getHeader('Accept-Encoding');
+    /**
+     * @param ISimpleFolder $folder
+     * @param string $fileName
+     * @param bool $gzip is set to true if we use the gzip file
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
+        $encoding = $this->request->getHeader('Accept-Encoding');
 
-		if (strpos($encoding, 'gzip') !== false) {
-			try {
-				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
-			} catch (NotFoundException $e) {
-				// continue
-			}
-		}
+        if (strpos($encoding, 'gzip') !== false) {
+            try {
+                $gzip = true;
+                return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+            } catch (NotFoundException $e) {
+                // continue
+            }
+        }
 
-		$gzip = false;
-		return $folder->getFile($fileName);
-	}
+        $gzip = false;
+        return $folder->getFile($fileName);
+    }
 }

core/Controller/ClientFlowLoginV2Controller.php

Spacing +1 added lines, -1 removed lines

@@ -295,6 +295,6 @@
 		}
 
 		$protocol = $this->request->getServerProtocol();
-		return $protocol . '://' . $this->request->getServerHost() . $serverPostfix;
+		return $protocol.'://'.$this->request->getServerHost().$serverPostfix;
 	}
 }

Indentation +301 added lines, -301 removed lines

@@ -48,305 +48,305 @@
 use OCP\Security\ISecureRandom;
 
 class ClientFlowLoginV2Controller extends Controller {
-	public const TOKEN_NAME = 'client.flow.v2.login.token';
-	public const STATE_NAME = 'client.flow.v2.state.token';
-
-	private LoginFlowV2Service $loginFlowV2Service;
-	private IURLGenerator $urlGenerator;
-	private IUserSession $userSession;
-	private ISession $session;
-	private ISecureRandom $random;
-	private Defaults $defaults;
-	private ?string $userId;
-	private IL10N $l10n;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								LoginFlowV2Service $loginFlowV2Service,
-								IURLGenerator $urlGenerator,
-								ISession $session,
-								IUserSession $userSession,
-								ISecureRandom $random,
-								Defaults $defaults,
-								?string $userId,
-								IL10N $l10n) {
-		parent::__construct($appName, $request);
-		$this->loginFlowV2Service = $loginFlowV2Service;
-		$this->urlGenerator = $urlGenerator;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->random = $random;
-		$this->defaults = $defaults;
-		$this->userId = $userId;
-		$this->l10n = $l10n;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
-	public function poll(string $token): JSONResponse {
-		try {
-			$creds = $this->loginFlowV2Service->poll($token);
-		} catch (LoginFlowV2NotFoundException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return new JSONResponse($creds);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
-	#[UseSession]
-	public function landing(string $token, $user = ''): Response {
-		if (!$this->loginFlowV2Service->startLoginFlow($token)) {
-			return $this->loginTokenForbiddenResponse();
-		}
-
-		$this->session->set(self::TOKEN_NAME, $token);
-
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.showAuthPickerPage', ['user' => $user])
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
-	#[UseSession]
-	public function showAuthPickerPage($user = ''): StandaloneTemplateResponse {
-		try {
-			$flow = $this->getFlowByLoginToken();
-		} catch (LoginFlowV2NotFoundException $e) {
-			return $this->loginTokenForbiddenResponse();
-		}
-
-		$stateToken = $this->random->generate(
-			64,
-			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS
-		);
-		$this->session->set(self::STATE_NAME, $stateToken);
-
-		return new StandaloneTemplateResponse(
-			$this->appName,
-			'loginflowv2/authpicker',
-			[
-				'client' => $flow->getClientName(),
-				'instanceName' => $this->defaults->getName(),
-				'urlGenerator' => $this->urlGenerator,
-				'stateToken' => $stateToken,
-				'user' => $user,
-			],
-			'guest'
-		);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 */
-	#[UseSession]
-	public function grantPage(string $stateToken): StandaloneTemplateResponse {
-		if (!$this->isValidStateToken($stateToken)) {
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		try {
-			$flow = $this->getFlowByLoginToken();
-		} catch (LoginFlowV2NotFoundException $e) {
-			return $this->loginTokenForbiddenResponse();
-		}
-
-		/** @var IUser $user */
-		$user = $this->userSession->getUser();
-
-		return new StandaloneTemplateResponse(
-			$this->appName,
-			'loginflowv2/grant',
-			[
-				'userId' => $user->getUID(),
-				'userDisplayName' => $user->getDisplayName(),
-				'client' => $flow->getClientName(),
-				'instanceName' => $this->defaults->getName(),
-				'urlGenerator' => $this->urlGenerator,
-				'stateToken' => $stateToken,
-			],
-			'guest'
-		);
-	}
-
-	/**
-	 * @PublicPage
-	 */
-	public function apptokenRedirect(string $stateToken, string $user, string $password) {
-		if (!$this->isValidStateToken($stateToken)) {
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		try {
-			$this->getFlowByLoginToken();
-		} catch (LoginFlowV2NotFoundException $e) {
-			return $this->loginTokenForbiddenResponse();
-		}
-
-		$loginToken = $this->session->get(self::TOKEN_NAME);
-
-		// Clear session variables
-		$this->session->remove(self::TOKEN_NAME);
-		$this->session->remove(self::STATE_NAME);
-
-		try {
-			$token = \OC::$server->get(\OC\Authentication\Token\IProvider::class)->getToken($password);
-			if ($token->getLoginName() !== $user) {
-				throw new InvalidTokenException('login name does not match');
-			}
-		} catch (InvalidTokenException $e) {
-			$response = new StandaloneTemplateResponse(
-				$this->appName,
-				'403',
-				[
-					'message' => $this->l10n->t('Invalid app password'),
-				],
-				'guest'
-			);
-			$response->setStatus(Http::STATUS_FORBIDDEN);
-			return $response;
-		}
-
-		$result = $this->loginFlowV2Service->flowDoneWithAppPassword($loginToken, $this->getServerPath(), $token->getLoginName(), $password);
-		return $this->handleFlowDone($result);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	#[UseSession]
-	public function generateAppPassword(string $stateToken): Response {
-		if (!$this->isValidStateToken($stateToken)) {
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		try {
-			$this->getFlowByLoginToken();
-		} catch (LoginFlowV2NotFoundException $e) {
-			return $this->loginTokenForbiddenResponse();
-		}
-
-		$loginToken = $this->session->get(self::TOKEN_NAME);
-
-		// Clear session variables
-		$this->session->remove(self::TOKEN_NAME);
-		$this->session->remove(self::STATE_NAME);
-		$sessionId = $this->session->getId();
-
-		$result = $this->loginFlowV2Service->flowDone($loginToken, $sessionId, $this->getServerPath(), $this->userId);
-		return $this->handleFlowDone($result);
-	}
-
-	private function handleFlowDone(bool $result): StandaloneTemplateResponse {
-		if ($result) {
-			return new StandaloneTemplateResponse(
-				$this->appName,
-				'loginflowv2/done',
-				[],
-				'guest'
-			);
-		}
-
-		$response = new StandaloneTemplateResponse(
-			$this->appName,
-			'403',
-			[
-				'message' => $this->l10n->t('Could not complete login'),
-			],
-			'guest'
-		);
-		$response->setStatus(Http::STATUS_FORBIDDEN);
-		return $response;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
-	public function init(): JSONResponse {
-		// Get client user agent
-		$userAgent = $this->request->getHeader('USER_AGENT');
-
-		$tokens = $this->loginFlowV2Service->createTokens($userAgent);
-
-		$data = [
-			'poll' => [
-				'token' => $tokens->getPollToken(),
-				'endpoint' => $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.poll')
-			],
-			'login' => $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.landing', ['token' => $tokens->getLoginToken()]),
-		];
-
-		return new JSONResponse($data);
-	}
-
-	private function isValidStateToken(string $stateToken): bool {
-		$currentToken = $this->session->get(self::STATE_NAME);
-		if (!is_string($stateToken) || !is_string($currentToken)) {
-			return false;
-		}
-		return hash_equals($currentToken, $stateToken);
-	}
-
-	private function stateTokenForbiddenResponse(): StandaloneTemplateResponse {
-		$response = new StandaloneTemplateResponse(
-			$this->appName,
-			'403',
-			[
-				'message' => $this->l10n->t('State token does not match'),
-			],
-			'guest'
-		);
-		$response->setStatus(Http::STATUS_FORBIDDEN);
-		return $response;
-	}
-
-	/**
-	 * @return LoginFlowV2
-	 * @throws LoginFlowV2NotFoundException
-	 */
-	private function getFlowByLoginToken(): LoginFlowV2 {
-		$currentToken = $this->session->get(self::TOKEN_NAME);
-		if (!is_string($currentToken)) {
-			throw new LoginFlowV2NotFoundException('Login token not set in session');
-		}
-
-		return $this->loginFlowV2Service->getByLoginToken($currentToken);
-	}
-
-	private function loginTokenForbiddenResponse(): StandaloneTemplateResponse {
-		$response = new StandaloneTemplateResponse(
-			$this->appName,
-			'403',
-			[
-				'message' => $this->l10n->t('Your login token is invalid or has expired'),
-			],
-			'guest'
-		);
-		$response->setStatus(Http::STATUS_FORBIDDEN);
-		return $response;
-	}
-
-	private function getServerPath(): string {
-		$serverPostfix = '';
-
-		if (strpos($this->request->getRequestUri(), '/index.php') !== false) {
-			$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php'));
-		} elseif (strpos($this->request->getRequestUri(), '/login/v2') !== false) {
-			$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/v2'));
-		}
-
-		$protocol = $this->request->getServerProtocol();
-		return $protocol . '://' . $this->request->getServerHost() . $serverPostfix;
-	}
+    public const TOKEN_NAME = 'client.flow.v2.login.token';
+    public const STATE_NAME = 'client.flow.v2.state.token';
+
+    private LoginFlowV2Service $loginFlowV2Service;
+    private IURLGenerator $urlGenerator;
+    private IUserSession $userSession;
+    private ISession $session;
+    private ISecureRandom $random;
+    private Defaults $defaults;
+    private ?string $userId;
+    private IL10N $l10n;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                LoginFlowV2Service $loginFlowV2Service,
+                                IURLGenerator $urlGenerator,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ISecureRandom $random,
+                                Defaults $defaults,
+                                ?string $userId,
+                                IL10N $l10n) {
+        parent::__construct($appName, $request);
+        $this->loginFlowV2Service = $loginFlowV2Service;
+        $this->urlGenerator = $urlGenerator;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->random = $random;
+        $this->defaults = $defaults;
+        $this->userId = $userId;
+        $this->l10n = $l10n;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function poll(string $token): JSONResponse {
+        try {
+            $creds = $this->loginFlowV2Service->poll($token);
+        } catch (LoginFlowV2NotFoundException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return new JSONResponse($creds);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    #[UseSession]
+    public function landing(string $token, $user = ''): Response {
+        if (!$this->loginFlowV2Service->startLoginFlow($token)) {
+            return $this->loginTokenForbiddenResponse();
+        }
+
+        $this->session->set(self::TOKEN_NAME, $token);
+
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.showAuthPickerPage', ['user' => $user])
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    #[UseSession]
+    public function showAuthPickerPage($user = ''): StandaloneTemplateResponse {
+        try {
+            $flow = $this->getFlowByLoginToken();
+        } catch (LoginFlowV2NotFoundException $e) {
+            return $this->loginTokenForbiddenResponse();
+        }
+
+        $stateToken = $this->random->generate(
+            64,
+            ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS
+        );
+        $this->session->set(self::STATE_NAME, $stateToken);
+
+        return new StandaloneTemplateResponse(
+            $this->appName,
+            'loginflowv2/authpicker',
+            [
+                'client' => $flow->getClientName(),
+                'instanceName' => $this->defaults->getName(),
+                'urlGenerator' => $this->urlGenerator,
+                'stateToken' => $stateToken,
+                'user' => $user,
+            ],
+            'guest'
+        );
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     */
+    #[UseSession]
+    public function grantPage(string $stateToken): StandaloneTemplateResponse {
+        if (!$this->isValidStateToken($stateToken)) {
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        try {
+            $flow = $this->getFlowByLoginToken();
+        } catch (LoginFlowV2NotFoundException $e) {
+            return $this->loginTokenForbiddenResponse();
+        }
+
+        /** @var IUser $user */
+        $user = $this->userSession->getUser();
+
+        return new StandaloneTemplateResponse(
+            $this->appName,
+            'loginflowv2/grant',
+            [
+                'userId' => $user->getUID(),
+                'userDisplayName' => $user->getDisplayName(),
+                'client' => $flow->getClientName(),
+                'instanceName' => $this->defaults->getName(),
+                'urlGenerator' => $this->urlGenerator,
+                'stateToken' => $stateToken,
+            ],
+            'guest'
+        );
+    }
+
+    /**
+     * @PublicPage
+     */
+    public function apptokenRedirect(string $stateToken, string $user, string $password) {
+        if (!$this->isValidStateToken($stateToken)) {
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        try {
+            $this->getFlowByLoginToken();
+        } catch (LoginFlowV2NotFoundException $e) {
+            return $this->loginTokenForbiddenResponse();
+        }
+
+        $loginToken = $this->session->get(self::TOKEN_NAME);
+
+        // Clear session variables
+        $this->session->remove(self::TOKEN_NAME);
+        $this->session->remove(self::STATE_NAME);
+
+        try {
+            $token = \OC::$server->get(\OC\Authentication\Token\IProvider::class)->getToken($password);
+            if ($token->getLoginName() !== $user) {
+                throw new InvalidTokenException('login name does not match');
+            }
+        } catch (InvalidTokenException $e) {
+            $response = new StandaloneTemplateResponse(
+                $this->appName,
+                '403',
+                [
+                    'message' => $this->l10n->t('Invalid app password'),
+                ],
+                'guest'
+            );
+            $response->setStatus(Http::STATUS_FORBIDDEN);
+            return $response;
+        }
+
+        $result = $this->loginFlowV2Service->flowDoneWithAppPassword($loginToken, $this->getServerPath(), $token->getLoginName(), $password);
+        return $this->handleFlowDone($result);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    #[UseSession]
+    public function generateAppPassword(string $stateToken): Response {
+        if (!$this->isValidStateToken($stateToken)) {
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        try {
+            $this->getFlowByLoginToken();
+        } catch (LoginFlowV2NotFoundException $e) {
+            return $this->loginTokenForbiddenResponse();
+        }
+
+        $loginToken = $this->session->get(self::TOKEN_NAME);
+
+        // Clear session variables
+        $this->session->remove(self::TOKEN_NAME);
+        $this->session->remove(self::STATE_NAME);
+        $sessionId = $this->session->getId();
+
+        $result = $this->loginFlowV2Service->flowDone($loginToken, $sessionId, $this->getServerPath(), $this->userId);
+        return $this->handleFlowDone($result);
+    }
+
+    private function handleFlowDone(bool $result): StandaloneTemplateResponse {
+        if ($result) {
+            return new StandaloneTemplateResponse(
+                $this->appName,
+                'loginflowv2/done',
+                [],
+                'guest'
+            );
+        }
+
+        $response = new StandaloneTemplateResponse(
+            $this->appName,
+            '403',
+            [
+                'message' => $this->l10n->t('Could not complete login'),
+            ],
+            'guest'
+        );
+        $response->setStatus(Http::STATUS_FORBIDDEN);
+        return $response;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function init(): JSONResponse {
+        // Get client user agent
+        $userAgent = $this->request->getHeader('USER_AGENT');
+
+        $tokens = $this->loginFlowV2Service->createTokens($userAgent);
+
+        $data = [
+            'poll' => [
+                'token' => $tokens->getPollToken(),
+                'endpoint' => $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.poll')
+            ],
+            'login' => $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.landing', ['token' => $tokens->getLoginToken()]),
+        ];
+
+        return new JSONResponse($data);
+    }
+
+    private function isValidStateToken(string $stateToken): bool {
+        $currentToken = $this->session->get(self::STATE_NAME);
+        if (!is_string($stateToken) || !is_string($currentToken)) {
+            return false;
+        }
+        return hash_equals($currentToken, $stateToken);
+    }
+
+    private function stateTokenForbiddenResponse(): StandaloneTemplateResponse {
+        $response = new StandaloneTemplateResponse(
+            $this->appName,
+            '403',
+            [
+                'message' => $this->l10n->t('State token does not match'),
+            ],
+            'guest'
+        );
+        $response->setStatus(Http::STATUS_FORBIDDEN);
+        return $response;
+    }
+
+    /**
+     * @return LoginFlowV2
+     * @throws LoginFlowV2NotFoundException
+     */
+    private function getFlowByLoginToken(): LoginFlowV2 {
+        $currentToken = $this->session->get(self::TOKEN_NAME);
+        if (!is_string($currentToken)) {
+            throw new LoginFlowV2NotFoundException('Login token not set in session');
+        }
+
+        return $this->loginFlowV2Service->getByLoginToken($currentToken);
+    }
+
+    private function loginTokenForbiddenResponse(): StandaloneTemplateResponse {
+        $response = new StandaloneTemplateResponse(
+            $this->appName,
+            '403',
+            [
+                'message' => $this->l10n->t('Your login token is invalid or has expired'),
+            ],
+            'guest'
+        );
+        $response->setStatus(Http::STATUS_FORBIDDEN);
+        return $response;
+    }
+
+    private function getServerPath(): string {
+        $serverPostfix = '';
+
+        if (strpos($this->request->getRequestUri(), '/index.php') !== false) {
+            $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/index.php'));
+        } elseif (strpos($this->request->getRequestUri(), '/login/v2') !== false) {
+            $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/v2'));
+        }
+
+        $protocol = $this->request->getServerProtocol();
+        return $protocol . '://' . $this->request->getServerHost() . $serverPostfix;
+    }
 }

core/Migrations/Version14000Date20180626223656.php

Indentation +37 added lines, -37 removed lines

@@ -28,42 +28,42 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180626223656 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('whats_new')) {
-			$table = $schema->createTable('whats_new');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('version', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '11',
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['version'], 'version');
-			$table->addIndex(['version', 'etag'], 'version_etag_idx');
-		}
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('whats_new')) {
+            $table = $schema->createTable('whats_new');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('version', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '11',
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['version'], 'version');
+            $table->addIndex(['version', 'etag'], 'version_etag_idx');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version19000Date20200211083441.php

Indentation +31 added lines, -31 removed lines

@@ -10,36 +10,36 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version19000Date20200211083441 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('webauthn')) {
-			$table = $schema->createTable('webauthn');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('public_key_credential_id', 'string', [
-				'notnull' => true,
-				'length' => 255
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'webauthn_uid');
-			$table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('webauthn')) {
+            $table = $schema->createTable('webauthn');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('public_key_credential_id', 'string', [
+                'notnull' => true,
+                'length' => 255
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'webauthn_uid');
+            $table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
+        }
+        return $schema;
+    }
 }

core/Migrations/Version14000Date20180522074438.php

Indentation +25 added lines, -25 removed lines

@@ -33,31 +33,31 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180522074438 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure,
-								 array $options): ISchemaWrapper {
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure,
+                                    array $options): ISchemaWrapper {
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_providers')) {
-			$table = $schema->createTable('twofactor_providers');
-			$table->addColumn('provider_id', 'string',
-				[
-					'notnull' => true,
-					'length' => 32,
-				]);
-			$table->addColumn('uid', 'string',
-				[
-					'notnull' => true,
-					'length' => 64,
-				]);
-			$table->addColumn('enabled', 'smallint',
-				[
-					'notnull' => true,
-					'length' => 1,
-				]);
-			$table->setPrimaryKey(['provider_id', 'uid']);
-			$table->addIndex(['uid'], 'twofactor_providers_uid');
-		}
+        if (!$schema->hasTable('twofactor_providers')) {
+            $table = $schema->createTable('twofactor_providers');
+            $table->addColumn('provider_id', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 32,
+                ]);
+            $table->addColumn('uid', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 64,
+                ]);
+            $table->addColumn('enabled', 'smallint',
+                [
+                    'notnull' => true,
+                    'length' => 1,
+                ]);
+            $table->setPrimaryKey(['provider_id', 'uid']);
+            $table->addIndex(['uid'], 'twofactor_providers_uid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/templates/403.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd

Indentation +6 added lines, -6 removed lines

@@ -1,17 +1,17 @@
 <?php
 // @codeCoverageIgnoreStart
 if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>
 <div class="guest-box">
 	<h2><?php p($l->t('Access forbidden')); ?></h2>
 		<p class='hint'><?php if (isset($_['message'])) {
-			p($_['message']);
-		}?></p>
+            p($_['message']);
+        }?></p>
 </ul>

core/Controller/JsController.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 		if (strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

Indentation +58 added lines, -58 removed lines

@@ -44,71 +44,71 @@
 use OCP\IRequest;
 
 class JsController extends Controller {
-	protected IAppData $appData;
-	protected ITimeFactory $timeFactory;
+    protected IAppData $appData;
+    protected ITimeFactory $timeFactory;
 
-	public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
-		parent::__construct($appName, $request);
+    public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
+        parent::__construct($appName, $request);
 
-		$this->appData = $appDataFactory->get('js');
-		$this->timeFactory = $timeFactory;
-	}
+        $this->appData = $appDataFactory->get('js');
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @param string $fileName js filename with extension
-	 * @param string $appName js folder name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getJs(string $fileName, string $appName): Response {
-		try {
-			$folder = $this->appData->getFolder($appName);
-			$gzip = false;
-			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch (NotFoundException $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @param string $fileName js filename with extension
+     * @param string $appName js folder name
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getJs(string $fileName, string $appName): Response {
+        try {
+            $folder = $this->appData->getFolder($appName);
+            $gzip = false;
+            $file = $this->getFile($folder, $fileName, $gzip);
+        } catch (NotFoundException $e) {
+            return new NotFoundResponse();
+        }
 
-		$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
-		if ($gzip) {
-			$response->addHeader('Content-Encoding', 'gzip');
-		}
+        $response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
+        if ($gzip) {
+            $response->addHeader('Content-Encoding', 'gzip');
+        }
 
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
+        $ttl = 31536000;
+        $response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
 
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT'.$ttl.'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-		return $response;
-	}
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT'.$ttl.'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+        return $response;
+    }
 
-	/**
-	 * @param ISimpleFolder $folder
-	 * @param string $fileName
-	 * @param bool $gzip is set to true if we use the gzip file
-	 * @return ISimpleFile
-	 *
-	 * @throws NotFoundException
-	 */
-	private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
-		$encoding = $this->request->getHeader('Accept-Encoding');
+    /**
+     * @param ISimpleFolder $folder
+     * @param string $fileName
+     * @param bool $gzip is set to true if we use the gzip file
+     * @return ISimpleFile
+     *
+     * @throws NotFoundException
+     */
+    private function getFile(ISimpleFolder $folder, string $fileName, bool &$gzip): ISimpleFile {
+        $encoding = $this->request->getHeader('Accept-Encoding');
 
-		if (strpos($encoding, 'gzip') !== false) {
-			try {
-				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
-			} catch (NotFoundException $e) {
-				// continue
-			}
-		}
+        if (strpos($encoding, 'gzip') !== false) {
+            try {
+                $gzip = true;
+                return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+            } catch (NotFoundException $e) {
+                // continue
+            }
+        }
 
-		$gzip = false;
-		return $folder->getFile($fileName);
-	}
+        $gzip = false;
+        return $folder->getFile($fileName);
+    }
 }