nextcloud / server

apps/dav/lib/Storage/PublicOwnerWrapper.php

Indentation +23 added lines, -23 removed lines

@@ -29,27 +29,27 @@
 
 class PublicOwnerWrapper extends Wrapper {
 
-	/** @var string */
-	private $owner;
-
-	/**
-	 * @param array $arguments ['storage' => $storage, 'owner' => $owner]
-	 *
-	 * $storage: The storage the permissions mask should be applied on
-	 * $owner: The owner to use in case no owner is found
-	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->owner = $arguments['owner'];
-	}
-
-	public function getOwner($path) {
-		$owner = parent::getOwner($path);
-
-		if ($owner === null || $owner === false) {
-			return $this->owner;
-		}
-
-		return $owner;
-	}
+    /** @var string */
+    private $owner;
+
+    /**
+     * @param array $arguments ['storage' => $storage, 'owner' => $owner]
+     *
+     * $storage: The storage the permissions mask should be applied on
+     * $owner: The owner to use in case no owner is found
+     */
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->owner = $arguments['owner'];
+    }
+
+    public function getOwner($path) {
+        $owner = parent::getOwner($path);
+
+        if ($owner === null || $owner === false) {
+            return $this->owner;
+        }
+
+        return $owner;
+    }
 }

lib/public/AppFramework/Services/IAppConfig.php

Indentation +70 added lines, -70 removed lines

