nextcloud / server

lib/private/Log/ExceptionSerializer.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 
 	private function filterTrace(array $trace) {
 		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+		$trace = array_map(function(array $traceLine) use (&$sensitiveValues) {
 			$className = $traceLine['class'] ?? '';
 			if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
 				&& in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
@@ -112,7 +112,7 @@ 
 			}
 			return $traceLine;
 		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
+		return array_map(function(array $traceLine) use ($sensitiveValues) {
 			if (isset($traceLine['args'])) {
 				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
 			}
@@ -133,7 +133,7 @@ 
 
 	private function encodeTrace($trace) {
 		$filteredTrace = $this->filterTrace($trace);
-		return array_map(function (array $line) {
+		return array_map(function(array $line) {
 			if (isset($line['args'])) {
 				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
 			}

Indentation +149 added lines, -149 removed lines

@@ -32,153 +32,153 @@
 use OC\Setup;
 
 class ExceptionSerializer {
-	public const methodsWithSensitiveParameters = [
-		// Session/User
-		'completeLogin',
-		'login',
-		'checkPassword',
-		'checkPasswordNoLogging',
-		'loginWithPassword',
-		'updatePrivateKeyPassword',
-		'validateUserPass',
-		'loginWithToken',
-		'{closure}',
-		'createSessionToken',
-
-		// Provisioning
-		'addUser',
-
-		// TokenProvider
-		'getToken',
-		'isTokenPassword',
-		'getPassword',
-		'decryptPassword',
-		'logClientIn',
-		'generateToken',
-		'validateToken',
-
-		// TwoFactorAuth
-		'solveChallenge',
-		'verifyChallenge',
-
-		// ICrypto
-		'calculateHMAC',
-		'encrypt',
-		'decrypt',
-
-		// LoginController
-		'tryLogin',
-		'confirmPassword',
-
-		// LDAP
-		'bind',
-		'areCredentialsValid',
-		'invokeLDAPMethod',
-
-		// Encryption
-		'storeKeyPair',
-		'setupUser',
-
-		// files_external: OC_Mount_Config
-		'getBackendStatus',
-
-		// files_external: UserStoragesController
-		'update',
-	];
-
-	public const methodsWithSensitiveParametersByClass = [
-		SetupController::class => [
-			'run',
-			'display',
-			'loadAutoConfig',
-		],
-		Setup::class => [
-			'install'
-		]
-	];
-
-	private function editTrace(array &$sensitiveValues, array $traceLine): array {
-		if (isset($traceLine['args'])) {
-			$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
-		}
-		$traceLine['args'] = ['*** sensitive parameters replaced ***'];
-		return $traceLine;
-	}
-
-	private function filterTrace(array $trace) {
-		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
-			$className = $traceLine['class'] ?? '';
-			if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
-				&& in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
-				return $this->editTrace($sensitiveValues, $traceLine);
-			}
-			foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
-				if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
-					return $this->editTrace($sensitiveValues, $traceLine);
-				}
-			}
-			return $traceLine;
-		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
-			if (isset($traceLine['args'])) {
-				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
-			}
-			return $traceLine;
-		}, $trace);
-	}
-
-	private function removeValuesFromArgs($args, $values) {
-		foreach ($args as &$arg) {
-			if (in_array($arg, $values, true)) {
-				$arg = '*** sensitive parameter replaced ***';
-			} elseif (is_array($arg)) {
-				$arg = $this->removeValuesFromArgs($arg, $values);
-			}
-		}
-		return $args;
-	}
-
-	private function encodeTrace($trace) {
-		$filteredTrace = $this->filterTrace($trace);
-		return array_map(function (array $line) {
-			if (isset($line['args'])) {
-				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
-			}
-			return $line;
-		}, $filteredTrace);
-	}
-
-	private function encodeArg($arg) {
-		if (is_object($arg)) {
-			$data = get_object_vars($arg);
-			$data['__class__'] = get_class($arg);
-			return array_map([$this, 'encodeArg'], $data);
-		} elseif (is_array($arg)) {
-			return array_map([$this, 'encodeArg'], $arg);
-		} else {
-			return $arg;
-		}
-	}
-
-	public function serializeException(\Throwable $exception) {
-		$data = [
-			'Exception' => get_class($exception),
-			'Message' => $exception->getMessage(),
-			'Code' => $exception->getCode(),
-			'Trace' => $this->encodeTrace($exception->getTrace()),
-			'File' => $exception->getFile(),
-			'Line' => $exception->getLine(),
-		];
-
-		if ($exception instanceof HintException) {
-			$data['Hint'] = $exception->getHint();
-		}
-
-		if ($exception->getPrevious()) {
-			$data['Previous'] = $this->serializeException($exception->getPrevious());
-		}
-
-		return $data;
-	}
+    public const methodsWithSensitiveParameters = [
+        // Session/User
+        'completeLogin',
+        'login',
+        'checkPassword',
+        'checkPasswordNoLogging',
+        'loginWithPassword',
+        'updatePrivateKeyPassword',
+        'validateUserPass',
+        'loginWithToken',
+        '{closure}',
+        'createSessionToken',
+
+        // Provisioning
+        'addUser',
+
+        // TokenProvider
+        'getToken',
+        'isTokenPassword',
+        'getPassword',
+        'decryptPassword',
+        'logClientIn',
+        'generateToken',
+        'validateToken',
+
+        // TwoFactorAuth
+        'solveChallenge',
+        'verifyChallenge',
+
+        // ICrypto
+        'calculateHMAC',
+        'encrypt',
+        'decrypt',
+
+        // LoginController
+        'tryLogin',
+        'confirmPassword',
+
+        // LDAP
+        'bind',
+        'areCredentialsValid',
+        'invokeLDAPMethod',
+
+        // Encryption
+        'storeKeyPair',
+        'setupUser',
+
+        // files_external: OC_Mount_Config
+        'getBackendStatus',
+
+        // files_external: UserStoragesController
+        'update',
+    ];
+
+    public const methodsWithSensitiveParametersByClass = [
+        SetupController::class => [
+            'run',
+            'display',
+            'loadAutoConfig',
+        ],
+        Setup::class => [
+            'install'
+        ]
+    ];
+
+    private function editTrace(array &$sensitiveValues, array $traceLine): array {
+        if (isset($traceLine['args'])) {
+            $sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+        }
+        $traceLine['args'] = ['*** sensitive parameters replaced ***'];
+        return $traceLine;
+    }
+
+    private function filterTrace(array $trace) {
+        $sensitiveValues = [];
+        $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+            $className = $traceLine['class'] ?? '';
+            if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
+                && in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
+                return $this->editTrace($sensitiveValues, $traceLine);
+            }
+            foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
+                if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
+                    return $this->editTrace($sensitiveValues, $traceLine);
+                }
+            }
+            return $traceLine;
+        }, $trace);
+        return array_map(function (array $traceLine) use ($sensitiveValues) {
+            if (isset($traceLine['args'])) {
+                $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
+            }
+            return $traceLine;
+        }, $trace);
+    }
+
+    private function removeValuesFromArgs($args, $values) {
+        foreach ($args as &$arg) {
+            if (in_array($arg, $values, true)) {
+                $arg = '*** sensitive parameter replaced ***';
+            } elseif (is_array($arg)) {
+                $arg = $this->removeValuesFromArgs($arg, $values);
+            }
+        }
+        return $args;
+    }
+
+    private function encodeTrace($trace) {
+        $filteredTrace = $this->filterTrace($trace);
+        return array_map(function (array $line) {
+            if (isset($line['args'])) {
+                $line['args'] = array_map([$this, 'encodeArg'], $line['args']);
+            }
+            return $line;
+        }, $filteredTrace);
+    }
+
+    private function encodeArg($arg) {
+        if (is_object($arg)) {
+            $data = get_object_vars($arg);
+            $data['__class__'] = get_class($arg);
+            return array_map([$this, 'encodeArg'], $data);
+        } elseif (is_array($arg)) {
+            return array_map([$this, 'encodeArg'], $arg);
+        } else {
+            return $arg;
+        }
+    }
+
+    public function serializeException(\Throwable $exception) {
+        $data = [
+            'Exception' => get_class($exception),
+            'Message' => $exception->getMessage(),
+            'Code' => $exception->getCode(),
+            'Trace' => $this->encodeTrace($exception->getTrace()),
+            'File' => $exception->getFile(),
+            'Line' => $exception->getLine(),
+        ];
+
+        if ($exception instanceof HintException) {
+            $data['Hint'] = $exception->getHint();
+        }
+
+        if ($exception->getPrevious()) {
+            $data['Previous'] = $this->serializeException($exception->getPrevious());
+        }
+
+        return $data;
+    }
 }

