nextcloud / server

apps/encryption/lib/Hooks/UserHooks.php

Indentation +300 added lines, -300 removed lines

@@ -44,304 +44,304 @@
 
 class UserHooks implements IHook {
 
-	/**
-	 * list of user for which we perform a password reset
-	 * @var array
-	 */
-	protected static $passwordResetUsers = [];
-
-	/**
-	 * @var KeyManager
-	 */
-	private $keyManager;
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-	/**
-	 * @var Setup
-	 */
-	private $userSetup;
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-	/**
-	 * @var Util
-	 */
-	private $util;
-	/**
-	 * @var Session
-	 */
-	private $session;
-	/**
-	 * @var Recovery
-	 */
-	private $recovery;
-	/**
-	 * @var Crypt
-	 */
-	private $crypt;
-
-	/**
-	 * UserHooks constructor.
-	 *
-	 * @param KeyManager $keyManager
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param Setup $userSetup
-	 * @param IUserSession $userSession
-	 * @param Util $util
-	 * @param Session $session
-	 * @param Crypt $crypt
-	 * @param Recovery $recovery
-	 */
-	public function __construct(KeyManager $keyManager,
-								IUserManager $userManager,
-								ILogger $logger,
-								Setup $userSetup,
-								IUserSession $userSession,
-								Util $util,
-								Session $session,
-								Crypt $crypt,
-								Recovery $recovery) {
-		$this->keyManager = $keyManager;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->userSetup = $userSetup;
-		$this->userSession = $userSession;
-		$this->util = $util;
-		$this->session = $session;
-		$this->recovery = $recovery;
-		$this->crypt = $crypt;
-	}
-
-	/**
-	 * Connects Hooks
-	 *
-	 * @return null
-	 */
-	public function addHooks() {
-		OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
-		OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
-
-		// this hooks only make sense if no master key is used
-		if ($this->util->isMasterKeyEnabled() === false) {
-			OCUtil::connectHook('OC_User',
-				'post_setPassword',
-				$this,
-				'setPassphrase');
-
-			OCUtil::connectHook('OC_User',
-				'pre_setPassword',
-				$this,
-				'preSetPassphrase');
-
-			OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
-				'post_passwordReset',
-				$this,
-				'postPasswordReset');
-
-			OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
-				'pre_passwordReset',
-				$this,
-				'prePasswordReset');
-
-			OCUtil::connectHook('OC_User',
-				'post_createUser',
-				$this,
-				'postCreateUser');
-
-			OCUtil::connectHook('OC_User',
-				'post_deleteUser',
-				$this,
-				'postDeleteUser');
-		}
-	}
-
-
-	/**
-	 * Startup encryption backend upon user login
-	 *
-	 * @note This method should never be called for users using client side encryption
-	 * @param array $params
-	 * @return boolean|null
-	 */
-	public function login($params) {
-		// ensure filesystem is loaded
-		if (!\OC\Files\Filesystem::$loaded) {
-			$this->setupFS($params['uid']);
-		}
-		if ($this->util->isMasterKeyEnabled() === false) {
-			$this->userSetup->setupUser($params['uid'], $params['password']);
-		}
-
-		$this->keyManager->init($params['uid'], $params['password']);
-	}
-
-	/**
-	 * remove keys from session during logout
-	 */
-	public function logout() {
-		$this->session->clear();
-	}
-
-	/**
-	 * setup encryption backend upon user created
-	 *
-	 * @note This method should never be called for users using client side encryption
-	 * @param array $params
-	 */
-	public function postCreateUser($params) {
-		$this->userSetup->setupUser($params['uid'], $params['password']);
-	}
-
-	/**
-	 * cleanup encryption backend upon user deleted
-	 *
-	 * @param array $params : uid, password
-	 * @note This method should never be called for users using client side encryption
-	 */
-	public function postDeleteUser($params) {
-		$this->keyManager->deletePublicKey($params['uid']);
-	}
-
-	public function prePasswordReset($params) {
-		$user = $params['uid'];
-		self::$passwordResetUsers[$user] = true;
-	}
-
-	public function postPasswordReset($params) {
-		$uid = $params['uid'];
-		$password = $params['password'];
-		$this->keyManager->backupUserKeys('passwordReset', $uid);
-		$this->keyManager->deleteUserKeys($uid);
-		$this->userSetup->setupUser($uid, $password);
-		unset(self::$passwordResetUsers[$uid]);
-	}
-
-	/**
-	 * If the password can't be changed within Nextcloud, than update the key password in advance.
-	 *
-	 * @param array $params : uid, password
-	 * @return boolean|null
-	 */
-	public function preSetPassphrase($params) {
-		$user = $this->userManager->get($params['uid']);
-
-		if ($user && !$user->canChangePassword()) {
-			$this->setPassphrase($params);
-		}
-	}
-
-	/**
-	 * Change a user's encryption passphrase
-	 *
-	 * @param array $params keys: uid, password
-	 * @return boolean|null
-	 */
-	public function setPassphrase($params) {
-
-		// if we are in the process to resetting a user password, we have nothing
-		// to do here
-		if (isset(self::$passwordResetUsers[$params['uid']])) {
-			return true;
-		}
-
-		// Get existing decrypted private key
-		$user = $this->userSession->getUser();
-
-		// current logged in user changes his own password
-		if ($user && $params['uid'] === $user->getUID()) {
-			$privateKey = $this->session->getPrivateKey();
-
-			// Encrypt private key with new user pwd as passphrase
-			$encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
-
-			// Save private key
-			if ($encryptedPrivateKey) {
-				$this->keyManager->setPrivateKey($user->getUID(),
-					$this->crypt->generateHeader() . $encryptedPrivateKey);
-			} else {
-				$this->logger->error('Encryption could not update users encryption password');
-			}
-
-			// NOTE: Session does not need to be updated as the
-			// private key has not changed, only the passphrase
-			// used to decrypt it has changed
-		} else { // admin changed the password for a different user, create new keys and re-encrypt file keys
-			$userId = $params['uid'];
-			$this->initMountPoints($userId);
-			$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
-
-			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
-			$recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
-			try {
-				$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
-			} catch (\Exception $e) {
-				$decryptedRecoveryKey = false;
-			}
-			if ($decryptedRecoveryKey === false) {
-				$message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
-				throw new GenericEncryptionException($message, $message);
-			}
-
-			// we generate new keys if...
-			// ...we have a recovery password and the user enabled the recovery key
-			// ...encryption was activated for the first time (no keys exists)
-			// ...the user doesn't have any files
-			if (
-				($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword)
-				|| !$this->keyManager->userHasKeys($userId)
-				|| !$this->util->userHasFiles($userId)
-			) {
-
-				// backup old keys
-				//$this->backupAllKeys('recovery');
-
-				$newUserPassword = $params['password'];
-
-				$keyPair = $this->crypt->createKeyPair();
-
-				// Save public key
-				$this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
-
-				// Encrypt private key with new password
-				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
-
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
-
-					if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
-						$this->recovery->recoverUsersFiles($recoveryPassword, $userId);
-					}
-				} else {
-					$this->logger->error('Encryption Could not update users encryption password');
-				}
-			}
-		}
-	}
-
-	/**
-	 * init mount points for given user
-	 *
-	 * @param string $user
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function initMountPoints($user) {
-		Filesystem::initMountPoints($user);
-	}
-
-	/**
-	 * setup file system for user
-	 *
-	 * @param string $uid user id
-	 */
-	protected function setupFS($uid) {
-		\OC_Util::setupFS($uid);
-	}
+    /**
+     * list of user for which we perform a password reset
+     * @var array
+     */
+    protected static $passwordResetUsers = [];
+
+    /**
+     * @var KeyManager
+     */
+    private $keyManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+    /**
+     * @var Setup
+     */
+    private $userSetup;
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+    /**
+     * @var Util
+     */
+    private $util;
+    /**
+     * @var Session
+     */
+    private $session;
+    /**
+     * @var Recovery
+     */
+    private $recovery;
+    /**
+     * @var Crypt
+     */
+    private $crypt;
+
+    /**
+     * UserHooks constructor.
+     *
+     * @param KeyManager $keyManager
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param Setup $userSetup
+     * @param IUserSession $userSession
+     * @param Util $util
+     * @param Session $session
+     * @param Crypt $crypt
+     * @param Recovery $recovery
+     */
+    public function __construct(KeyManager $keyManager,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                Setup $userSetup,
+                                IUserSession $userSession,
+                                Util $util,
+                                Session $session,
+                                Crypt $crypt,
+                                Recovery $recovery) {
+        $this->keyManager = $keyManager;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->userSetup = $userSetup;
+        $this->userSession = $userSession;
+        $this->util = $util;
+        $this->session = $session;
+        $this->recovery = $recovery;
+        $this->crypt = $crypt;
+    }
+
+    /**
+     * Connects Hooks
+     *
+     * @return null
+     */
+    public function addHooks() {
+        OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
+        OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
+
+        // this hooks only make sense if no master key is used
+        if ($this->util->isMasterKeyEnabled() === false) {
+            OCUtil::connectHook('OC_User',
+                'post_setPassword',
+                $this,
+                'setPassphrase');
+
+            OCUtil::connectHook('OC_User',
+                'pre_setPassword',
+                $this,
+                'preSetPassphrase');
+
+            OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
+                'post_passwordReset',
+                $this,
+                'postPasswordReset');
+
+            OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
+                'pre_passwordReset',
+                $this,
+                'prePasswordReset');
+
+            OCUtil::connectHook('OC_User',
+                'post_createUser',
+                $this,
+                'postCreateUser');
+
+            OCUtil::connectHook('OC_User',
+                'post_deleteUser',
+                $this,
+                'postDeleteUser');
+        }
+    }
+
+
+    /**
+     * Startup encryption backend upon user login
+     *
+     * @note This method should never be called for users using client side encryption
+     * @param array $params
+     * @return boolean|null
+     */
+    public function login($params) {
+        // ensure filesystem is loaded
+        if (!\OC\Files\Filesystem::$loaded) {
+            $this->setupFS($params['uid']);
+        }
+        if ($this->util->isMasterKeyEnabled() === false) {
+            $this->userSetup->setupUser($params['uid'], $params['password']);
+        }
+
+        $this->keyManager->init($params['uid'], $params['password']);
+    }
+
+    /**
+     * remove keys from session during logout
+     */
+    public function logout() {
+        $this->session->clear();
+    }
+
+    /**
+     * setup encryption backend upon user created
+     *
+     * @note This method should never be called for users using client side encryption
+     * @param array $params
+     */
+    public function postCreateUser($params) {
+        $this->userSetup->setupUser($params['uid'], $params['password']);
+    }
+
+    /**
+     * cleanup encryption backend upon user deleted
+     *
+     * @param array $params : uid, password
+     * @note This method should never be called for users using client side encryption
+     */
+    public function postDeleteUser($params) {
+        $this->keyManager->deletePublicKey($params['uid']);
+    }
+
+    public function prePasswordReset($params) {
+        $user = $params['uid'];
+        self::$passwordResetUsers[$user] = true;
+    }
+
+    public function postPasswordReset($params) {
+        $uid = $params['uid'];
+        $password = $params['password'];
+        $this->keyManager->backupUserKeys('passwordReset', $uid);
+        $this->keyManager->deleteUserKeys($uid);
+        $this->userSetup->setupUser($uid, $password);
+        unset(self::$passwordResetUsers[$uid]);
+    }
+
+    /**
+     * If the password can't be changed within Nextcloud, than update the key password in advance.
+     *
+     * @param array $params : uid, password
+     * @return boolean|null
+     */
+    public function preSetPassphrase($params) {
+        $user = $this->userManager->get($params['uid']);
+
+        if ($user && !$user->canChangePassword()) {
+            $this->setPassphrase($params);
+        }
+    }
+
+    /**
+     * Change a user's encryption passphrase
+     *
+     * @param array $params keys: uid, password
+     * @return boolean|null
+     */
+    public function setPassphrase($params) {
+
+        // if we are in the process to resetting a user password, we have nothing
+        // to do here
+        if (isset(self::$passwordResetUsers[$params['uid']])) {
+            return true;
+        }
+
+        // Get existing decrypted private key
+        $user = $this->userSession->getUser();
+
+        // current logged in user changes his own password
+        if ($user && $params['uid'] === $user->getUID()) {
+            $privateKey = $this->session->getPrivateKey();
+
+            // Encrypt private key with new user pwd as passphrase
+            $encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
+
+            // Save private key
+            if ($encryptedPrivateKey) {
+                $this->keyManager->setPrivateKey($user->getUID(),
+                    $this->crypt->generateHeader() . $encryptedPrivateKey);
+            } else {
+                $this->logger->error('Encryption could not update users encryption password');
+            }
+
+            // NOTE: Session does not need to be updated as the
+            // private key has not changed, only the passphrase
+            // used to decrypt it has changed
+        } else { // admin changed the password for a different user, create new keys and re-encrypt file keys
+            $userId = $params['uid'];
+            $this->initMountPoints($userId);
+            $recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
+
+            $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+            $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
+            try {
+                $decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
+            } catch (\Exception $e) {
+                $decryptedRecoveryKey = false;
+            }
+            if ($decryptedRecoveryKey === false) {
+                $message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
+                throw new GenericEncryptionException($message, $message);
+            }
+
+            // we generate new keys if...
+            // ...we have a recovery password and the user enabled the recovery key
+            // ...encryption was activated for the first time (no keys exists)
+            // ...the user doesn't have any files
+            if (
+                ($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword)
+                || !$this->keyManager->userHasKeys($userId)
+                || !$this->util->userHasFiles($userId)
+            ) {
+
+                // backup old keys
+                //$this->backupAllKeys('recovery');
+
+                $newUserPassword = $params['password'];
+
+                $keyPair = $this->crypt->createKeyPair();
+
+                // Save public key
+                $this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
+
+                // Encrypt private key with new password
+                $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
+
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
+
+                    if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
+                        $this->recovery->recoverUsersFiles($recoveryPassword, $userId);
+                    }
+                } else {
+                    $this->logger->error('Encryption Could not update users encryption password');
+                }
+            }
+        }
+    }
+
+    /**
+     * init mount points for given user
+     *
+     * @param string $user
+     * @throws \OC\User\NoUserException
+     */
+    protected function initMountPoints($user) {
+        Filesystem::initMountPoints($user);
+    }
+
+    /**
+     * setup file system for user
+     *
+     * @param string $uid user id
+     */
+    protected function setupFS($uid) {
+        \OC_Util::setupFS($uid);
+    }
 }