@@ -31,81 +31,81 @@
  * @since 20.0.0
  */
 interface IAppConfig {
-	/**
-	 * Get all keys stored for this app
-	 *
-	 * @return string[] the keys stored for the app
-	 * @since 20.0.0
-	 */
-	public function getAppKeys(): array ;
+    /**
+     * Get all keys stored for this app
+     *
+     * @return string[] the keys stored for the app
+     * @since 20.0.0
+     */
+    public function getAppKeys(): array ;
 
-	/**
-	 * Writes a new app wide value
-	 *
-	 * @param string $key the key of the value, under which will be saved
-	 * @param string $value the value that should be stored
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function setAppValue(string $key, string $value): void;
+    /**
+     * Writes a new app wide value
+     *
+     * @param string $key the key of the value, under which will be saved
+     * @param string $value the value that should be stored
+     * @return void
+     * @since 20.0.0
+     */
+    public function setAppValue(string $key, string $value): void;
 
-	/**
-	 * Looks up an app wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 * @return string the saved value
-	 * @since 20.0.0
-	 */
-	public function getAppValue(string $key, string $default = ''): string;
+    /**
+     * Looks up an app wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     * @return string the saved value
+     * @since 20.0.0
+     */
+    public function getAppValue(string $key, string $default = ''): string;
 
-	/**
-	 * Delete an app wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function deleteAppValue(string $key): void;
+    /**
+     * Delete an app wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @return void
+     * @since 20.0.0
+     */
+    public function deleteAppValue(string $key): void;
 
-	/**
-	 * Removes all keys in appconfig belonging to the app
-	 *
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function deleteAppValues(): void;
+    /**
+     * Removes all keys in appconfig belonging to the app
+     *
+     * @return void
+     * @since 20.0.0
+     */
+    public function deleteAppValues(): void;
 
-	/**
-	 * Set a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param string $value the value that you want to store
-	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
-	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
-	 * @since 20.0.0
-	 */
-	public function setUserValue(string $userId, string $key, string $value, ?string $preCondition = null): void;
+    /**
+     * Set a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @param string $value the value that you want to store
+     * @param string $preCondition only update if the config value was previously the value passed as $preCondition
+     * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
+     * @throws \UnexpectedValueException when trying to store an unexpected value
+     * @since 20.0.0
+     */
+    public function setUserValue(string $userId, string $key, string $value, ?string $preCondition = null): void;
 
-	/**
-	 * Shortcut for getting a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return string
-	 * @since 20.0.0
-	 */
-	public function getUserValue(string $userId, string $key, string $default = ''): string;
+    /**
+     * Shortcut for getting a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return string
+     * @since 20.0.0
+     */
+    public function getUserValue(string $userId, string $key, string $default = ''): string;
 
-	/**
-	 * Delete a user value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @since 20.0.0
-	 */
-	public function deleteUserValue(string $userId, string $key): void;
+    /**
+     * Delete a user value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @since 20.0.0
+     */
+    public function deleteUserValue(string $userId, string $key): void;
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @return string[] the keys stored for the app
 	 * @since 20.0.0
 	 */
-	public function getAppKeys(): array ;
+	public function getAppKeys(): array;
 
 	/**
 	 * Writes a new app wide value

core/Controller/ClientFlowLoginController.php

Spacing +3 added lines, -3 removed lines

@@ -357,7 +357,7 @@ 
 			);
 			$this->session->remove('oauth.state');
 		} else {
-			$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
+			$redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($loginName).'&password:'.urlencode($token);
 
 			// Clear the token from the login here
 			$this->tokenProvider->invalidateToken($sessionId);
@@ -395,7 +395,7 @@ 
 			return $response;
 		}
 
-		$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password);
+		$redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($user).'&password:'.urlencode($password);
 		return new Http\RedirectResponse($redirectUri);
 	}
 
@@ -418,6 +418,6 @@ 
 			}
 		}
 
-		return $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
+		return $protocol."://".$this->request->getServerHost().$serverPostfix;
 	}
 }

Indentation +329 added lines, -329 removed lines

@@ -57,333 +57,333 @@
 use OCP\Session\Exceptions\SessionNotAvailableException;
 
 class ClientFlowLoginController extends Controller {
-	private IUserSession $userSession;
-	private IL10N $l10n;
-	private Defaults $defaults;
-	private ISession $session;
-	private IProvider $tokenProvider;
-	private ISecureRandom $random;
-	private IURLGenerator $urlGenerator;
-	private ClientMapper $clientMapper;
-	private AccessTokenMapper $accessTokenMapper;
-	private ICrypto $crypto;
-	private IEventDispatcher $eventDispatcher;
-
-	public const STATE_NAME = 'client.flow.state.token';
-
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserSession $userSession,
-								IL10N $l10n,
-								Defaults $defaults,
-								ISession $session,
-								IProvider $tokenProvider,
-								ISecureRandom $random,
-								IURLGenerator $urlGenerator,
-								ClientMapper $clientMapper,
-								AccessTokenMapper $accessTokenMapper,
-								ICrypto $crypto,
-								IEventDispatcher $eventDispatcher) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-		$this->session = $session;
-		$this->tokenProvider = $tokenProvider;
-		$this->random = $random;
-		$this->urlGenerator = $urlGenerator;
-		$this->clientMapper = $clientMapper;
-		$this->accessTokenMapper = $accessTokenMapper;
-		$this->crypto = $crypto;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	private function getClientName(): string {
-		$userAgent = $this->request->getHeader('USER_AGENT');
-		return $userAgent !== '' ? $userAgent : 'unknown';
-	}
-
-	private function isValidToken(string $stateToken): bool {
-		$currentToken = $this->session->get(self::STATE_NAME);
-		if (!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;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 */
-	#[UseSession]
-	public function showAuthPickerPage(string $clientIdentifier = '', string $user = '', int $direct = 0): StandaloneTemplateResponse {
-		$clientName = $this->getClientName();
-		$client = null;
-		if ($clientIdentifier !== '') {
-			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
-			$clientName = $client->getName();
-		}
-
-		// No valid clientIdentifier given and no valid API Request (APIRequest header not set)
-		$clientRequest = $this->request->getHeader('OCS-APIREQUEST');
-		if ($clientRequest !== 'true' && $client === null) {
-			return new StandaloneTemplateResponse(
-				$this->appName,
-				'error',
-				[
-					'errors' =>
-					[
-						[
-							'error' => 'Access Forbidden',
-							'hint' => 'Invalid request',
-						],
-					],
-				],
-				'guest'
-			);
-		}
-
-		$stateToken = $this->random->generate(
-			64,
-			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS
-		);
-		$this->session->set(self::STATE_NAME, $stateToken);
-
-		$csp = new Http\ContentSecurityPolicy();
-		if ($client) {
-			$csp->addAllowedFormActionDomain($client->getRedirectUri());
-		} else {
-			$csp->addAllowedFormActionDomain('nc://*');
-		}
-
-		$response = new StandaloneTemplateResponse(
-			$this->appName,
-			'loginflow/authpicker',
-			[
-				'client' => $clientName,
-				'clientIdentifier' => $clientIdentifier,
-				'instanceName' => $this->defaults->getName(),
-				'urlGenerator' => $this->urlGenerator,
-				'stateToken' => $stateToken,
-				'serverHost' => $this->getServerPath(),
-				'oauthState' => $this->session->get('oauth.state'),
-				'user' => $user,
-				'direct' => $direct,
-			],
-			'guest'
-		);
-
-		$response->setContentSecurityPolicy($csp);
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 */
-	#[UseSession]
-	public function grantPage(string $stateToken = '',
-				  string $clientIdentifier = '',
-				  int $direct = 0): StandaloneTemplateResponse {
-		if (!$this->isValidToken($stateToken)) {
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		$clientName = $this->getClientName();
-		$client = null;
-		if ($clientIdentifier !== '') {
-			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
-			$clientName = $client->getName();
-		}
-
-		$csp = new Http\ContentSecurityPolicy();
-		if ($client) {
-			$csp->addAllowedFormActionDomain($client->getRedirectUri());
-		} else {
-			$csp->addAllowedFormActionDomain('nc://*');
-		}
-
-		/** @var IUser $user */
-		$user = $this->userSession->getUser();
-
-		$response = new StandaloneTemplateResponse(
-			$this->appName,
-			'loginflow/grant',
-			[
-				'userId' => $user->getUID(),
-				'userDisplayName' => $user->getDisplayName(),
-				'client' => $clientName,
-				'clientIdentifier' => $clientIdentifier,
-				'instanceName' => $this->defaults->getName(),
-				'urlGenerator' => $this->urlGenerator,
-				'stateToken' => $stateToken,
-				'serverHost' => $this->getServerPath(),
-				'oauthState' => $this->session->get('oauth.state'),
-				'direct' => $direct,
-			],
-			'guest'
-		);
-
-		$response->setContentSecurityPolicy($csp);
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return Http\RedirectResponse|Response
-	 */
-	#[UseSession]
-	public function generateAppPassword(string $stateToken,
-										string $clientIdentifier = '') {
-		if (!$this->isValidToken($stateToken)) {
-			$this->session->remove(self::STATE_NAME);
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		$this->session->remove(self::STATE_NAME);
-
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_FORBIDDEN);
-			return $response;
-		}
-
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-			$loginName = $sessionToken->getLoginName();
-			try {
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
-			} catch (PasswordlessTokenException $ex) {
-				$password = null;
-			}
-		} catch (InvalidTokenException $ex) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_FORBIDDEN);
-			return $response;
-		}
-
-		$clientName = $this->getClientName();
-		$client = false;
-		if ($clientIdentifier !== '') {
-			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
-			$clientName = $client->getName();
-		}
-
-		$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
-		$uid = $this->userSession->getUser()->getUID();
-		$generatedToken = $this->tokenProvider->generateToken(
-			$token,
-			$uid,
-			$loginName,
-			$password,
-			$clientName,
-			IToken::PERMANENT_TOKEN,
-			IToken::DO_NOT_REMEMBER
-		);
-
-		if ($client) {
-			$code = $this->random->generate(128, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
-			$accessToken = new AccessToken();
-			$accessToken->setClientId($client->getId());
-			$accessToken->setEncryptedToken($this->crypto->encrypt($token, $code));
-			$accessToken->setHashedCode(hash('sha512', $code));
-			$accessToken->setTokenId($generatedToken->getId());
-			$this->accessTokenMapper->insert($accessToken);
-
-			$redirectUri = $client->getRedirectUri();
-
-			if (parse_url($redirectUri, PHP_URL_QUERY)) {
-				$redirectUri .= '&';
-			} else {
-				$redirectUri .= '?';
-			}
-
-			$redirectUri .= sprintf(
-				'state=%s&code=%s',
-				urlencode($this->session->get('oauth.state')),
-				urlencode($code)
-			);
-			$this->session->remove('oauth.state');
-		} else {
-			$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
-
-			// Clear the token from the login here
-			$this->tokenProvider->invalidateToken($sessionId);
-		}
-
-		$this->eventDispatcher->dispatchTyped(
-			new AppPasswordCreatedEvent($generatedToken)
-		);
-
-		return new Http\RedirectResponse($redirectUri);
-	}
-
-	/**
-	 * @PublicPage
-	 */
-	public function apptokenRedirect(string $stateToken, string $user, string $password): Response {
-		if (!$this->isValidToken($stateToken)) {
-			return $this->stateTokenForbiddenResponse();
-		}
-
-		try {
-			$token = $this->tokenProvider->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;
-		}
-
-		$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password);
-		return new Http\RedirectResponse($redirectUri);
-	}
-
-	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/flow') !== false) {
-			$serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/flow'));
-		}
-
-		$protocol = $this->request->getServerProtocol();
-
-		if ($protocol !== "https") {
-			$xForwardedProto = $this->request->getHeader('X-Forwarded-Proto');
-			$xForwardedSSL = $this->request->getHeader('X-Forwarded-Ssl');
-			if ($xForwardedProto === 'https' || $xForwardedSSL === 'on') {
-				$protocol = 'https';
-			}
-		}
-
-		return $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
-	}
+    private IUserSession $userSession;
+    private IL10N $l10n;
+    private Defaults $defaults;
+    private ISession $session;
+    private IProvider $tokenProvider;
+    private ISecureRandom $random;
+    private IURLGenerator $urlGenerator;
+    private ClientMapper $clientMapper;
+    private AccessTokenMapper $accessTokenMapper;
+    private ICrypto $crypto;
+    private IEventDispatcher $eventDispatcher;
+
+    public const STATE_NAME = 'client.flow.state.token';
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserSession $userSession,
+                                IL10N $l10n,
+                                Defaults $defaults,
+                                ISession $session,
+                                IProvider $tokenProvider,
+                                ISecureRandom $random,
+                                IURLGenerator $urlGenerator,
+                                ClientMapper $clientMapper,
+                                AccessTokenMapper $accessTokenMapper,
+                                ICrypto $crypto,
+                                IEventDispatcher $eventDispatcher) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+        $this->session = $session;
+        $this->tokenProvider = $tokenProvider;
+        $this->random = $random;
+        $this->urlGenerator = $urlGenerator;
+        $this->clientMapper = $clientMapper;
+        $this->accessTokenMapper = $accessTokenMapper;
+        $this->crypto = $crypto;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    private function getClientName(): string {
+        $userAgent = $this->request->getHeader('USER_AGENT');
+        return $userAgent !== '' ? $userAgent : 'unknown';
+    }
+
+    private function isValidToken(string $stateToken): bool {
+        $currentToken = $this->session->get(self::STATE_NAME);
+        if (!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;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     */
+    #[UseSession]
+    public function showAuthPickerPage(string $clientIdentifier = '', string $user = '', int $direct = 0): StandaloneTemplateResponse {
+        $clientName = $this->getClientName();
+        $client = null;
+        if ($clientIdentifier !== '') {
+            $client = $this->clientMapper->getByIdentifier($clientIdentifier);
+            $clientName = $client->getName();
+        }
+
+        // No valid clientIdentifier given and no valid API Request (APIRequest header not set)
+        $clientRequest = $this->request->getHeader('OCS-APIREQUEST');
+        if ($clientRequest !== 'true' && $client === null) {
+            return new StandaloneTemplateResponse(
+                $this->appName,
+                'error',
+                [
+                    'errors' =>
+                    [
+                        [
+                            'error' => 'Access Forbidden',
+                            'hint' => 'Invalid request',
+                        ],
+                    ],
+                ],
+                'guest'
+            );
+        }
+
+        $stateToken = $this->random->generate(
+            64,
+            ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS
+        );
+        $this->session->set(self::STATE_NAME, $stateToken);
+
+        $csp = new Http\ContentSecurityPolicy();
+        if ($client) {
+            $csp->addAllowedFormActionDomain($client->getRedirectUri());
+        } else {
+            $csp->addAllowedFormActionDomain('nc://*');
+        }
+
+        $response = new StandaloneTemplateResponse(
+            $this->appName,
+            'loginflow/authpicker',
+            [
+                'client' => $clientName,
+                'clientIdentifier' => $clientIdentifier,
+                'instanceName' => $this->defaults->getName(),
+                'urlGenerator' => $this->urlGenerator,
+                'stateToken' => $stateToken,
+                'serverHost' => $this->getServerPath(),
+                'oauthState' => $this->session->get('oauth.state'),
+                'user' => $user,
+                'direct' => $direct,
+            ],
+            'guest'
+        );
+
+        $response->setContentSecurityPolicy($csp);
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     */
+    #[UseSession]
+    public function grantPage(string $stateToken = '',
+                    string $clientIdentifier = '',
+                    int $direct = 0): StandaloneTemplateResponse {
+        if (!$this->isValidToken($stateToken)) {
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        $clientName = $this->getClientName();
+        $client = null;
+        if ($clientIdentifier !== '') {
+            $client = $this->clientMapper->getByIdentifier($clientIdentifier);
+            $clientName = $client->getName();
+        }
+
+        $csp = new Http\ContentSecurityPolicy();
+        if ($client) {
+            $csp->addAllowedFormActionDomain($client->getRedirectUri());
+        } else {
+            $csp->addAllowedFormActionDomain('nc://*');
+        }
+
+        /** @var IUser $user */
+        $user = $this->userSession->getUser();
+
+        $response = new StandaloneTemplateResponse(
+            $this->appName,
+            'loginflow/grant',
+            [
+                'userId' => $user->getUID(),
+                'userDisplayName' => $user->getDisplayName(),
+                'client' => $clientName,
+                'clientIdentifier' => $clientIdentifier,
+                'instanceName' => $this->defaults->getName(),
+                'urlGenerator' => $this->urlGenerator,
+                'stateToken' => $stateToken,
+                'serverHost' => $this->getServerPath(),
+                'oauthState' => $this->session->get('oauth.state'),
+                'direct' => $direct,
+            ],
+            'guest'
+        );
+
+        $response->setContentSecurityPolicy($csp);
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return Http\RedirectResponse|Response
+     */
+    #[UseSession]
+    public function generateAppPassword(string $stateToken,
+                                        string $clientIdentifier = '') {
+        if (!$this->isValidToken($stateToken)) {
+            $this->session->remove(self::STATE_NAME);
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        $this->session->remove(self::STATE_NAME);
+
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_FORBIDDEN);
+            return $response;
+        }
+
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+            $loginName = $sessionToken->getLoginName();
+            try {
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
+            } catch (PasswordlessTokenException $ex) {
+                $password = null;
+            }
+        } catch (InvalidTokenException $ex) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_FORBIDDEN);
+            return $response;
+        }
+
+        $clientName = $this->getClientName();
+        $client = false;
+        if ($clientIdentifier !== '') {
+            $client = $this->clientMapper->getByIdentifier($clientIdentifier);
+            $clientName = $client->getName();
+        }
+
+        $token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
+        $uid = $this->userSession->getUser()->getUID();
+        $generatedToken = $this->tokenProvider->generateToken(
+            $token,
+            $uid,
+            $loginName,
+            $password,
+            $clientName,
+            IToken::PERMANENT_TOKEN,
+            IToken::DO_NOT_REMEMBER
+        );
+
+        if ($client) {
+            $code = $this->random->generate(128, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
+            $accessToken = new AccessToken();
+            $accessToken->setClientId($client->getId());
+            $accessToken->setEncryptedToken($this->crypto->encrypt($token, $code));
+            $accessToken->setHashedCode(hash('sha512', $code));
+            $accessToken->setTokenId($generatedToken->getId());
+            $this->accessTokenMapper->insert($accessToken);
+
+            $redirectUri = $client->getRedirectUri();
+
+            if (parse_url($redirectUri, PHP_URL_QUERY)) {
+                $redirectUri .= '&';
+            } else {
+                $redirectUri .= '?';
+            }
+
+            $redirectUri .= sprintf(
+                'state=%s&code=%s',
+                urlencode($this->session->get('oauth.state')),
+                urlencode($code)
+            );
+            $this->session->remove('oauth.state');
+        } else {
+            $redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
+
+            // Clear the token from the login here
+            $this->tokenProvider->invalidateToken($sessionId);
+        }
+
+        $this->eventDispatcher->dispatchTyped(
+            new AppPasswordCreatedEvent($generatedToken)
+        );
+
+        return new Http\RedirectResponse($redirectUri);
+    }
+
+    /**
+     * @PublicPage
+     */
+    public function apptokenRedirect(string $stateToken, string $user, string $password): Response {
+        if (!$this->isValidToken($stateToken)) {
+            return $this->stateTokenForbiddenResponse();
+        }
+
+        try {
+            $token = $this->tokenProvider->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;
+        }
+
+        $redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password);
+        return new Http\RedirectResponse($redirectUri);
+    }
+
+    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/flow') !== false) {
+            $serverPostfix = substr($this->request->getRequestUri(), 0, strpos($this->request->getRequestUri(), '/login/flow'));
+        }
+
+        $protocol = $this->request->getServerProtocol();
+
+        if ($protocol !== "https") {
+            $xForwardedProto = $this->request->getHeader('X-Forwarded-Proto');
+            $xForwardedSSL = $this->request->getHeader('X-Forwarded-Ssl');
+            if ($xForwardedProto === 'https' || $xForwardedSSL === 'on') {
+                $protocol = 'https';
+            }
+        }
+
+        return $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
+    }
 }

