nextcloud / server

lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php

Indentation +52 added lines, -52 removed lines

@@ -32,60 +32,60 @@
 use OCP\User\Backend\IPasswordConfirmationBackend;
 
 class PasswordConfirmationMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var array */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var array */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	/**
-	 * PasswordConfirmationMiddleware constructor.
-	 *
-	 * @param ControllerMethodReflector $reflector
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * PasswordConfirmationMiddleware constructor.
+     *
+     * @param ControllerMethodReflector $reflector
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotConfirmedException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
-			$user = $this->userSession->getUser();
-			$backendClassName = '';
-			if ($user !== null) {
-				$backend = $user->getBackend();
-				if ($backend instanceof IPasswordConfirmationBackend) {
-					if (!$backend->canConfirmPassword($user->getUID())) {
-						return;
-					}
-				}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotConfirmedException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
+            $user = $this->userSession->getUser();
+            $backendClassName = '';
+            if ($user !== null) {
+                $backend = $user->getBackend();
+                if ($backend instanceof IPasswordConfirmationBackend) {
+                    if (!$backend->canConfirmPassword($user->getUID())) {
+                        return;
+                    }
+                }
 
-				$backendClassName = $user->getBackendClassName();
-			}
+                $backendClassName = $user->getBackendClassName();
+            }
 
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
-				throw new NotConfirmedException();
-			}
-		}
-	}
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
+                throw new NotConfirmedException();
+            }
+        }
+    }
 }

lib/public/User/Backend/IPasswordConfirmationBackend.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
  */
 interface IPasswordConfirmationBackend {
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function canConfirmPassword(string $uid): bool;
+    /**
+     * @since 15.0.0
+     */
+    public function canConfirmPassword(string $uid): bool;
 }

apps/dav/lib/Migration/Version1008Date20181105112049.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105112049 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source_copy');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source_copy');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105104833.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105104833 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/public/Security/ICrypto.php

Indentation +25 added lines, -25 removed lines

@@ -37,31 +37,31 @@
  */
 interface ICrypto {
 
-	/**
-	 * @param string $message The message to authenticate
-	 * @param string $password Password to use (defaults to `secret` in config.php)
-	 * @return string Calculated HMAC
-	 * @since 8.0.0
-	 */
-	public function calculateHMAC(string $message, string $password = ''): string;
+    /**
+     * @param string $message The message to authenticate
+     * @param string $password Password to use (defaults to `secret` in config.php)
+     * @return string Calculated HMAC
+     * @since 8.0.0
+     */
+    public function calculateHMAC(string $message, string $password = ''): string;
 
-	/**
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
-	 * @param string $plaintext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string Authenticated ciphertext
-	 * @since 8.0.0
-	 */
-	public function encrypt(string $plaintext, string $password = ''): string;
+    /**
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
+     * @param string $plaintext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string Authenticated ciphertext
+     * @since 8.0.0
+     */
+    public function encrypt(string $plaintext, string $password = ''): string;
 
-	/**
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
-	 * @param string $authenticatedCiphertext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string plaintext
-	 * @throws \Exception If the HMAC does not match
-	 * @throws \Exception If the decryption failed
-	 * @since 8.0.0
-	 */
-	public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
+    /**
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
+     * @param string $authenticatedCiphertext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string plaintext
+     * @throws \Exception If the HMAC does not match
+     * @throws \Exception If the decryption failed
+     * @since 8.0.0
+     */
+    public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
 }

apps/dav/lib/Migration/Version1008Date20181114084440.php

Indentation +23 added lines, -23 removed lines

@@ -33,27 +33,27 @@
 class Version1008Date20181114084440 extends SimpleMigrationStep {
 
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('calendarchanges')) {
-			$calendarChangesTable = $schema->getTable('calendarchanges');
-			if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
-				$calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
-			}
-
-			if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
-				$calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
-			}
-		}
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('calendarchanges')) {
+            $calendarChangesTable = $schema->getTable('calendarchanges');
+            if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
+                $calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
+            }
+
+            if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
+                $calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
+            }
+        }
+
+        return $schema;
+    }
 }

lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IActivatableByAdmin extends IProvider {
 
-	/**
-	 * Enable this provider for the given user.
-	 *
-	 * @param IUser $user the user to activate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function enableFor(IUser $user);
+    /**
+     * Enable this provider for the given user.
+     *
+     * @param IUser $user the user to activate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function enableFor(IUser $user);
 
 }

lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IDeactivatableByAdmin extends IProvider {
 
-	/**
-	 * Disable this provider for the given user.
-	 *
-	 * @param IUser $user the user to deactivate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function disableFor(IUser $user);
+    /**
+     * Disable this provider for the given user.
+     *
+     * @param IUser $user the user to deactivate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function disableFor(IUser $user);
 
 }

lib/private/RichObjectStrings/Validator.php

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
  */
 class Validator implements IValidator {
 
-	/** @var Definitions */
-	protected $definitions;
-
-	/** @var array[] */
-	protected $requiredParameters = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param Definitions $definitions
-	 */
-	public function __construct(Definitions $definitions) {
-		$this->definitions = $definitions;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function validate($subject, array $parameters) {
-		$matches = [];
-		$result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
-
-		if ($result === false) {
-			throw new InvalidObjectExeption();
-		}
-
-		if (!empty($matches[1])) {
-			foreach ($matches[1] as $parameter) {
-				if (!isset($parameters[$parameter])) {
-					throw new InvalidObjectExeption('Parameter is undefined');
-				}
-			}
-		}
-
-		foreach ($parameters as $parameter) {
-			if (!\is_array($parameter)) {
-				throw new InvalidObjectExeption('Parameter is malformed');
-			}
-
-			$this->validateParameter($parameter);
-		}
-	}
-
-	/**
-	 * @param array $parameter
-	 * @throws InvalidObjectExeption
-	 */
-	protected function validateParameter(array $parameter) {
-		if (!isset($parameter['type'])) {
-			throw new InvalidObjectExeption('Object type is undefined');
-		}
-
-		$definition = $this->definitions->getDefinition($parameter['type']);
-		$requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
-
-		$missingKeys = array_diff($requiredParameters, array_keys($parameter));
-		if (!empty($missingKeys)) {
-			throw new InvalidObjectExeption('Object is invalid');
-		}
-	}
-
-	/**
-	 * @param string $type
-	 * @param array $definition
-	 * @return string[]
-	 */
-	protected function getRequiredParameters($type, array $definition) {
-		if (isset($this->requiredParameters[$type])) {
-			return $this->requiredParameters[$type];
-		}
-
-		$this->requiredParameters[$type] = [];
-		foreach ($definition['parameters'] as $parameter => $data) {
-			if ($data['required']) {
-				$this->requiredParameters[$type][] = $parameter;
-			}
-		}
-
-		return $this->requiredParameters[$type];
-	}
+    /** @var Definitions */
+    protected $definitions;
+
+    /** @var array[] */
+    protected $requiredParameters = [];
+
+    /**
+     * Constructor
+     *
+     * @param Definitions $definitions
+     */
+    public function __construct(Definitions $definitions) {
+        $this->definitions = $definitions;
+    }
+
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function validate($subject, array $parameters) {
+        $matches = [];
+        $result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
+
+        if ($result === false) {
+            throw new InvalidObjectExeption();
+        }
+
+        if (!empty($matches[1])) {
+            foreach ($matches[1] as $parameter) {
+                if (!isset($parameters[$parameter])) {
+                    throw new InvalidObjectExeption('Parameter is undefined');
+                }
+            }
+        }
+
+        foreach ($parameters as $parameter) {
+            if (!\is_array($parameter)) {
+                throw new InvalidObjectExeption('Parameter is malformed');
+            }
+
+            $this->validateParameter($parameter);
+        }
+    }
+
+    /**
+     * @param array $parameter
+     * @throws InvalidObjectExeption
+     */
+    protected function validateParameter(array $parameter) {
+        if (!isset($parameter['type'])) {
+            throw new InvalidObjectExeption('Object type is undefined');
+        }
+
+        $definition = $this->definitions->getDefinition($parameter['type']);
+        $requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
+
+        $missingKeys = array_diff($requiredParameters, array_keys($parameter));
+        if (!empty($missingKeys)) {
+            throw new InvalidObjectExeption('Object is invalid');
+        }
+    }
+
+    /**
+     * @param string $type
+     * @param array $definition
+     * @return string[]
+     */
+    protected function getRequiredParameters($type, array $definition) {
+        if (isset($this->requiredParameters[$type])) {
+            return $this->requiredParameters[$type];
+        }
+
+        $this->requiredParameters[$type] = [];
+        foreach ($definition['parameters'] as $parameter => $data) {
+            if ($data['required']) {
+                $this->requiredParameters[$type][] = $parameter;
+            }
+        }
+
+        return $this->requiredParameters[$type];
+    }
 }