apps/settings/lib/Controller/LogSettingsController.php

Indentation +22 added lines, -22 removed lines

@@ -35,28 +35,28 @@
 
 class LogSettingsController extends Controller {
 
-	/** @var Log */
-	private $log;
+    /** @var Log */
+    private $log;
 
-	public function __construct(string $appName, IRequest $request, Log $logger) {
-		parent::__construct($appName, $request);
-		$this->log = $logger;
-	}
+    public function __construct(string $appName, IRequest $request, Log $logger) {
+        parent::__construct($appName, $request);
+        $this->log = $logger;
+    }
 
-	/**
-	 * download logfile
-	 *
-	 * @NoCSRFRequired
-	 *
-	 * @return StreamResponse
-	 */
-	public function download() {
-		if (!$this->log instanceof Log) {
-			throw new \UnexpectedValueException('Log file not available');
-		}
-		$resp = new StreamResponse($this->log->getLogPath());
-		$resp->addHeader('Content-Type', 'application/octet-stream');
-		$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
-		return $resp;
-	}
+    /**
+     * download logfile
+     *
+     * @NoCSRFRequired
+     *
+     * @return StreamResponse
+     */
+    public function download() {
+        if (!$this->log instanceof Log) {
+            throw new \UnexpectedValueException('Log file not available');
+        }
+        $resp = new StreamResponse($this->log->getLogPath());
+        $resp->addHeader('Content-Type', 'application/octet-stream');
+        $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
+        return $resp;
+    }
 }