apps/contactsinteraction/lib/AddressBook.php

Spacing +6 added lines, -6 removed lines

@@ -85,13 +85,13 @@ 
 			return new Card(
 				$this->mapper->find(
 					$this->getUid(),
-					(int)$name
+					(int) $name
 				),
 				$this->principalUri,
 				$this->getACL()
 			);
 		} catch (DoesNotExistException $ex) {
-			throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
+			throw new NotFound("Contact does not exist: ".$ex->getMessage(), 0, $ex);
 		}
 	}
 
@@ -100,7 +100,7 @@ 
 	 */
 	public function getChildren(): array {
 		return array_map(
-			function (RecentContact $contact) {
+			function(RecentContact $contact) {
 				return new Card(
 					$contact,
 					$this->principalUri,
@@ -118,7 +118,7 @@ 
 		try {
 			$this->mapper->find(
 				$this->getUid(),
-				(int)$name
+				(int) $name
 			);
 			return true;
 		} catch (DoesNotExistException $e) {
@@ -147,8 +147,8 @@ 
 		return [
 			'principaluri' => $this->principalUri,
 			'{DAV:}displayname' => $this->l10n->t('Recently contacted'),
-			'{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
-			'{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0),
+			'{'.Plugin::NS_OWNCLOUD.'}read-only' => true,
+			'{'.\OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($this->getLastModified() ?? 0),
 		];
 	}
 

Indentation +129 added lines, -129 removed lines

@@ -40,133 +40,133 @@
 use Sabre\DAVACL\IACL;
 
 class AddressBook extends ExternalAddressBook implements IACL {
-	use ACLTrait;
-
-	public const URI = 'recent';
-
-	private RecentContactMapper $mapper;
-	private IL10N $l10n;
-	private string $principalUri;
-
-	public function __construct(RecentContactMapper $mapper,
-								IL10N $l10n,
-								string $principalUri) {
-		parent::__construct(Application::APP_ID, self::URI);
-
-		$this->mapper = $mapper;
-		$this->l10n = $l10n;
-		$this->principalUri = $principalUri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function delete(): void {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function createFile($name, $data = null) {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 * @throws NotFound
-	 */
-	public function getChild($name): Card {
-		try {
-			return new Card(
-				$this->mapper->find(
-					$this->getUid(),
-					(int)$name
-				),
-				$this->principalUri,
-				$this->getACL()
-			);
-		} catch (DoesNotExistException $ex) {
-			throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChildren(): array {
-		return array_map(
-			function (RecentContact $contact) {
-				return new Card(
-					$contact,
-					$this->principalUri,
-					$this->getACL()
-				);
-			},
-			$this->mapper->findAll($this->getUid())
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function childExists($name): bool {
-		try {
-			$this->mapper->find(
-				$this->getUid(),
-				(int)$name
-			);
-			return true;
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLastModified(): ?int {
-		return $this->mapper->findLastUpdatedForUserId($this->getUid());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		throw new Exception("This addressbook is immutable");
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getProperties($properties) {
-		return [
-			'principaluri' => $this->principalUri,
-			'{DAV:}displayname' => $this->l10n->t('Recently contacted'),
-			'{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
-			'{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0),
-		];
-	}
-
-	public function getOwner(): string {
-		return $this->principalUri;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getACL(): array {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-		];
-	}
-
-	private function getUid(): string {
-		[, $uid] = \Sabre\Uri\split($this->principalUri);
-		return $uid;
-	}
+    use ACLTrait;
+
+    public const URI = 'recent';
+
+    private RecentContactMapper $mapper;
+    private IL10N $l10n;
+    private string $principalUri;
+
+    public function __construct(RecentContactMapper $mapper,
+                                IL10N $l10n,
+                                string $principalUri) {
+        parent::__construct(Application::APP_ID, self::URI);
+
+        $this->mapper = $mapper;
+        $this->l10n = $l10n;
+        $this->principalUri = $principalUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(): void {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createFile($name, $data = null) {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     * @throws NotFound
+     */
+    public function getChild($name): Card {
+        try {
+            return new Card(
+                $this->mapper->find(
+                    $this->getUid(),
+                    (int)$name
+                ),
+                $this->principalUri,
+                $this->getACL()
+            );
+        } catch (DoesNotExistException $ex) {
+            throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChildren(): array {
+        return array_map(
+            function (RecentContact $contact) {
+                return new Card(
+                    $contact,
+                    $this->principalUri,
+                    $this->getACL()
+                );
+            },
+            $this->mapper->findAll($this->getUid())
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function childExists($name): bool {
+        try {
+            $this->mapper->find(
+                $this->getUid(),
+                (int)$name
+            );
+            return true;
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLastModified(): ?int {
+        return $this->mapper->findLastUpdatedForUserId($this->getUid());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function propPatch(PropPatch $propPatch) {
+        throw new Exception("This addressbook is immutable");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getProperties($properties) {
+        return [
+            'principaluri' => $this->principalUri,
+            '{DAV:}displayname' => $this->l10n->t('Recently contacted'),
+            '{' . Plugin::NS_OWNCLOUD . '}read-only' => true,
+            '{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0),
+        ];
+    }
+
+    public function getOwner(): string {
+        return $this->principalUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getACL(): array {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+        ];
+    }
+
+    private function getUid(): string {
+        [, $uid] = \Sabre\Uri\split($this->principalUri);
+        return $uid;
+    }
 }

apps/contactsinteraction/lib/Card.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	 * @inheritDoc
 	 */
 	public function getETag(): ?string {
-		return '"' . md5((string) $this->getLastModified()) . '"';
+		return '"'.md5((string) $this->getLastModified()).'"';
 	}
 
 	/**

Indentation +95 added lines, -95 removed lines

@@ -34,99 +34,99 @@
 use Sabre\DAVACL\IACL;
 
 class Card implements ICard, IACL {
-	use ACLTrait;
-
-	private RecentContact $contact;
-	private string $principal;
-	private array $acls;
-
-	public function __construct(RecentContact $contact, string $principal, array $acls) {
-		$this->contact = $contact;
-		$this->principal = $principal;
-		$this->acls = $acls;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOwner(): ?string {
-		return $this->principal;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getACL(): array {
-		return $this->acls;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setAcls(array $acls): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function put($data): ?string {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function get() {
-		return $this->contact->getCard();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getContentType(): ?string {
-		return 'text/vcard; charset=utf-8';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getETag(): ?string {
-		return '"' . md5((string) $this->getLastModified()) . '"';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getSize(): int {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function delete(): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return (string) $this->contact->getId();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setName($name): void {
-		throw new NotImplemented();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLastModified(): ?int {
-		return $this->contact->getLastContact();
-	}
+    use ACLTrait;
+
+    private RecentContact $contact;
+    private string $principal;
+    private array $acls;
+
+    public function __construct(RecentContact $contact, string $principal, array $acls) {
+        $this->contact = $contact;
+        $this->principal = $principal;
+        $this->acls = $acls;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOwner(): ?string {
+        return $this->principal;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getACL(): array {
+        return $this->acls;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setAcls(array $acls): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function put($data): ?string {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get() {
+        return $this->contact->getCard();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getContentType(): ?string {
+        return 'text/vcard; charset=utf-8';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getETag(): ?string {
+        return '"' . md5((string) $this->getLastModified()) . '"';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSize(): int {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return (string) $this->contact->getId();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setName($name): void {
+        throw new NotImplemented();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLastModified(): ?int {
+        return $this->contact->getLastContact();
+    }
 }

lib/private/AppFramework/Services/InitialState.php

Indentation +14 added lines, -14 removed lines

@@ -29,22 +29,22 @@
 use OCP\IInitialStateService;
 
 class InitialState implements IInitialState {
-	/** @var IInitialStateService */
-	private $state;
+    /** @var IInitialStateService */
+    private $state;
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	public function __construct(IInitialStateService $state, string $appName) {
-		$this->state = $state;
-		$this->appName = $appName;
-	}
+    public function __construct(IInitialStateService $state, string $appName) {
+        $this->state = $state;
+        $this->appName = $appName;
+    }
 
-	public function provideInitialState(string $key, $data): void {
-		$this->state->provideInitialState($this->appName, $key, $data);
-	}
+    public function provideInitialState(string $key, $data): void {
+        $this->state->provideInitialState($this->appName, $key, $data);
+    }
 
-	public function provideLazyInitialState(string $key, \Closure $closure): void {
-		$this->state->provideLazyInitialState($this->appName, $key, $closure);
-	}
+    public function provideLazyInitialState(string $key, \Closure $closure): void {
+        $this->state->provideLazyInitialState($this->appName, $key, $closure);
+    }
 }

lib/private/AppFramework/Middleware/NotModifiedMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 	public function afterController($controller, $methodName, Response $response) {
 		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"'.$response->getETag().'"') {
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
 			return $response;
 		}

Indentation +22 added lines, -22 removed lines

@@ -31,26 +31,26 @@
 use OCP\IRequest;
 
 class NotModifiedMiddleware extends Middleware {
-	/** @var IRequest */
-	private $request;
-
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	public function afterController($controller, $methodName, Response $response) {
-		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		$modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
-		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC2822)) {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		return $response;
-	}
+    /** @var IRequest */
+    private $request;
+
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    public function afterController($controller, $methodName, Response $response) {
+        $etagHeader = $this->request->getHeader('IF_NONE_MATCH');
+        if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
+        if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC2822)) {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        return $response;
+    }
 }

resources/update-locales.php

Indentation +9 added lines, -9 removed lines

@@ -25,28 +25,28 @@
  */
 
 if (!extension_loaded('intl')) {
-	echo 'Intl extension is required to run this script.';
-	exit(1);
+    echo 'Intl extension is required to run this script.';
+    exit(1);
 }
 
 require '../3rdparty/autoload.php';
 
 $locales = array_map(static function (string $localeCode) {
-	return [
-		'code' => $localeCode,
-		'name' => Locale::getDisplayName($localeCode, 'en')
-	];
+    return [
+        'code' => $localeCode,
+        'name' => Locale::getDisplayName($localeCode, 'en')
+    ];
 }, ResourceBundle::getLocales(''));
 
 $locales = array_filter($locales, static function (array $locale) {
-	return is_array(Punic\Data::explodeLocale($locale['code']));
+    return is_array(Punic\Data::explodeLocale($locale['code']));
 });
 
 $locales = array_values($locales);
 
 if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
-	echo 'Failed to update locales.json';
-	exit(1);
+    echo 'Failed to update locales.json';
+    exit(1);
 }
 
 echo 'Updated locales.json. Don\'t forget to commit the result.';

Spacing +3 added lines, -3 removed lines

@@ -31,20 +31,20 @@
 
 require '../3rdparty/autoload.php';
 
-$locales = array_map(static function (string $localeCode) {
+$locales = array_map(static function(string $localeCode) {
 	return [
 		'code' => $localeCode,
 		'name' => Locale::getDisplayName($localeCode, 'en')
 	];
 }, ResourceBundle::getLocales(''));
 
-$locales = array_filter($locales, static function (array $locale) {
+$locales = array_filter($locales, static function(array $locale) {
 	return is_array(Punic\Data::explodeLocale($locale['code']));
 });
 
 $locales = array_values($locales);
 
-if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
+if (file_put_contents(__DIR__.'/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
 	echo 'Failed to update locales.json';
 	exit(1);
 }

core/Command/Security/ResetBruteforceAttempts.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$ip = $input->getArgument('ipaddress');
 
 		if (!filter_var($ip, FILTER_VALIDATE_IP)) {
-			$output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
+			$output->writeln('<error>"'.$ip.'" is not a valid IP address</error>');
 			return 1;
 		}
 

Indentation +24 added lines, -24 removed lines

@@ -30,33 +30,33 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ResetBruteforceAttempts extends Base {
-	protected Throttler $throttler;
+    protected Throttler $throttler;
 
-	public function __construct(Throttler $throttler) {
-		$this->throttler = $throttler;
-		parent::__construct();
-	}
+    public function __construct(Throttler $throttler) {
+        $this->throttler = $throttler;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:bruteforce:reset')
-			->setDescription('resets bruteforce attemps for given IP address')
-			->addArgument(
-				'ipaddress',
-				InputArgument::REQUIRED,
-				'IP address for which the attempts are to be reset'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:bruteforce:reset')
+            ->setDescription('resets bruteforce attemps for given IP address')
+            ->addArgument(
+                'ipaddress',
+                InputArgument::REQUIRED,
+                'IP address for which the attempts are to be reset'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$ip = $input->getArgument('ipaddress');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $ip = $input->getArgument('ipaddress');
 
-		if (!filter_var($ip, FILTER_VALIDATE_IP)) {
-			$output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
-			return 1;
-		}
+        if (!filter_var($ip, FILTER_VALIDATE_IP)) {
+            $output->writeln('<error>"' . $ip . '" is not a valid IP address</error>');
+            return 1;
+        }
 
-		$this->throttler->resetDelayForIP($ip);
-		return 0;
-	}
+        $this->throttler->resetDelayForIP($ip);
+        return 0;
+    }
 }