lib/public/Support/CrashReport/IRegistry.php

Indentation +38 added lines, -38 removed lines

@@ -32,45 +32,45 @@
  */
 interface IRegistry {
 
-	/**
-	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
-	 *
-	 * @since 13.0.0
-	 */
-	public function register(IReporter $reporter): void;
+    /**
+     * Register a reporter instance
+     *
+     * @param IReporter $reporter
+     *
+     * @since 13.0.0
+     */
+    public function register(IReporter $reporter): void;
 
-	/**
-	 * Delegate breadcrumb collection to all registered reporters
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @since 15.0.0
-	 */
-	public function delegateBreadcrumb(string $message, string $category, array $context = []): void;
+    /**
+     * Delegate breadcrumb collection to all registered reporters
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @since 15.0.0
+     */
+    public function delegateBreadcrumb(string $message, string $category, array $context = []): void;
 
-	/**
-	 * Delegate crash reporting to all registered reporters
-	 *
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 *
-	 * @since 13.0.0
-	 */
-	public function delegateReport($exception, array $context = []);
+    /**
+     * Delegate crash reporting to all registered reporters
+     *
+     * @param Exception|Throwable $exception
+     * @param array $context
+     *
+     * @since 13.0.0
+     */
+    public function delegateReport($exception, array $context = []);
 
-	/**
-	 * Delegate a message to all reporters that implement IMessageReporter
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 *
-	 * @since 17.0.0
-	 */
-	public function delegateMessage(string $message, array $context = []): void;
+    /**
+     * Delegate a message to all reporters that implement IMessageReporter
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     *
+     * @since 17.0.0
+     */
+    public function delegateMessage(string $message, array $context = []): void;
 }