apps/settings/templates/settings/admin/overview.php

Indentation +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
 	</div>
 
 	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) {
-	p('true');
+    p('true');
 } else {
-	p('false');
+    p('false');
 } ?>">
 		<ul class="errors hidden"></ul>
 		<ul class="warnings hidden"></ul>

apps/settings/templates/settings/additional.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 } ?>

apps/settings/templates/settings-vue.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 // Do we have some data to inject ?
 if (is_array($_['serverData'])) {
-	?>
+    ?>
 <span id="serverData" data-server="<?php p(json_encode($_['serverData'])); ?>"></span>
 <?php
 } ?>

apps/files/lib/Settings/PersonalSettings.php

Indentation +9 added lines, -9 removed lines

@@ -31,15 +31,15 @@
 use OCP\Settings\ISettings;
 
 class PersonalSettings implements ISettings {
-	public function getForm(): TemplateResponse {
-		return new TemplateResponse(Application::APP_ID, 'settings-personal');
-	}
+    public function getForm(): TemplateResponse {
+        return new TemplateResponse(Application::APP_ID, 'settings-personal');
+    }
 
-	public function getSection(): string {
-		return 'sharing';
-	}
+    public function getSection(): string {
+        return 'sharing';
+    }
 
-	public function getPriority(): int {
-		return 90;
-	}
+    public function getPriority(): int {
+        return 90;
+    }
 }

