nextcloud / server

core/Migrations/Version15000Date20181029084625.php

Indentation +16 added lines, -16 removed lines

@@ -31,23 +31,23 @@
 
 class Version15000Date20181029084625 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();
+    /**
+     * @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('share');
-		$table->addColumn('label', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
+        $table = $schema->getTable('share');
+        $table->addColumn('label', 'string', [
+            'notnull' => false,
+            'length' => 255,
+        ]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 
 }

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/CalDAV/CachedSubscriptionObject.php

Indentation +25 added lines, -25 removed lines

@@ -33,32 +33,32 @@
  */
 class CachedSubscriptionObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		// Pre-populating the 'calendardata' is optional, if we don't have it
-		// already we fetch it from the backend.
-		if (!isset($this->objectData['calendardata'])) {
-			$this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        }
 
-		return $this->objectData['calendardata'];
-	}
+        return $this->objectData['calendardata'];
+    }
 
-	/**
-	 * @param resource|string $calendarData
-	 * @return string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function put($calendarData) {
-		throw new MethodNotAllowed('Creating objects in a cached subscription is not allowed');
-	}
+    /**
+     * @param resource|string $calendarData
+     * @return string|void
+     * @throws MethodNotAllowed
+     */
+    public function put($calendarData) {
+        throw new MethodNotAllowed('Creating objects in a cached subscription is not allowed');
+    }
 
-	/**
-	 * @throws MethodNotAllowed
-	 */
-	public function delete() {
-		throw new MethodNotAllowed('Deleting objects in a cached subscription is not allowed');
-	}
+    /**
+     * @throws MethodNotAllowed
+     */
+    public function delete() {
+        throw new MethodNotAllowed('Deleting objects in a cached subscription is not allowed');
+    }
 }

lib/public/IUser.php

Indentation +174 added lines, -174 removed lines

@@ -36,178 +36,178 @@
  */
 interface IUser {
 
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getUID();
-
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getDisplayName();
-
-	/**
-	 * set the display name for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function setDisplayName($displayName);
-
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 * @since 8.0.0
-	 */
-	public function getLastLogin();
-
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 * @since 8.0.0
-	 */
-	public function updateLastLoginTimestamp();
-
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function delete();
-
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function setPassword($password, $recoveryPassword = null);
-
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getHome();
-
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getBackendClassName();
-
-	/**
-	 * Get the backend for the current user object
-	 *
-	 * @return UserInterface
-	 * @since 15.0.0
-	 */
-	public function getBackend();
-
-	/**
-	 * check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeAvatar();
-
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangePassword();
-
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeDisplayName();
-
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isEnabled();
-
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 * @since 8.0.0
-	 */
-	public function setEnabled(bool $enabled = true);
-
-	/**
-	 * get the users email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress();
-
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size);
-
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId();
-
-	/**
-	 * set the email address of the user
-	 *
-	 * @param string|null $mailAddress
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setEMailAddress($mailAddress);
-
-	/**
-	 * get the users' quota in human readable form. If a specific quota is not
-	 * set for the user, the default value is returned. If a default setting
-	 * was not set otherwise, it is return as 'none', i.e. quota is not limited.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota();
-
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota);
+    /**
+     * get the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getUID();
+
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getDisplayName();
+
+    /**
+     * set the display name for the user
+     *
+     * @param string $displayName
+     * @return bool
+     * @since 8.0.0
+     */
+    public function setDisplayName($displayName);
+
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     * @since 8.0.0
+     */
+    public function getLastLogin();
+
+    /**
+     * updates the timestamp of the most recent login of this user
+     * @since 8.0.0
+     */
+    public function updateLastLoginTimestamp();
+
+    /**
+     * Delete the user
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function delete();
+
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     * @since 8.0.0
+     */
+    public function setPassword($password, $recoveryPassword = null);
+
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getHome();
+
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getBackendClassName();
+
+    /**
+     * Get the backend for the current user object
+     *
+     * @return UserInterface
+     * @since 15.0.0
+     */
+    public function getBackend();
+
+    /**
+     * check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeAvatar();
+
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangePassword();
+
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeDisplayName();
+
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isEnabled();
+
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     * @since 8.0.0
+     */
+    public function setEnabled(bool $enabled = true);
+
+    /**
+     * get the users email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress();
+
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size);
+
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId();
+
+    /**
+     * set the email address of the user
+     *
+     * @param string|null $mailAddress
+     * @return void
+     * @since 9.0.0
+     */
+    public function setEMailAddress($mailAddress);
+
+    /**
+     * get the users' quota in human readable form. If a specific quota is not
+     * set for the user, the default value is returned. If a default setting
+     * was not set otherwise, it is return as 'none', i.e. quota is not limited.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota();
+
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @since 9.0.0
+     */
+    public function setQuota($quota);
 }

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;
+    }
 }