lib/public/Support/CrashReport/IMessageReporter.php

Indentation +9 added lines, -9 removed lines

@@ -30,14 +30,14 @@
  */
 interface IMessageReporter extends IReporter {
 
-	/**
-	 * Report a (error) message
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @since 17.0.0
-	 */
-	public function reportMessage(string $message, array $context = []): void;
+    /**
+     * Report a (error) message
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @since 17.0.0
+     */
+    public function reportMessage(string $message, array $context = []): void;
 
 }

lib/private/Support/CrashReport/Registry.php

Indentation +53 added lines, -53 removed lines

@@ -31,62 +31,62 @@
 
 class Registry implements IRegistry {
 
-	/** @var IReporter[] */
-	private $reporters = [];
+    /** @var IReporter[] */
+    private $reporters = [];
 
-	/**
-	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
-	 */
-	public function register(IReporter $reporter): void {
-		$this->reporters[] = $reporter;
-	}
+    /**
+     * Register a reporter instance
+     *
+     * @param IReporter $reporter
+     */
+    public function register(IReporter $reporter): void {
+        $this->reporters[] = $reporter;
+    }
 
-	/**
-	 * Delegate breadcrumb collection to all registered reporters
-	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
-	 * @since 15.0.0
-	 */
-	public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof ICollectBreadcrumbs) {
-				$reporter->collect($message, $category, $context);
-			}
-		}
-	}
+    /**
+     * Delegate breadcrumb collection to all registered reporters
+     *
+     * @param string $message
+     * @param string $category
+     * @param array $context
+     *
+     * @since 15.0.0
+     */
+    public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof ICollectBreadcrumbs) {
+                $reporter->collect($message, $category, $context);
+            }
+        }
+    }
 
-	/**
-	 * Delegate crash reporting to all registered reporters
-	 *
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function delegateReport($exception, array $context = []): void {
-		/** @var IReporter $reporter */
-		foreach ($this->reporters as $reporter) {
-			$reporter->report($exception, $context);
-		}
-	}
+    /**
+     * Delegate crash reporting to all registered reporters
+     *
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function delegateReport($exception, array $context = []): void {
+        /** @var IReporter $reporter */
+        foreach ($this->reporters as $reporter) {
+            $reporter->report($exception, $context);
+        }
+    }
 