apps/files/lib/Collaboration/Resources/ResourceProvider.php

Indentation +96 added lines, -96 removed lines

@@ -37,100 +37,100 @@
 use OCP\IUser;
 
 class ResourceProvider implements IProvider {
-	public const RESOURCE_TYPE = 'file';
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var IPreview */
-	private $preview;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var array */
-	protected $nodes = [];
-
-	public function __construct(IRootFolder $rootFolder,
-								IPreview $preview,
-								IURLGenerator $urlGenerator) {
-		$this->rootFolder = $rootFolder;
-		$this->preview = $preview;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	private function getNode(IResource $resource): ?Node {
-		if (isset($this->nodes[(int) $resource->getId()])) {
-			return $this->nodes[(int) $resource->getId()];
-		}
-		$nodes = $this->rootFolder->getById((int) $resource->getId());
-		if (!empty($nodes)) {
-			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
-			return $this->nodes[(int) $resource->getId()];
-		}
-		return null;
-	}
-
-	/**
-	 * @param IResource $resource
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getResourceRichObject(IResource $resource): array {
-		if (isset($this->nodes[(int) $resource->getId()])) {
-			$node = $this->nodes[(int) $resource->getId()]->getPath();
-		} else {
-			$node = $this->getNode($resource);
-		}
-
-		if ($node instanceof Node) {
-			$link = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				['fileid' => $resource->getId()]
-			);
-			return [
-				'type' => 'file',
-				'id' => $resource->getId(),
-				'name' => $node->getName(),
-				'path' => $node->getInternalPath(),
-				'link' => $link,
-				'mimetype' => $node->getMimetype(),
-				'preview-available' => $this->preview->isAvailable($node),
-			];
-		}
-
-		throw new ResourceException('File not found');
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IResource $resource
-	 * @param IUser $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccessResource(IResource $resource, IUser $user = null): bool {
-		if (!$user instanceof IUser) {
-			return false;
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById((int) $resource->getId());
-
-		if (!empty($nodes)) {
-			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the resource type of the provider
-	 *
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return self::RESOURCE_TYPE;
-	}
+    public const RESOURCE_TYPE = 'file';
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var IPreview */
+    private $preview;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var array */
+    protected $nodes = [];
+
+    public function __construct(IRootFolder $rootFolder,
+                                IPreview $preview,
+                                IURLGenerator $urlGenerator) {
+        $this->rootFolder = $rootFolder;
+        $this->preview = $preview;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    private function getNode(IResource $resource): ?Node {
+        if (isset($this->nodes[(int) $resource->getId()])) {
+            return $this->nodes[(int) $resource->getId()];
+        }
+        $nodes = $this->rootFolder->getById((int) $resource->getId());
+        if (!empty($nodes)) {
+            $this->nodes[(int) $resource->getId()] = array_shift($nodes);
+            return $this->nodes[(int) $resource->getId()];
+        }
+        return null;
+    }
+
+    /**
+     * @param IResource $resource
+     * @return array
+     * @since 16.0.0
+     */
+    public function getResourceRichObject(IResource $resource): array {
+        if (isset($this->nodes[(int) $resource->getId()])) {
+            $node = $this->nodes[(int) $resource->getId()]->getPath();
+        } else {
+            $node = $this->getNode($resource);
+        }
+
+        if ($node instanceof Node) {
+            $link = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                ['fileid' => $resource->getId()]
+            );
+            return [
+                'type' => 'file',
+                'id' => $resource->getId(),
+                'name' => $node->getName(),
+                'path' => $node->getInternalPath(),
+                'link' => $link,
+                'mimetype' => $node->getMimetype(),
+                'preview-available' => $this->preview->isAvailable($node),
+            ];
+        }
+
+        throw new ResourceException('File not found');
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IResource $resource
+     * @param IUser $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccessResource(IResource $resource, IUser $user = null): bool {
+        if (!$user instanceof IUser) {
+            return false;
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $nodes = $userFolder->getById((int) $resource->getId());
+
+        if (!empty($nodes)) {
+            $this->nodes[(int) $resource->getId()] = array_shift($nodes);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the resource type of the provider
+     *
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return self::RESOURCE_TYPE;
+    }
 }

apps/files/lib/BackgroundJob/TransferOwnership.php

Indentation +137 added lines, -137 removed lines

@@ -42,141 +42,141 @@
 
 class TransferOwnership extends QueuedJob {
 
-	/** @var IUserManager $userManager */
-	private $userManager;
-
-	/** @var OwnershipTransferService */
-	private $transferService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var NotificationManager */
-	private $notificationManager;
-
-	/** @var TransferOwnershipMapper */
-	private $mapper;
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	public function __construct(ITimeFactory $timeFactory,
-								IUserManager $userManager,
-								OwnershipTransferService $transferService,
-								ILogger $logger,
-								NotificationManager $notificationManager,
-								TransferOwnershipMapper $mapper,
-								IRootFolder $rootFolder) {
-		parent::__construct($timeFactory);
-
-		$this->userManager = $userManager;
-		$this->transferService = $transferService;
-		$this->logger = $logger;
-		$this->notificationManager = $notificationManager;
-		$this->mapper = $mapper;
-		$this->rootFolder = $rootFolder;
-	}
-
-	protected function run($argument) {
-		$id = $argument['id'];
-
-		$transfer = $this->mapper->getById($id);
-		$sourceUser = $transfer->getSourceUser();
-		$destinationUser = $transfer->getTargetUser();
-		$fileId = $transfer->getFileId();
-
-		$userFolder = $this->rootFolder->getUserFolder($sourceUser);
-		$nodes = $userFolder->getById($fileId);
-
-		if (empty($nodes)) {
-			$this->logger->alert('Could not transfer ownership: Node not found');
-			$this->failedNotication($transfer);
-			return;
-		}
-		$path = $userFolder->getRelativePath($nodes[0]->getPath());
-
-		$sourceUserObject = $this->userManager->get($sourceUser);
-		$destinationUserObject = $this->userManager->get($destinationUser);
-
-		if (!$sourceUserObject instanceof IUser) {
-			$this->logger->alert('Could not transfer ownership: Unknown source user ' . $sourceUser);
-			$this->failedNotication($transfer);
-			return;
-		}
-
-		if (!$destinationUserObject instanceof IUser) {
-			$this->logger->alert("Unknown destination user $destinationUser");
-			$this->failedNotication($transfer);
-			return;
-		}
-
-		try {
-			$this->transferService->transfer(
-				$sourceUserObject,
-				$destinationUserObject,
-				ltrim($path, '/')
-			);
-			$this->successNotification($transfer);
-		} catch (TransferOwnershipException $e) {
-			$this->logger->logException($e);
-			$this->failedNotication($transfer);
-		}
-
-		$this->mapper->delete($transfer);
-	}
-
-	private function failedNotication(Transfer $transfer): void {
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getSourceUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipFailedSource', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getTargetUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipFailedTarget', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-	}
-
-	private function successNotification(Transfer $transfer): void {
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getSourceUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipDoneSource', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getTargetUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipDoneTarget', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-	}
+    /** @var IUserManager $userManager */
+    private $userManager;
+
+    /** @var OwnershipTransferService */
+    private $transferService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var NotificationManager */
+    private $notificationManager;
+
+    /** @var TransferOwnershipMapper */
+    private $mapper;
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    public function __construct(ITimeFactory $timeFactory,
+                                IUserManager $userManager,
+                                OwnershipTransferService $transferService,
+                                ILogger $logger,
+                                NotificationManager $notificationManager,
+                                TransferOwnershipMapper $mapper,
+                                IRootFolder $rootFolder) {
+        parent::__construct($timeFactory);
+
+        $this->userManager = $userManager;
+        $this->transferService = $transferService;
+        $this->logger = $logger;
+        $this->notificationManager = $notificationManager;
+        $this->mapper = $mapper;
+        $this->rootFolder = $rootFolder;
+    }
+
+    protected function run($argument) {
+        $id = $argument['id'];
+
+        $transfer = $this->mapper->getById($id);
+        $sourceUser = $transfer->getSourceUser();
+        $destinationUser = $transfer->getTargetUser();
+        $fileId = $transfer->getFileId();
+
+        $userFolder = $this->rootFolder->getUserFolder($sourceUser);
+        $nodes = $userFolder->getById($fileId);
+
+        if (empty($nodes)) {
+            $this->logger->alert('Could not transfer ownership: Node not found');
+            $this->failedNotication($transfer);
+            return;
+        }
+        $path = $userFolder->getRelativePath($nodes[0]->getPath());
+
+        $sourceUserObject = $this->userManager->get($sourceUser);
+        $destinationUserObject = $this->userManager->get($destinationUser);
+
+        if (!$sourceUserObject instanceof IUser) {
+            $this->logger->alert('Could not transfer ownership: Unknown source user ' . $sourceUser);
+            $this->failedNotication($transfer);
+            return;
+        }
+
+        if (!$destinationUserObject instanceof IUser) {
+            $this->logger->alert("Unknown destination user $destinationUser");
+            $this->failedNotication($transfer);
+            return;
+        }
+
+        try {
+            $this->transferService->transfer(
+                $sourceUserObject,
+                $destinationUserObject,
+                ltrim($path, '/')
+            );
+            $this->successNotification($transfer);
+        } catch (TransferOwnershipException $e) {
+            $this->logger->logException($e);
+            $this->failedNotication($transfer);
+        }
+
+        $this->mapper->delete($transfer);
+    }
+
+    private function failedNotication(Transfer $transfer): void {
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getSourceUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipFailedSource', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getTargetUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipFailedTarget', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+    }
+
+    private function successNotification(Transfer $transfer): void {
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getSourceUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipDoneSource', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getTargetUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipDoneTarget', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+    }
 }

apps/dav/lib/CalDAV/Integration/ExternalCalendar.php

Indentation +84 added lines, -84 removed lines

@@ -33,99 +33,99 @@
  */
 abstract class ExternalCalendar implements CalDAV\ICalendar, DAV\IProperties {
 
-	/** @var string */
-	private const PREFIX = 'app-generated';
+    /** @var string */
+    private const PREFIX = 'app-generated';
 
-	/**
-	 * @var string
-	 *
-	 * Double dash is a valid delimiter,
-	 * because it will always split the calendarURIs correctly:
-	 * - our prefix contains only one dash and won't be split
-	 * - appIds are not allowed to contain dashes as per spec:
-	 * > must contain only lowercase ASCII characters and underscore
-	 * - explode has a limit of three, so even if the app-generated
-	 *   calendar uri has double dashes, it won't be split
-	 */
-	private const DELIMITER = '--';
+    /**
+     * @var string
+     *
+     * Double dash is a valid delimiter,
+     * because it will always split the calendarURIs correctly:
+     * - our prefix contains only one dash and won't be split
+     * - appIds are not allowed to contain dashes as per spec:
+     * > must contain only lowercase ASCII characters and underscore
+     * - explode has a limit of three, so even if the app-generated
+     *   calendar uri has double dashes, it won't be split
+     */
+    private const DELIMITER = '--';
 
-	/** @var string */
-	private $appId;
+    /** @var string */
+    private $appId;
 
-	/** @var string */
-	private $calendarUri;
+    /** @var string */
+    private $calendarUri;
 
-	/**
-	 * ExternalCalendar constructor.
-	 *
-	 * @param string $appId
-	 * @param string $calendarUri
-	 */
-	public function __construct(string $appId, string $calendarUri) {
-		$this->appId = $appId;
-		$this->calendarUri = $calendarUri;
-	}
+    /**
+     * ExternalCalendar constructor.
+     *
+     * @param string $appId
+     * @param string $calendarUri
+     */
+    public function __construct(string $appId, string $calendarUri) {
+        $this->appId = $appId;
+        $this->calendarUri = $calendarUri;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function getName() {
-		return implode(self::DELIMITER, [
-			self::PREFIX,
-			$this->appId,
-			$this->calendarUri,
-		]);
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function getName() {
+        return implode(self::DELIMITER, [
+            self::PREFIX,
+            $this->appId,
+            $this->calendarUri,
+        ]);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function setName($name) {
-		throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function setName($name) {
+        throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function createDirectory($name) {
-		throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function createDirectory($name) {
+        throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
+    }
 
-	/**
-	 * Checks whether the calendar uri is app-generated
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function isAppGeneratedCalendar(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
-	}
+    /**
+     * Checks whether the calendar uri is app-generated
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function isAppGeneratedCalendar(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
+    }
 
-	/**
-	 * Splits an app-generated calendar-uri into appId and calendarUri
-	 *
-	 * @param string $calendarUri
-	 * @return array
-	 */
-	public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
-		$array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
-		// Check the array has expected amount of elements
-		// and none of them is an empty string
-		if (\count($array) !== 2 || \in_array('', $array, true)) {
-			throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
-		}
+    /**
+     * Splits an app-generated calendar-uri into appId and calendarUri
+     *
+     * @param string $calendarUri
+     * @return array
+     */
+    public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
+        $array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
+        // Check the array has expected amount of elements
+        // and none of them is an empty string
+        if (\count($array) !== 2 || \in_array('', $array, true)) {
+            throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	/**
-	 * Checks whether a calendar-name, the user wants to create, violates
-	 * the reserved name for calendar uris
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function doesViolateReservedName(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0;
-	}
+    /**
+     * Checks whether a calendar-name, the user wants to create, violates
+     * the reserved name for calendar uris
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function doesViolateReservedName(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0;
+    }
 }