-	/**
-	 * Delegate a message to all reporters that implement IMessageReporter
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function delegateMessage(string $message, array $context = []): void {
-		foreach ($this->reporters as $reporter) {
-			if ($reporter instanceof IMessageReporter) {
-				$reporter->reportMessage($message, $context);
-			}
-		}
-	}
+    /**
+     * Delegate a message to all reporters that implement IMessageReporter
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     */
+    public function delegateMessage(string $message, array $context = []): void {
+        foreach ($this->reporters as $reporter) {
+            if ($reporter instanceof IMessageReporter) {
+                $reporter->reportMessage($message, $context);
+            }
+        }
+    }
 
 }

lib/public/Support/Subscription/ISupportedApps.php

Indentation +6 added lines, -6 removed lines

@@ -28,10 +28,10 @@
  */
 interface ISupportedApps extends ISubscription {
 
-	/**
-	 * Fetches the list of app IDs that are supported by the subscription
-	 *
-	 * @since 17.0.0
-	 */
-	public function getSupportedApps(): array;
+    /**
+     * Fetches the list of app IDs that are supported by the subscription
+     *
+     * @since 17.0.0
+     */
+    public function getSupportedApps(): array;
 }

core/templates/twofactorsetupselection.php

Indentation +11 added lines, -11 removed lines

@@ -31,18 +31,18 @@
 		<li>
 			<a class="two-factor-provider"
 			   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.setupProvider',
-								[
-									'providerId' => $provider->getId(),
-									'redirect_url' => $_['redirect_url'],
-								]
-							)) ?>">
+                                [
+                                    'providerId' => $provider->getId(),
+                                    'redirect_url' => $_['redirect_url'],
+                                ]
+                            )) ?>">
 				<?php
-				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-					$icon = $provider->getLightIcon();
-				} else {
-					$icon = image_path('core', 'actions/password-white.svg');
-				}
-				?>
+                if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+                    $icon = $provider->getLightIcon();
+                } else {
+                    $icon = image_path('core', 'actions/password-white.svg');
+                }
+                ?>
 				<img src="<?php p($icon) ?>" alt="" />
 				<div>
 					<h3><?php p($provider->getDisplayName()) ?></h3>

lib/public/Authentication/TwoFactorAuth/IActivatableAtLogin.php

Indentation +8 added lines, -8 removed lines

@@ -31,13 +31,13 @@
  */
 interface IActivatableAtLogin extends IProvider {
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return ILoginSetupProvider
-	 *
-	 * @since 17.0.0
-	 */
-	public function getLoginSetup(IUser $user): ILoginSetupProvider;
+    /**
+     * @param IUser $user
+     *
+     * @return ILoginSetupProvider
+     *
+     * @since 17.0.0
+     */
+    public function getLoginSetup(IUser $user): ILoginSetupProvider;
 
 }

lib/public/Authentication/TwoFactorAuth/ILoginSetupProvider.php

Indentation +6 added lines, -6 removed lines

@@ -31,11 +31,11 @@
  */
 interface ILoginSetupProvider {
 
-	/**
-	 * @return Template
-	 *
-	 * @since 17.0.0
-	 */
-	public function getBody(): Template;
+    /**
+     * @return Template
+     *
+     * @since 17.0.0
+     */
+    public function getBody(): Template;
 
 }

lib/private/Authentication/Exceptions/WipeTokenException.php

Indentation +9 added lines, -9 removed lines

@@ -26,16 +26,16 @@
 use OC\Authentication\Token\IToken;
 
 class WipeTokenException extends InvalidTokenException {
-	/** @var IToken */
-	private $token;
+    /** @var IToken */
+    private $token;
 
-	public function __construct(IToken $token) {
-		parent::__construct();
+    public function __construct(IToken $token) {
+        parent::__construct();
 
-		$this->token = $token;
-	}
+        $this->token = $token;
+    }
 
-	public function getToken(): IToken {
-		return $this->token;
-	}
+    public function getToken(): IToken {
+        return $this->token;
+    }
 }