nextcloud / server

lib/private/Security/TrustedDomainHelper.php

Indentation +63 added lines, -63 removed lines

@@ -35,73 +35,73 @@
  * @package OC\Security
  */
 class TrustedDomainHelper {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Strips a potential port from a domain (in format domain:port)
-	 * @param string $host
-	 * @return string $host without appended port
-	 */
-	private function getDomainWithoutPort($host) {
-		$pos = strrpos($host, ':');
-		if ($pos !== false) {
-			$port = substr($host, $pos + 1);
-			if (is_numeric($port)) {
-				$host = substr($host, 0, $pos);
-			}
-		}
-		return $host;
-	}
+    /**
+     * Strips a potential port from a domain (in format domain:port)
+     * @param string $host
+     * @return string $host without appended port
+     */
+    private function getDomainWithoutPort($host) {
+        $pos = strrpos($host, ':');
+        if ($pos !== false) {
+            $port = substr($host, $pos + 1);
+            if (is_numeric($port)) {
+                $host = substr($host, 0, $pos);
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * Checks whether a domain is considered as trusted from the list
-	 * of trusted domains. If no trusted domains have been configured, returns
-	 * true.
-	 * This is used to prevent Host Header Poisoning.
-	 * @param string $domainWithPort
-	 * @return bool true if the given domain is trusted or if no trusted domains
-	 * have been configured
-	 */
-	public function isTrustedDomain($domainWithPort) {
-		// overwritehost is always trusted
-		if ($this->config->getSystemValue('overwritehost') !== '') {
-			return true;
-		}
+    /**
+     * Checks whether a domain is considered as trusted from the list
+     * of trusted domains. If no trusted domains have been configured, returns
+     * true.
+     * This is used to prevent Host Header Poisoning.
+     * @param string $domainWithPort
+     * @return bool true if the given domain is trusted or if no trusted domains
+     * have been configured
+     */
+    public function isTrustedDomain($domainWithPort) {
+        // overwritehost is always trusted
+        if ($this->config->getSystemValue('overwritehost') !== '') {
+            return true;
+        }
 
-		$domain = $this->getDomainWithoutPort($domainWithPort);
+        $domain = $this->getDomainWithoutPort($domainWithPort);
 
-		// Read trusted domains from config
-		$trustedList = $this->config->getSystemValue('trusted_domains', []);
-		if (!is_array($trustedList)) {
-			return false;
-		}
+        // Read trusted domains from config
+        $trustedList = $this->config->getSystemValue('trusted_domains', []);
+        if (!is_array($trustedList)) {
+            return false;
+        }
 
-		// Always allow access from localhost
-		if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
-			return true;
-		}
-		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
-			return false;
-		}
-		// Match, allowing for * wildcards
-		foreach ($trustedList as $trusted) {
-			if (gettype($trusted) !== 'string') {
-				break;
-			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/i';
-			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // Always allow access from localhost
+        if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
+            return true;
+        }
+        // Reject misformed domains in any case
+        if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+            return false;
+        }
+        // Match, allowing for * wildcards
+        foreach ($trustedList as $trusted) {
+            if (gettype($trusted) !== 'string') {
+                break;
+            }
+            $regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/i';
+            if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 			return true;
 		}
 		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+		if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) {
 			return false;
 		}
 		// Match, allowing for * wildcards
@@ -97,7 +97,7 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/i';
+			$regex = '/^'.implode('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))).'$/i';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
 				return true;
 			}

lib/private/Share20/Manager.php

Indentation +1749 added lines, -1749 removed lines

@@ -77,1776 +77,1776 @@
  */
 class Manager implements IManager {
 
-	/** @var IProviderFactory */
-	private $factory;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IHasher */
-	private $hasher;
-	/** @var IMountManager */
-	private $mountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IL10N */
-	private $l;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var CappedMemoryCache */
-	private $sharingDisabledForUsersCache;
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-	/** @var LegacyHooks */
-	private $legacyHooks;
-	/** @var IMailer */
-	private $mailer;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var \OC_Defaults */
-	private $defaults;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-
-	/**
-	 * Manager constructor.
-	 *
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param IHasher $hasher
-	 * @param IMountManager $mountManager
-	 * @param IGroupManager $groupManager
-	 * @param IL10N $l
-	 * @param IFactory $l10nFactory
-	 * @param IProviderFactory $factory
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param IMailer $mailer
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(
-			ILogger $logger,
-			IConfig $config,
-			ISecureRandom $secureRandom,
-			IHasher $hasher,
-			IMountManager $mountManager,
-			IGroupManager $groupManager,
-			IL10N $l,
-			IFactory $l10nFactory,
-			IProviderFactory $factory,
-			IUserManager $userManager,
-			IRootFolder $rootFolder,
-			EventDispatcherInterface $legacyDispatcher,
-			IMailer $mailer,
-			IURLGenerator $urlGenerator,
-			\OC_Defaults $defaults,
-			IEventDispatcher $dispatcher
-	) {
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->secureRandom = $secureRandom;
-		$this->hasher = $hasher;
-		$this->mountManager = $mountManager;
-		$this->groupManager = $groupManager;
-		$this->l = $l;
-		$this->l10nFactory = $l10nFactory;
-		$this->factory = $factory;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->legacyDispatcher = $legacyDispatcher;
-		$this->sharingDisabledForUsersCache = new CappedMemoryCache();
-		$this->legacyHooks = new LegacyHooks($this->legacyDispatcher);
-		$this->mailer = $mailer;
-		$this->urlGenerator = $urlGenerator;
-		$this->defaults = $defaults;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Convert from a full share id to a tuple (providerId, shareId)
-	 *
-	 * @param string $id
-	 * @return string[]
-	 */
-	private function splitFullId($id) {
-		return explode(':', $id, 2);
-	}
-
-	/**
-	 * Verify if a password meets all requirements
-	 *
-	 * @param string $password
-	 * @throws \Exception
-	 */
-	protected function verifyPassword($password) {
-		if ($password === null) {
-			// No password is set, check if this is allowed.
-			if ($this->shareApiLinkEnforcePassword()) {
-				throw new \InvalidArgumentException('Passwords are enforced for link shares');
-			}
-
-			return;
-		}
-
-		// Let others verify the password
-		try {
-			$this->legacyDispatcher->dispatch(new ValidatePasswordPolicyEvent($password));
-		} catch (HintException $e) {
-			throw new \Exception($e->getHint());
-		}
-	}
-
-	/**
-	 * Check for generic requirements before creating a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws \InvalidArgumentException
-	 * @throws GenericShareException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function generalCreateChecks(\OCP\Share\IShare $share) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			// We expect a valid user as sharedWith for user shares
-			if (!$this->userManager->userExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException('SharedWith is not a valid user');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			// We expect a valid group as sharedWith for group shares
-			if (!$this->groupManager->groupExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException('SharedWith is not a valid group');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			if ($share->getSharedWith() !== null) {
-				throw new \InvalidArgumentException('SharedWith should be empty');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		}  else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
-			if ($circle === null) {
-				throw new \InvalidArgumentException('SharedWith is not a valid circle');
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_ROOM) {
-		} else {
-			// We can't handle other types yet
-			throw new \InvalidArgumentException('unknown share type');
-		}
-
-		// Verify the initiator of the share is set
-		if ($share->getSharedBy() === null) {
-			throw new \InvalidArgumentException('SharedBy should be set');
-		}
-
-		// Cannot share with yourself
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $share->getSharedBy()) {
-			throw new \InvalidArgumentException('Can’t share with yourself');
-		}
-
-		// The path should be set
-		if ($share->getNode() === null) {
-			throw new \InvalidArgumentException('Path should be set');
-		}
-
-		// And it should be a file or a folder
-		if (!($share->getNode() instanceof \OCP\Files\File) &&
-				!($share->getNode() instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException('Path should be either a file or a folder');
-		}
-
-		// And you can't share your rootfolder
-		if ($this->userManager->userExists($share->getSharedBy())) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			$userFolderPath = $userFolder->getPath();
-		} else {
-			$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			$userFolderPath = $userFolder->getPath();
-		}
-		if ($userFolderPath === $share->getNode()->getPath()) {
-			throw new \InvalidArgumentException('You can’t share your root folder');
-		}
-
-		// Check if we actually have share permissions
-		if (!$share->getNode()->isShareable()) {
-			$path = $userFolder->getRelativePath($share->getNode()->getPath());
-			$message_t = $this->l->t('You are not allowed to share %s', [$path]);
-			throw new GenericShareException($message_t, $message_t, 404);
-		}
-
-		// Permissions should be set
-		if ($share->getPermissions() === null) {
-			throw new \InvalidArgumentException('A share requires permissions');
-		}
-
-		$isFederatedShare = $share->getNode()->getStorage()->instanceOfStorage('\OCA\Files_Sharing\External\Storage');
-		$permissions = 0;
-		$mount = $share->getNode()->getMountPoint();
-		if (!$isFederatedShare && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
-			// When it's a reshare use the parent share permissions as maximum
-			$userMountPointId = $mount->getStorageRootId();
-			$userMountPoints = $userFolder->getById($userMountPointId);
-			$userMountPoint = array_shift($userMountPoints);
-
-			/* Check if this is an incoming share */
-			$incomingShares = $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_USER, $userMountPoint, -1, 0);
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_GROUP, $userMountPoint, -1, 0));
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_CIRCLE, $userMountPoint, -1, 0));
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_ROOM, $userMountPoint, -1, 0));
-
-			/** @var \OCP\Share\IShare[] $incomingShares */
-			if (!empty($incomingShares)) {
-				foreach ($incomingShares as $incomingShare) {
-					$permissions |= $incomingShare->getPermissions();
-				}
-			}
-		} else {
-			/*
+    /** @var IProviderFactory */
+    private $factory;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IHasher */
+    private $hasher;
+    /** @var IMountManager */
+    private $mountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IL10N */
+    private $l;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var CappedMemoryCache */
+    private $sharingDisabledForUsersCache;
+    /** @var EventDispatcherInterface */
+    private $legacyDispatcher;
+    /** @var LegacyHooks */
+    private $legacyHooks;
+    /** @var IMailer */
+    private $mailer;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var \OC_Defaults */
+    private $defaults;
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+
+    /**
+     * Manager constructor.
+     *
+     * @param ILogger $logger
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param IHasher $hasher
+     * @param IMountManager $mountManager
+     * @param IGroupManager $groupManager
+     * @param IL10N $l
+     * @param IFactory $l10nFactory
+     * @param IProviderFactory $factory
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param IMailer $mailer
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(
+            ILogger $logger,
+            IConfig $config,
+            ISecureRandom $secureRandom,
+            IHasher $hasher,
+            IMountManager $mountManager,
+            IGroupManager $groupManager,
+            IL10N $l,
+            IFactory $l10nFactory,
+            IProviderFactory $factory,
+            IUserManager $userManager,
+            IRootFolder $rootFolder,
+            EventDispatcherInterface $legacyDispatcher,
+            IMailer $mailer,
+            IURLGenerator $urlGenerator,
+            \OC_Defaults $defaults,
+            IEventDispatcher $dispatcher
+    ) {
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->secureRandom = $secureRandom;
+        $this->hasher = $hasher;
+        $this->mountManager = $mountManager;
+        $this->groupManager = $groupManager;
+        $this->l = $l;
+        $this->l10nFactory = $l10nFactory;
+        $this->factory = $factory;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->legacyDispatcher = $legacyDispatcher;
+        $this->sharingDisabledForUsersCache = new CappedMemoryCache();
+        $this->legacyHooks = new LegacyHooks($this->legacyDispatcher);
+        $this->mailer = $mailer;
+        $this->urlGenerator = $urlGenerator;
+        $this->defaults = $defaults;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Convert from a full share id to a tuple (providerId, shareId)
+     *
+     * @param string $id
+     * @return string[]
+     */
+    private function splitFullId($id) {
+        return explode(':', $id, 2);
+    }
+
+    /**
+     * Verify if a password meets all requirements
+     *
+     * @param string $password
+     * @throws \Exception
+     */
+    protected function verifyPassword($password) {
+        if ($password === null) {
+            // No password is set, check if this is allowed.
+            if ($this->shareApiLinkEnforcePassword()) {
+                throw new \InvalidArgumentException('Passwords are enforced for link shares');
+            }
+
+            return;
+        }
+
+        // Let others verify the password
+        try {
+            $this->legacyDispatcher->dispatch(new ValidatePasswordPolicyEvent($password));
+        } catch (HintException $e) {
+            throw new \Exception($e->getHint());
+        }
+    }
+
+    /**
+     * Check for generic requirements before creating a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws \InvalidArgumentException
+     * @throws GenericShareException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function generalCreateChecks(\OCP\Share\IShare $share) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            // We expect a valid user as sharedWith for user shares
+            if (!$this->userManager->userExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException('SharedWith is not a valid user');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            // We expect a valid group as sharedWith for group shares
+            if (!$this->groupManager->groupExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException('SharedWith is not a valid group');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            if ($share->getSharedWith() !== null) {
+                throw new \InvalidArgumentException('SharedWith should be empty');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        }  else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
+            if ($circle === null) {
+                throw new \InvalidArgumentException('SharedWith is not a valid circle');
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_ROOM) {
+        } else {
+            // We can't handle other types yet
+            throw new \InvalidArgumentException('unknown share type');
+        }
+
+        // Verify the initiator of the share is set
+        if ($share->getSharedBy() === null) {
+            throw new \InvalidArgumentException('SharedBy should be set');
+        }
+
+        // Cannot share with yourself
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $share->getSharedBy()) {
+            throw new \InvalidArgumentException('Can’t share with yourself');
+        }
+
+        // The path should be set
+        if ($share->getNode() === null) {
+            throw new \InvalidArgumentException('Path should be set');
+        }
+
+        // And it should be a file or a folder
+        if (!($share->getNode() instanceof \OCP\Files\File) &&
+                !($share->getNode() instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException('Path should be either a file or a folder');
+        }
+
+        // And you can't share your rootfolder
+        if ($this->userManager->userExists($share->getSharedBy())) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            $userFolderPath = $userFolder->getPath();
+        } else {
+            $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            $userFolderPath = $userFolder->getPath();
+        }
+        if ($userFolderPath === $share->getNode()->getPath()) {
+            throw new \InvalidArgumentException('You can’t share your root folder');
+        }
+
+        // Check if we actually have share permissions
+        if (!$share->getNode()->isShareable()) {
+            $path = $userFolder->getRelativePath($share->getNode()->getPath());
+            $message_t = $this->l->t('You are not allowed to share %s', [$path]);
+            throw new GenericShareException($message_t, $message_t, 404);
+        }
+
+        // Permissions should be set
+        if ($share->getPermissions() === null) {
+            throw new \InvalidArgumentException('A share requires permissions');
+        }
+
+        $isFederatedShare = $share->getNode()->getStorage()->instanceOfStorage('\OCA\Files_Sharing\External\Storage');
+        $permissions = 0;
+        $mount = $share->getNode()->getMountPoint();
+        if (!$isFederatedShare && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
+            // When it's a reshare use the parent share permissions as maximum
+            $userMountPointId = $mount->getStorageRootId();
+            $userMountPoints = $userFolder->getById($userMountPointId);
+            $userMountPoint = array_shift($userMountPoints);
+
+            /* Check if this is an incoming share */
+            $incomingShares = $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_USER, $userMountPoint, -1, 0);
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_GROUP, $userMountPoint, -1, 0));
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_CIRCLE, $userMountPoint, -1, 0));
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_ROOM, $userMountPoint, -1, 0));
+
+            /** @var \OCP\Share\IShare[] $incomingShares */
+            if (!empty($incomingShares)) {
+                foreach ($incomingShares as $incomingShare) {
+                    $permissions |= $incomingShare->getPermissions();
+                }
+            }
+        } else {
+            /*
 			 * Quick fix for #23536
 			 * Non moveable mount points do not have update and delete permissions
 			 * while we 'most likely' do have that on the storage.
 			 */
-			$permissions = $share->getNode()->getPermissions();
-			if (!($mount instanceof MoveableMount)) {
-				$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
-			}
-		}
-
-		// Check that we do not share with more permissions than we have
-		if ($share->getPermissions() & ~$permissions) {
-			$path = $userFolder->getRelativePath($share->getNode()->getPath());
-			$message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
-			throw new GenericShareException($message_t, $message_t, 404);
-		}
-
-
-		// Check that read permissions are always set
-		// Link shares are allowed to have no read permissions to allow upload to hidden folders
-		$noReadPermissionRequired = $share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
-			|| $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL;
-		if (!$noReadPermissionRequired &&
-			($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
-			throw new \InvalidArgumentException('Shares need at least read permissions');
-		}
-
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				$message_t = $this->l->t('Files can’t be shared with delete permissions');
-				throw new GenericShareException($message_t);
-			}
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				$message_t = $this->l->t('Files can’t be shared with create permissions');
-				throw new GenericShareException($message_t);
-			}
-		}
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param \OCP\Share\IShare $share The share to validate the expiration date of
-	 * @return \OCP\Share\IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDateInternal(\OCP\Share\IShare $share) {
-		$expirationDate = $share->getExpirationDate();
-
-		if ($expirationDate !== null) {
-			//Make sure the expiration date is a date
-			$expirationDate->setTime(0, 0, 0);
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			if ($date >= $expirationDate) {
-				$message = $this->l->t('Expiration date is in the past');
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		// If expiredate is empty set a default one if there is a default
-		$fullId = null;
-		try {
-			$fullId = $share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			// This is a new share
-		}
-
-		if ($fullId === null && $expirationDate === null && $this->shareApiInternalDefaultExpireDate()) {
-			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
-			$expirationDate->add(new \DateInterval('P'.$this->shareApiInternalDefaultExpireDays().'D'));
-		}
-
-		// If we enforce the expiration date check that is does not exceed
-		if ($this->shareApiInternalDefaultExpireDateEnforced()) {
-			if ($expirationDate === null) {
-				throw new \InvalidArgumentException('Expiration date is enforced');
-			}
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiInternalDefaultExpireDays() . 'D'));
-			if ($date < $expirationDate) {
-				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiInternalDefaultExpireDays()]);
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param \OCP\Share\IShare $share The share to validate the expiration date of
-	 * @return \OCP\Share\IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDate(\OCP\Share\IShare $share) {
-
-		$expirationDate = $share->getExpirationDate();
-
-		if ($expirationDate !== null) {
-			//Make sure the expiration date is a date
-			$expirationDate->setTime(0, 0, 0);
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			if ($date >= $expirationDate) {
-				$message = $this->l->t('Expiration date is in the past');
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		// If expiredate is empty set a default one if there is a default
-		$fullId = null;
-		try {
-			$fullId = $share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			// This is a new share
-		}
-
-		if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
-			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
-			$expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
-		}
-
-		// If we enforce the expiration date check that is does not exceed
-		if ($this->shareApiLinkDefaultExpireDateEnforced()) {
-			if ($expirationDate === null) {
-				throw new \InvalidArgumentException('Expiration date is enforced');
-			}
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
-			if ($date < $expirationDate) {
-				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Check for pre share requirements for user shares
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws \Exception
-	 */
-	protected function userCreateChecks(\OCP\Share\IShare $share) {
-		// Check if we can share with group members only
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			// Verify we can share with this user
-			$groups = array_intersect(
-					$this->groupManager->getUserGroupIds($sharedBy),
-					$this->groupManager->getUserGroupIds($sharedWith)
-			);
-			if (empty($groups)) {
-				throw new \Exception('Sharing is only allowed with group members');
-			}
-		}
-
-		/*
+            $permissions = $share->getNode()->getPermissions();
+            if (!($mount instanceof MoveableMount)) {
+                $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+            }
+        }
+
+        // Check that we do not share with more permissions than we have
+        if ($share->getPermissions() & ~$permissions) {
+            $path = $userFolder->getRelativePath($share->getNode()->getPath());
+            $message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
+            throw new GenericShareException($message_t, $message_t, 404);
+        }
+
+
+        // Check that read permissions are always set
+        // Link shares are allowed to have no read permissions to allow upload to hidden folders
+        $noReadPermissionRequired = $share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
+            || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL;
+        if (!$noReadPermissionRequired &&
+            ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
+            throw new \InvalidArgumentException('Shares need at least read permissions');
+        }
+
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                $message_t = $this->l->t('Files can’t be shared with delete permissions');
+                throw new GenericShareException($message_t);
+            }
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                $message_t = $this->l->t('Files can’t be shared with create permissions');
+                throw new GenericShareException($message_t);
+            }
+        }
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param \OCP\Share\IShare $share The share to validate the expiration date of
+     * @return \OCP\Share\IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDateInternal(\OCP\Share\IShare $share) {
+        $expirationDate = $share->getExpirationDate();
+
+        if ($expirationDate !== null) {
+            //Make sure the expiration date is a date
+            $expirationDate->setTime(0, 0, 0);
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            if ($date >= $expirationDate) {
+                $message = $this->l->t('Expiration date is in the past');
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        // If expiredate is empty set a default one if there is a default
+        $fullId = null;
+        try {
+            $fullId = $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            // This is a new share
+        }
+
+        if ($fullId === null && $expirationDate === null && $this->shareApiInternalDefaultExpireDate()) {
+            $expirationDate = new \DateTime();
+            $expirationDate->setTime(0,0,0);
+            $expirationDate->add(new \DateInterval('P'.$this->shareApiInternalDefaultExpireDays().'D'));
+        }
+
+        // If we enforce the expiration date check that is does not exceed
+        if ($this->shareApiInternalDefaultExpireDateEnforced()) {
+            if ($expirationDate === null) {
+                throw new \InvalidArgumentException('Expiration date is enforced');
+            }
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            $date->add(new \DateInterval('P' . $this->shareApiInternalDefaultExpireDays() . 'D'));
+            if ($date < $expirationDate) {
+                $message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiInternalDefaultExpireDays()]);
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param \OCP\Share\IShare $share The share to validate the expiration date of
+     * @return \OCP\Share\IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDate(\OCP\Share\IShare $share) {
+
+        $expirationDate = $share->getExpirationDate();
+
+        if ($expirationDate !== null) {
+            //Make sure the expiration date is a date
+            $expirationDate->setTime(0, 0, 0);
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            if ($date >= $expirationDate) {
+                $message = $this->l->t('Expiration date is in the past');
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        // If expiredate is empty set a default one if there is a default
+        $fullId = null;
+        try {
+            $fullId = $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            // This is a new share
+        }
+
+        if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
+            $expirationDate = new \DateTime();
+            $expirationDate->setTime(0,0,0);
+            $expirationDate->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
+        }
+
+        // If we enforce the expiration date check that is does not exceed
+        if ($this->shareApiLinkDefaultExpireDateEnforced()) {
+            if ($expirationDate === null) {
+                throw new \InvalidArgumentException('Expiration date is enforced');
+            }
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            $date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
+            if ($date < $expirationDate) {
+                $message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Check for pre share requirements for user shares
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws \Exception
+     */
+    protected function userCreateChecks(\OCP\Share\IShare $share) {
+        // Check if we can share with group members only
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            // Verify we can share with this user
+            $groups = array_intersect(
+                    $this->groupManager->getUserGroupIds($sharedBy),
+                    $this->groupManager->getUserGroupIds($sharedWith)
+            );
+            if (empty($groups)) {
+                throw new \Exception('Sharing is only allowed with group members');
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_USER);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach($existingShares as $existingShare) {
-			// Ignore if it is the same share
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//Shares are not identical
-			}
-
-			// Identical share already existst
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new \Exception('Path is already shared with this user');
-			}
-
-			// The share is already shared with this user via a group share
-			if ($existingShare->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-				$group = $this->groupManager->get($existingShare->getSharedWith());
-				if (!is_null($group)) {
-					$user = $this->userManager->get($share->getSharedWith());
-
-					if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
-						throw new \Exception('Path is already shared with this user');
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for group shares
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws \Exception
-	 */
-	protected function groupCreateChecks(\OCP\Share\IShare $share) {
-		// Verify group shares are allowed
-		if (!$this->allowGroupSharing()) {
-			throw new \Exception('Group sharing is now allowed');
-		}
-
-		// Verify if the user can share with this group
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (is_null($sharedWith) || !$sharedWith->inGroup($sharedBy)) {
-				throw new \Exception('Sharing is only allowed within your own groups');
-			}
-		}
-
-		/*
+        $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_USER);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach($existingShares as $existingShare) {
+            // Ignore if it is the same share
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //Shares are not identical
+            }
+
+            // Identical share already existst
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new \Exception('Path is already shared with this user');
+            }
+
+            // The share is already shared with this user via a group share
+            if ($existingShare->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+                $group = $this->groupManager->get($existingShare->getSharedWith());
+                if (!is_null($group)) {
+                    $user = $this->userManager->get($share->getSharedWith());
+
+                    if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
+                        throw new \Exception('Path is already shared with this user');
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for group shares
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws \Exception
+     */
+    protected function groupCreateChecks(\OCP\Share\IShare $share) {
+        // Verify group shares are allowed
+        if (!$this->allowGroupSharing()) {
+            throw new \Exception('Group sharing is now allowed');
+        }
+
+        // Verify if the user can share with this group
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            if (is_null($sharedWith) || !$sharedWith->inGroup($sharedBy)) {
+                throw new \Exception('Sharing is only allowed within your own groups');
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach($existingShares as $existingShare) {
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//It is a new share so just continue
-			}
-
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new \Exception('Path is already shared with this group');
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for link shares
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws \Exception
-	 */
-	protected function linkCreateChecks(\OCP\Share\IShare $share) {
-		// Are link shares allowed?
-		if (!$this->shareApiAllowLinks()) {
-			throw new \Exception('Link sharing is not allowed');
-		}
-
-		// Link shares by definition can't have share permissions
-		if ($share->getPermissions() & \OCP\Constants::PERMISSION_SHARE) {
-			throw new \InvalidArgumentException('Link shares can’t have reshare permissions');
-		}
-
-		// Check if public upload is allowed
-		if (!$this->shareApiLinkAllowPublicUpload() &&
-			($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
-			throw new \InvalidArgumentException('Public upload is not allowed');
-		}
-	}
-
-	/**
-	 * To make sure we don't get invisible link shares we set the parent
-	 * of a link if it is a reshare. This is a quick word around
-	 * until we can properly display multiple link shares in the UI
-	 *
-	 * See: https://github.com/owncloud/core/issues/22295
-	 *
-	 * FIXME: Remove once multiple link shares can be properly displayed
-	 *
-	 * @param \OCP\Share\IShare $share
-	 */
-	protected function setLinkParent(\OCP\Share\IShare $share) {
-
-		// No sense in checking if the method is not there.
-		if (method_exists($share, 'setParent')) {
-			$storage = $share->getNode()->getStorage();
-			if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
-				/** @var \OCA\Files_Sharing\SharedStorage $storage */
-				$share->setParent($storage->getShareId());
-			}
-		}
-	}
-
-	/**
-	 * @param File|Folder $path
-	 */
-	protected function pathCreateChecks($path) {
-		// Make sure that we do not share a path that contains a shared mountpoint
-		if ($path instanceof \OCP\Files\Folder) {
-			$mounts = $this->mountManager->findIn($path->getPath());
-			foreach($mounts as $mount) {
-				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
-					throw new \InvalidArgumentException('Path contains files shared with you');
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the user that is sharing can actually share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws \Exception
-	 */
-	protected function canShare(\OCP\Share\IShare $share) {
-		if (!$this->shareApiEnabled()) {
-			throw new \Exception('Sharing is disabled');
-		}
-
-		if ($this->sharingDisabledForUser($share->getSharedBy())) {
-			throw new \Exception('Sharing is disabled for you');
-		}
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return Share The share object
-	 * @throws \Exception
-	 *
-	 * TODO: handle link share permissions or check them
-	 */
-	public function createShare(\OCP\Share\IShare $share) {
-		$this->canShare($share);
-
-		$this->generalCreateChecks($share);
-
-		// Verify if there are any issues with the path
-		$this->pathCreateChecks($share->getNode());
-
-		/*
+        $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach($existingShares as $existingShare) {
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //It is a new share so just continue
+            }
+
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new \Exception('Path is already shared with this group');
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for link shares
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws \Exception
+     */
+    protected function linkCreateChecks(\OCP\Share\IShare $share) {
+        // Are link shares allowed?
+        if (!$this->shareApiAllowLinks()) {
+            throw new \Exception('Link sharing is not allowed');
+        }
+
+        // Link shares by definition can't have share permissions
+        if ($share->getPermissions() & \OCP\Constants::PERMISSION_SHARE) {
+            throw new \InvalidArgumentException('Link shares can’t have reshare permissions');
+        }
+
+        // Check if public upload is allowed
+        if (!$this->shareApiLinkAllowPublicUpload() &&
+            ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
+            throw new \InvalidArgumentException('Public upload is not allowed');
+        }
+    }
+
+    /**
+     * To make sure we don't get invisible link shares we set the parent
+     * of a link if it is a reshare. This is a quick word around
+     * until we can properly display multiple link shares in the UI
+     *
+     * See: https://github.com/owncloud/core/issues/22295
+     *
+     * FIXME: Remove once multiple link shares can be properly displayed
+     *
+     * @param \OCP\Share\IShare $share
+     */
+    protected function setLinkParent(\OCP\Share\IShare $share) {
+
+        // No sense in checking if the method is not there.
+        if (method_exists($share, 'setParent')) {
+            $storage = $share->getNode()->getStorage();
+            if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+                /** @var \OCA\Files_Sharing\SharedStorage $storage */
+                $share->setParent($storage->getShareId());
+            }
+        }
+    }
+
+    /**
+     * @param File|Folder $path
+     */
+    protected function pathCreateChecks($path) {
+        // Make sure that we do not share a path that contains a shared mountpoint
+        if ($path instanceof \OCP\Files\Folder) {
+            $mounts = $this->mountManager->findIn($path->getPath());
+            foreach($mounts as $mount) {
+                if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+                    throw new \InvalidArgumentException('Path contains files shared with you');
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the user that is sharing can actually share
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws \Exception
+     */
+    protected function canShare(\OCP\Share\IShare $share) {
+        if (!$this->shareApiEnabled()) {
+            throw new \Exception('Sharing is disabled');
+        }
+
+        if ($this->sharingDisabledForUser($share->getSharedBy())) {
+            throw new \Exception('Sharing is disabled for you');
+        }
+    }
+
+    /**
+     * Share a path
+     *
+     * @param \OCP\Share\IShare $share
+     * @return Share The share object
+     * @throws \Exception
+     *
+     * TODO: handle link share permissions or check them
+     */
+    public function createShare(\OCP\Share\IShare $share) {
+        $this->canShare($share);
+
+        $this->generalCreateChecks($share);
+
+        // Verify if there are any issues with the path
+        $this->pathCreateChecks($share->getNode());
+
+        /*
 		 * On creation of a share the owner is always the owner of the path
 		 * Except for mounted federated shares.
 		 */
-		$storage = $share->getNode()->getStorage();
-		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-			$parent = $share->getNode()->getParent();
-			while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-				$parent = $parent->getParent();
-			}
-			$share->setShareOwner($parent->getOwner()->getUID());
-		} else {
-			$share->setShareOwner($share->getNode()->getOwner()->getUID());
-		}
-
-		//Verify share type
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$this->userCreateChecks($share);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDateInternal($share);
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$this->groupCreateChecks($share);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDateInternal($share);
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$this->linkCreateChecks($share);
-			$this->setLinkParent($share);
-
-			/*
+        $storage = $share->getNode()->getStorage();
+        if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+            $parent = $share->getNode()->getParent();
+            while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+                $parent = $parent->getParent();
+            }
+            $share->setShareOwner($parent->getOwner()->getUID());
+        } else {
+            $share->setShareOwner($share->getNode()->getOwner()->getUID());
+        }
+
+        //Verify share type
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $this->userCreateChecks($share);
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDateInternal($share);
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $this->groupCreateChecks($share);
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDateInternal($share);
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $this->linkCreateChecks($share);
+            $this->setLinkParent($share);
+
+            /*
 			 * For now ignore a set token.
 			 */
-			$share->setToken(
-				$this->secureRandom->generate(
-					\OC\Share\Constants::TOKEN_LENGTH,
-					\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
-				)
-			);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDate($share);
-
-			//Verify the password
-			$this->verifyPassword($share->getPassword());
-
-			// If a password is set. Hash it!
-			if ($share->getPassword() !== null) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$share->setToken(
-				$this->secureRandom->generate(
-					\OC\Share\Constants::TOKEN_LENGTH,
-					\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
-				)
-			);
-		}
-
-		// Cannot share with the owner
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $share->getShareOwner()) {
-			throw new \InvalidArgumentException('Can’t share with the share owner');
-		}
-
-		// Generate the target
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
-		$target = \OC\Files\Filesystem::normalizePath($target);
-		$share->setTarget($target);
-
-		// Pre share event
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::preShare', $event);
-		if ($event->isPropagationStopped() && $event->hasArgument('error')) {
-			throw new \Exception($event->getArgument('error'));
-		}
-
-		$oldShare = $share;
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		$share = $provider->create($share);
-		//reuse the node we already have
-		$share->setNode($oldShare->getNode());
-
-		// Reset the target if it is null for the new share
-		if ($share->getTarget() === '') {
-			$share->setTarget($target);
-		}
-
-		// Post share event
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postShare', $event);
-
-		$this->dispatcher->dispatchTyped(new Share\Events\ShareCreatedEvent($share));
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$mailSend = $share->getMailSend();
-			if($mailSend === true) {
-				$user = $this->userManager->get($share->getSharedWith());
-				if ($user !== null) {
-					$emailAddress = $user->getEMailAddress();
-					if ($emailAddress !== null && $emailAddress !== '') {
-						$userLang = $this->config->getUserValue($share->getSharedWith(), 'core', 'lang', null);
-						$l = $this->l10nFactory->get('lib', $userLang);
-						$this->sendMailNotification(
-							$l,
-							$share->getNode()->getName(),
-							$this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
-							$share->getSharedBy(),
-							$emailAddress,
-							$share->getExpirationDate()
-						);
-						$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
-					} else {
-						$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
-					}
-				} else {
-					$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
-				}
-			} else {
-				$this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
-			}
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Send mail notifications
-	 *
-	 * This method will catch and log mail transmission errors
-	 *
-	 * @param IL10N $l Language of the recipient
-	 * @param string $filename file/folder name
-	 * @param string $link link to the file/folder
-	 * @param string $initiator user ID of share sender
-	 * @param string $shareWith email address of share receiver
-	 * @param \DateTime|null $expiration
-	 */
-	protected function sendMailNotification(IL10N $l,
-											$filename,
-											$link,
-											$initiator,
-											$shareWith,
-											\DateTime $expiration = null) {
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
-		$text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
-			$text
-		);
-		$emailTemplate->addBodyButton(
-			$l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		$message->setTo([$shareWith]);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		$initiatorEmail = $initiatorUser->getEMailAddress();
-		if($initiatorEmail !== null) {
-			$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		try {
-			$failedRecipients = $this->mailer->send($message);
-			if(!empty($failedRecipients)) {
-				$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
-				return;
-			}
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['message' => 'Share notification mail could not be sent']);
-		}
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws \InvalidArgumentException
-	 */
-	public function updateShare(\OCP\Share\IShare $share) {
-		$expirationDateUpdated = false;
-
-		$this->canShare($share);
-
-		try {
-			$originalShare = $this->getShareById($share->getFullId());
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException('Share does not have a full id');
-		}
-
-		// We can't change the share type!
-		if ($share->getShareType() !== $originalShare->getShareType()) {
-			throw new \InvalidArgumentException('Can’t change share type');
-		}
-
-		// We can only change the recipient on user shares
-		if ($share->getSharedWith() !== $originalShare->getSharedWith() &&
-			$share->getShareType() !== \OCP\Share::SHARE_TYPE_USER) {
-			throw new \InvalidArgumentException('Can only update recipient on user shares');
-		}
-
-		// Cannot share with the owner
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $share->getShareOwner()) {
-			throw new \InvalidArgumentException('Can’t share with the share owner');
-		}
-
-		$this->generalCreateChecks($share);
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$this->userCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$this->groupCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$this->linkCreateChecks($share);
-
-			$this->updateSharePasswordIfNeeded($share, $originalShare);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			// The new password is not set again if it is the same as the old
-			// one, unless when switching from sending by Talk to sending by
-			// mail.
-			$plainTextPassword = $share->getPassword();
-			if (!empty($plainTextPassword) && !$this->updateSharePasswordIfNeeded($share, $originalShare) &&
-					!($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk())) {
-				$plainTextPassword = null;
-			}
-			if (empty($plainTextPassword) && !$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
-				// If the same password was already sent by mail the recipient
-				// would already have access to the share without having to call
-				// the sharer to verify her identity
-				throw new \InvalidArgumentException('Can’t enable sending the password by Talk without setting a new password');
-			}
-		}
-
-		$this->pathCreateChecks($share->getNode());
-
-		// Now update the share!
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$share = $provider->update($share, $plainTextPassword);
-		} else {
-			$share = $provider->update($share);
-		}
-
-		if ($expirationDateUpdated === true) {
-			\OC_Hook::emit(Share::class, 'post_set_expiration_date', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'date' => $share->getExpirationDate(),
-				'uidOwner' => $share->getSharedBy(),
-			]);
-		}
-
-		if ($share->getPassword() !== $originalShare->getPassword()) {
-			\OC_Hook::emit(Share::class, 'post_update_password', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'uidOwner' => $share->getSharedBy(),
-				'token' => $share->getToken(),
-				'disabled' => is_null($share->getPassword()),
-			]);
-		}
-
-		if ($share->getPermissions() !== $originalShare->getPermissions()) {
-			if ($this->userManager->userExists($share->getShareOwner())) {
-				$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			}
-			\OC_Hook::emit(Share::class, 'post_update_permissions', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'shareType' => $share->getShareType(),
-				'shareWith' => $share->getSharedWith(),
-				'uidOwner' => $share->getSharedBy(),
-				'permissions' => $share->getPermissions(),
-				'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
-			]);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipientId): IShare {
-		[$providerId, ] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		if (!method_exists($provider, 'acceptShare')) {
-			// TODO FIX ME
-			throw new \InvalidArgumentException('Share provider does not support accepting');
-		}
-		$provider->acceptShare($share, $recipientId);
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postAcceptShare', $event);
-
-		return $share;
-	}
-
-	/**
-	 * Updates the password of the given share if it is not the same as the
-	 * password of the original share.
-	 *
-	 * @param \OCP\Share\IShare $share the share to update its password.
-	 * @param \OCP\Share\IShare $originalShare the original share to compare its
-	 *        password with.
-	 * @return boolean whether the password was updated or not.
-	 */
-	private function updateSharePasswordIfNeeded(\OCP\Share\IShare $share, \OCP\Share\IShare $originalShare) {
-		// Password updated.
-		if ($share->getPassword() !== $originalShare->getPassword()) {
-			//Verify the password
-			$this->verifyPassword($share->getPassword());
-
-			// If a password is set. Hash it!
-			if ($share->getPassword() !== null) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Delete all the children of this share
-	 * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare[] List of deleted shares
-	 */
-	protected function deleteChildren(\OCP\Share\IShare $share) {
-		$deletedShares = [];
-
-		$provider = $this->factory->getProviderForType($share->getShareType());
-
-		foreach ($provider->getChildren($share) as $child) {
-			$deletedChildren = $this->deleteChildren($child);
-			$deletedShares = array_merge($deletedShares, $deletedChildren);
-
-			$provider->delete($child);
-			$deletedShares[] = $child;
-		}
-
-		return $deletedShares;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @throws ShareNotFound
-	 * @throws \InvalidArgumentException
-	 */
-	public function deleteShare(\OCP\Share\IShare $share) {
-
-		try {
-			$share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException('Share does not have a full id');
-		}
-
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::preUnshare', $event);
-
-		// Get all children and delete them as well
-		$deletedShares = $this->deleteChildren($share);
-
-		// Do the actual delete
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		$provider->delete($share);
-
-		// All the deleted shares caused by this delete
-		$deletedShares[] = $share;
-
-		// Emit post hook
-		$event->setArgument('deletedShares', $deletedShares);
-		$this->legacyDispatcher->dispatch('OCP\Share::postUnshare', $event);
-	}
-
-
-	/**
-	 * Unshare a file as the recipient.
-	 * This can be different from a regular delete for example when one of
-	 * the users in a groups deletes that share. But the provider should
-	 * handle this.
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string $recipientId
-	 */
-	public function deleteFromSelf(\OCP\Share\IShare $share, $recipientId) {
-		list($providerId, ) = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		$provider->deleteFromSelf($share, $recipientId);
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postUnshareFromSelf', $event);
-	}
-
-	public function restoreShare(IShare $share, string $recipientId): IShare {
-		list($providerId, ) = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		return $provider->restore($share, $recipientId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function moveShare(\OCP\Share\IShare $share, $recipientId) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			throw new \InvalidArgumentException('Can’t change target of link share');
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() !== $recipientId) {
-			throw new \InvalidArgumentException('Invalid recipient');
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (is_null($sharedWith)) {
-				throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-			$recipient = $this->userManager->get($recipientId);
-			if (!$sharedWith->inGroup($recipient)) {
-				throw new \InvalidArgumentException('Invalid recipient');
-			}
-		}
-
-		list($providerId, ) = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		$provider->move($share, $recipientId);
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares = false) {
-		$providers = $this->factory->getAllProviders();
-
-		return array_reduce($providers, function($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
-			$newShares = $provider->getSharesInFolder($userId, $node, $reshares);
-			foreach ($newShares as $fid => $data) {
-				if (!isset($shares[$fid])) {
-					$shares[$fid] = [];
-				}
-
-				$shares[$fid] = array_merge($shares[$fid], $data);
-			}
-			return $shares;
-		}, []);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0) {
-		if ($path !== null &&
-				!($path instanceof \OCP\Files\File) &&
-				!($path instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException('invalid path');
-		}
-
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-
-		/*
+            $share->setToken(
+                $this->secureRandom->generate(
+                    \OC\Share\Constants::TOKEN_LENGTH,
+                    \OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
+                )
+            );
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDate($share);
+
+            //Verify the password
+            $this->verifyPassword($share->getPassword());
+
+            // If a password is set. Hash it!
+            if ($share->getPassword() !== null) {
+                $share->setPassword($this->hasher->hash($share->getPassword()));
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $share->setToken(
+                $this->secureRandom->generate(
+                    \OC\Share\Constants::TOKEN_LENGTH,
+                    \OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
+                )
+            );
+        }
+
+        // Cannot share with the owner
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $share->getShareOwner()) {
+            throw new \InvalidArgumentException('Can’t share with the share owner');
+        }
+
+        // Generate the target
+        $target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
+        $target = \OC\Files\Filesystem::normalizePath($target);
+        $share->setTarget($target);
+
+        // Pre share event
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::preShare', $event);
+        if ($event->isPropagationStopped() && $event->hasArgument('error')) {
+            throw new \Exception($event->getArgument('error'));
+        }
+
+        $oldShare = $share;
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        $share = $provider->create($share);
+        //reuse the node we already have
+        $share->setNode($oldShare->getNode());
+
+        // Reset the target if it is null for the new share
+        if ($share->getTarget() === '') {
+            $share->setTarget($target);
+        }
+
+        // Post share event
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postShare', $event);
+
+        $this->dispatcher->dispatchTyped(new Share\Events\ShareCreatedEvent($share));
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $mailSend = $share->getMailSend();
+            if($mailSend === true) {
+                $user = $this->userManager->get($share->getSharedWith());
+                if ($user !== null) {
+                    $emailAddress = $user->getEMailAddress();
+                    if ($emailAddress !== null && $emailAddress !== '') {
+                        $userLang = $this->config->getUserValue($share->getSharedWith(), 'core', 'lang', null);
+                        $l = $this->l10nFactory->get('lib', $userLang);
+                        $this->sendMailNotification(
+                            $l,
+                            $share->getNode()->getName(),
+                            $this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
+                            $share->getSharedBy(),
+                            $emailAddress,
+                            $share->getExpirationDate()
+                        );
+                        $this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
+                    } else {
+                        $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
+                    }
+                } else {
+                    $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
+                }
+            } else {
+                $this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
+            }
+        }
+
+        return $share;
+    }
+
+    /**
+     * Send mail notifications
+     *
+     * This method will catch and log mail transmission errors
+     *
+     * @param IL10N $l Language of the recipient
+     * @param string $filename file/folder name
+     * @param string $link link to the file/folder
+     * @param string $initiator user ID of share sender
+     * @param string $shareWith email address of share receiver
+     * @param \DateTime|null $expiration
+     */
+    protected function sendMailNotification(IL10N $l,
+                                            $filename,
+                                            $link,
+                                            $initiator,
+                                            $shareWith,
+                                            \DateTime $expiration = null) {
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
+        $text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
+            $text
+        );
+        $emailTemplate->addBodyButton(
+            $l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        $message->setTo([$shareWith]);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        $initiatorEmail = $initiatorUser->getEMailAddress();
+        if($initiatorEmail !== null) {
+            $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        try {
+            $failedRecipients = $this->mailer->send($message);
+            if(!empty($failedRecipients)) {
+                $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+                return;
+            }
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['message' => 'Share notification mail could not be sent']);
+        }
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws \InvalidArgumentException
+     */
+    public function updateShare(\OCP\Share\IShare $share) {
+        $expirationDateUpdated = false;
+
+        $this->canShare($share);
+
+        try {
+            $originalShare = $this->getShareById($share->getFullId());
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException('Share does not have a full id');
+        }
+
+        // We can't change the share type!
+        if ($share->getShareType() !== $originalShare->getShareType()) {
+            throw new \InvalidArgumentException('Can’t change share type');
+        }
+
+        // We can only change the recipient on user shares
+        if ($share->getSharedWith() !== $originalShare->getSharedWith() &&
+            $share->getShareType() !== \OCP\Share::SHARE_TYPE_USER) {
+            throw new \InvalidArgumentException('Can only update recipient on user shares');
+        }
+
+        // Cannot share with the owner
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $share->getShareOwner()) {
+            throw new \InvalidArgumentException('Can’t share with the share owner');
+        }
+
+        $this->generalCreateChecks($share);
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $this->userCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $this->groupCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $this->linkCreateChecks($share);
+
+            $this->updateSharePasswordIfNeeded($share, $originalShare);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            // The new password is not set again if it is the same as the old
+            // one, unless when switching from sending by Talk to sending by
+            // mail.
+            $plainTextPassword = $share->getPassword();
+            if (!empty($plainTextPassword) && !$this->updateSharePasswordIfNeeded($share, $originalShare) &&
+                    !($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk())) {
+                $plainTextPassword = null;
+            }
+            if (empty($plainTextPassword) && !$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
+                // If the same password was already sent by mail the recipient
+                // would already have access to the share without having to call
+                // the sharer to verify her identity
+                throw new \InvalidArgumentException('Can’t enable sending the password by Talk without setting a new password');
+            }
+        }
+
+        $this->pathCreateChecks($share->getNode());
+
+        // Now update the share!
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $share = $provider->update($share, $plainTextPassword);
+        } else {
+            $share = $provider->update($share);
+        }
+
+        if ($expirationDateUpdated === true) {
+            \OC_Hook::emit(Share::class, 'post_set_expiration_date', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'date' => $share->getExpirationDate(),
+                'uidOwner' => $share->getSharedBy(),
+            ]);
+        }
+
+        if ($share->getPassword() !== $originalShare->getPassword()) {
+            \OC_Hook::emit(Share::class, 'post_update_password', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'uidOwner' => $share->getSharedBy(),
+                'token' => $share->getToken(),
+                'disabled' => is_null($share->getPassword()),
+            ]);
+        }
+
+        if ($share->getPermissions() !== $originalShare->getPermissions()) {
+            if ($this->userManager->userExists($share->getShareOwner())) {
+                $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            }
+            \OC_Hook::emit(Share::class, 'post_update_permissions', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'shareType' => $share->getShareType(),
+                'shareWith' => $share->getSharedWith(),
+                'uidOwner' => $share->getSharedBy(),
+                'permissions' => $share->getPermissions(),
+                'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
+            ]);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     * @return IShare The share object
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipientId): IShare {
+        [$providerId, ] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        if (!method_exists($provider, 'acceptShare')) {
+            // TODO FIX ME
+            throw new \InvalidArgumentException('Share provider does not support accepting');
+        }
+        $provider->acceptShare($share, $recipientId);
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postAcceptShare', $event);
+
+        return $share;
+    }
+
+    /**
+     * Updates the password of the given share if it is not the same as the
+     * password of the original share.
+     *
+     * @param \OCP\Share\IShare $share the share to update its password.
+     * @param \OCP\Share\IShare $originalShare the original share to compare its
+     *        password with.
+     * @return boolean whether the password was updated or not.
+     */
+    private function updateSharePasswordIfNeeded(\OCP\Share\IShare $share, \OCP\Share\IShare $originalShare) {
+        // Password updated.
+        if ($share->getPassword() !== $originalShare->getPassword()) {
+            //Verify the password
+            $this->verifyPassword($share->getPassword());
+
+            // If a password is set. Hash it!
+            if ($share->getPassword() !== null) {
+                $share->setPassword($this->hasher->hash($share->getPassword()));
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete all the children of this share
+     * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare[] List of deleted shares
+     */
+    protected function deleteChildren(\OCP\Share\IShare $share) {
+        $deletedShares = [];
+
+        $provider = $this->factory->getProviderForType($share->getShareType());
+
+        foreach ($provider->getChildren($share) as $child) {
+            $deletedChildren = $this->deleteChildren($child);
+            $deletedShares = array_merge($deletedShares, $deletedChildren);
+
+            $provider->delete($child);
+            $deletedShares[] = $child;
+        }
+
+        return $deletedShares;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @throws ShareNotFound
+     * @throws \InvalidArgumentException
+     */
+    public function deleteShare(\OCP\Share\IShare $share) {
+
+        try {
+            $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException('Share does not have a full id');
+        }
+
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::preUnshare', $event);
+
+        // Get all children and delete them as well
+        $deletedShares = $this->deleteChildren($share);
+
+        // Do the actual delete
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        $provider->delete($share);
+
+        // All the deleted shares caused by this delete
+        $deletedShares[] = $share;
+
+        // Emit post hook
+        $event->setArgument('deletedShares', $deletedShares);
+        $this->legacyDispatcher->dispatch('OCP\Share::postUnshare', $event);
+    }
+
+
+    /**
+     * Unshare a file as the recipient.
+     * This can be different from a regular delete for example when one of
+     * the users in a groups deletes that share. But the provider should
+     * handle this.
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string $recipientId
+     */
+    public function deleteFromSelf(\OCP\Share\IShare $share, $recipientId) {
+        list($providerId, ) = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        $provider->deleteFromSelf($share, $recipientId);
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postUnshareFromSelf', $event);
+    }
+
+    public function restoreShare(IShare $share, string $recipientId): IShare {
+        list($providerId, ) = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        return $provider->restore($share, $recipientId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function moveShare(\OCP\Share\IShare $share, $recipientId) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            throw new \InvalidArgumentException('Can’t change target of link share');
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() !== $recipientId) {
+            throw new \InvalidArgumentException('Invalid recipient');
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            if (is_null($sharedWith)) {
+                throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+            $recipient = $this->userManager->get($recipientId);
+            if (!$sharedWith->inGroup($recipient)) {
+                throw new \InvalidArgumentException('Invalid recipient');
+            }
+        }
+
+        list($providerId, ) = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        $provider->move($share, $recipientId);
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares = false) {
+        $providers = $this->factory->getAllProviders();
+
+        return array_reduce($providers, function($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
+            $newShares = $provider->getSharesInFolder($userId, $node, $reshares);
+            foreach ($newShares as $fid => $data) {
+                if (!isset($shares[$fid])) {
+                    $shares[$fid] = [];
+                }
+
+                $shares[$fid] = array_merge($shares[$fid], $data);
+            }
+            return $shares;
+        }, []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0) {
+        if ($path !== null &&
+                !($path instanceof \OCP\Files\File) &&
+                !($path instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException('invalid path');
+        }
+
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+
+        /*
 		 * Work around so we don't return expired shares but still follow
 		 * proper pagination.
 		 */
 
-		$shares2 = [];
-
-		while(true) {
-			$added = 0;
-			foreach ($shares as $share) {
-
-				try {
-					$this->checkExpireDate($share);
-				} catch (ShareNotFound $e) {
-					//Ignore since this basically means the share is deleted
-					continue;
-				}
-
-				$added++;
-				$shares2[] = $share;
-
-				if (count($shares2) === $limit) {
-					break;
-				}
-			}
-
-			// If we did not fetch more shares than the limit then there are no more shares
-			if (count($shares) < $limit) {
-				break;
-			}
-
-			if (count($shares2) === $limit) {
-				break;
-			}
-
-			// If there was no limit on the select we are done
-			if ($limit === -1) {
-				break;
-			}
-
-			$offset += $added;
-
-			// Fetch again $limit shares
-			$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-
-			// No more shares means we are done
-			if (empty($shares)) {
-				break;
-			}
-		}
-
-		$shares = $shares2;
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		$shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// remove all shares which are already expired
-		foreach ($shares as $key => $share) {
-			try {
-				$this->checkExpireDate($share);
-			} catch (ShareNotFound $e) {
-				unset($shares[$key]);
-			}
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		$shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// Only get deleted shares
-		$shares = array_filter($shares, function(IShare $share) {
-			return $share->getPermissions() === 0;
-		});
-
-		// Only get shares where the owner still exists
-		$shares = array_filter($shares, function (IShare $share) {
-			return $this->userManager->userExists($share->getShareOwner());
-		});
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipient = null) {
-		if ($id === null) {
-			throw new ShareNotFound();
-		}
-
-		list($providerId, $id) = $this->splitFullId($id);
-
-		try {
-			$provider = $this->factory->getProvider($providerId);
-		} catch (ProviderException $e) {
-			throw new ShareNotFound();
-		}
-
-		$share = $provider->getShareById($id, $recipient);
-
-		$this->checkExpireDate($share);
-
-		return $share;
-	}
-
-	/**
-	 * Get all the shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param int $page
-	 * @param int $perPage
-	 *
-	 * @return Share[]
-	 */
-	public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
-		return [];
-	}
-
-	/**
-	 * Get the share by token possible with password
-	 *
-	 * @param string $token
-	 * @return Share
-	 *
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		// tokens can't be valid local user names
-		if ($this->userManager->userExists($token)) {
-			throw new ShareNotFound();
-		}
-		$share = null;
-		try {
-			if($this->shareApiAllowLinks()) {
-				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK);
-				$share = $provider->getShareByToken($token);
-			}
-		} catch (ProviderException $e) {
-		} catch (ShareNotFound $e) {
-		}
-
-
-		// If it is not a link share try to fetch a federated share by token
-		if ($share === null) {
-			try {
-				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_REMOTE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		// If it is not a link share try to fetch a mail share by token
-		if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
-			try {
-				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_EMAIL);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
-			try {
-				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_CIRCLE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_ROOM)) {
-			try {
-				$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_ROOM);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null) {
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-
-		$this->checkExpireDate($share);
-
-		/*
+        $shares2 = [];
+
+        while(true) {
+            $added = 0;
+            foreach ($shares as $share) {
+
+                try {
+                    $this->checkExpireDate($share);
+                } catch (ShareNotFound $e) {
+                    //Ignore since this basically means the share is deleted
+                    continue;
+                }
+
+                $added++;
+                $shares2[] = $share;
+
+                if (count($shares2) === $limit) {
+                    break;
+                }
+            }
+
+            // If we did not fetch more shares than the limit then there are no more shares
+            if (count($shares) < $limit) {
+                break;
+            }
+
+            if (count($shares2) === $limit) {
+                break;
+            }
+
+            // If there was no limit on the select we are done
+            if ($limit === -1) {
+                break;
+            }
+
+            $offset += $added;
+
+            // Fetch again $limit shares
+            $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+
+            // No more shares means we are done
+            if (empty($shares)) {
+                break;
+            }
+        }
+
+        $shares = $shares2;
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        $shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // remove all shares which are already expired
+        foreach ($shares as $key => $share) {
+            try {
+                $this->checkExpireDate($share);
+            } catch (ShareNotFound $e) {
+                unset($shares[$key]);
+            }
+        }
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        $shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // Only get deleted shares
+        $shares = array_filter($shares, function(IShare $share) {
+            return $share->getPermissions() === 0;
+        });
+
+        // Only get shares where the owner still exists
+        $shares = array_filter($shares, function (IShare $share) {
+            return $this->userManager->userExists($share->getShareOwner());
+        });
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipient = null) {
+        if ($id === null) {
+            throw new ShareNotFound();
+        }
+
+        list($providerId, $id) = $this->splitFullId($id);
+
+        try {
+            $provider = $this->factory->getProvider($providerId);
+        } catch (ProviderException $e) {
+            throw new ShareNotFound();
+        }
+
+        $share = $provider->getShareById($id, $recipient);
+
+        $this->checkExpireDate($share);
+
+        return $share;
+    }
+
+    /**
+     * Get all the shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @param int $page
+     * @param int $perPage
+     *
+     * @return Share[]
+     */
+    public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
+        return [];
+    }
+
+    /**
+     * Get the share by token possible with password
+     *
+     * @param string $token
+     * @return Share
+     *
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        // tokens can't be valid local user names
+        if ($this->userManager->userExists($token)) {
+            throw new ShareNotFound();
+        }
+        $share = null;
+        try {
+            if($this->shareApiAllowLinks()) {
+                $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK);
+                $share = $provider->getShareByToken($token);
+            }
+        } catch (ProviderException $e) {
+        } catch (ShareNotFound $e) {
+        }
+
+
+        // If it is not a link share try to fetch a federated share by token
+        if ($share === null) {
+            try {
+                $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_REMOTE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        // If it is not a link share try to fetch a mail share by token
+        if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
+            try {
+                $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_EMAIL);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
+            try {
+                $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_CIRCLE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_ROOM)) {
+            try {
+                $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_ROOM);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null) {
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+
+        $this->checkExpireDate($share);
+
+        /*
 		 * Reduce the permissions for link shares if public upload is not enabled
 		 */
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK &&
-			!$this->shareApiLinkAllowPublicUpload()) {
-			$share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
-		}
-
-		return $share;
-	}
-
-	protected function checkExpireDate($share) {
-		if ($share->isExpired()) {
-			$this->deleteShare($share);
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-
-	}
-
-	/**
-	 * Verify the password of a public share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string $password
-	 * @return bool
-	 */
-	public function checkPassword(\OCP\Share\IShare $share, $password) {
-		$passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
-							 || $share->getShareType() !== IShare::TYPE_EMAIL
-							 || $share->getShareType() !== IShare::TYPE_CIRCLE;
-		if (!$passwordProtected) {
-			//TODO maybe exception?
-			return false;
-		}
-
-		if ($password === null || $share->getPassword() === null) {
-			return false;
-		}
-
-		$newHash = '';
-		if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
-			return false;
-		}
-
-		if (!empty($newHash)) {
-			$share->setPassword($newHash);
-			$provider = $this->factory->getProviderForType($share->getShareType());
-			$provider->update($share);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeleted($uid) {
-		$types = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE, \OCP\Share::SHARE_TYPE_EMAIL];
-
-		foreach ($types as $type) {
-			try {
-				$provider = $this->factory->getProviderForType($type);
-			} catch (ProviderException $e) {
-				continue;
-			}
-			$provider->userDeleted($uid, $type);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function groupDeleted($gid) {
-		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
-		$provider->groupDeleted($gid);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
-		$provider->userDeletedFromGroup($uid, $gid);
-	}
-
-	/**
-	 * Get access list to a path. This means
-	 * all the users that can access a given path.
-	 *
-	 * Consider:
-	 * -root
-	 * |-folder1 (23)
-	 *  |-folder2 (32)
-	 *   |-fileA (42)
-	 *
-	 * fileA is shared with user1 and user1@server1
-	 * folder2 is shared with group2 (user4 is a member of group2)
-	 * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
-	 *
-	 * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
-	 * [
-	 *  users  => [
-	 *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
-	 *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
-	 *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
-	 *  ],
-	 *  remote => [
-	 *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
-	 *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
-	 *  ],
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
-	 * [
-	 *  users  => ['user1', 'user2', 'user4'],
-	 *  remote => bool,
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * This is required for encryption/activity
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param bool $recursive Should we check all parent folders as well
-	 * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
-	 * @return array
-	 */
-	public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
-		$owner = $path->getOwner();
-
-		if ($owner === null) {
-			return [];
-		}
-
-		$owner = $owner->getUID();
-
-		if ($currentAccess) {
-			$al = ['users' => [], 'remote' => [], 'public' => false];
-		} else {
-			$al = ['users' => [], 'remote' => false, 'public' => false];
-		}
-		if (!$this->userManager->userExists($owner)) {
-			return $al;
-		}
-
-		//Get node for the owner and correct the owner in case of external storages
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
-			$nodes = $userFolder->getById($path->getId());
-			$path = array_shift($nodes);
-			if ($path->getOwner() === null) {
-				return [];
-			}
-			$owner = $path->getOwner()->getUID();
-		}
-
-		$providers = $this->factory->getAllProviders();
-
-		/** @var Node[] $nodes */
-		$nodes = [];
-
-
-		if ($currentAccess) {
-			$ownerPath = $path->getPath();
-			$ownerPath = explode('/', $ownerPath, 4);
-			if (count($ownerPath) < 4) {
-				$ownerPath = '';
-			} else {
-				$ownerPath = $ownerPath[3];
-			}
-			$al['users'][$owner] = [
-				'node_id' => $path->getId(),
-				'node_path' => '/' . $ownerPath,
-			];
-		} else {
-			$al['users'][] = $owner;
-		}
-
-		// Collect all the shares
-		while ($path->getPath() !== $userFolder->getPath()) {
-			$nodes[] = $path;
-			if (!$recursive) {
-				break;
-			}
-			$path = $path->getParent();
-		}
-
-		foreach ($providers as $provider) {
-			$tmp = $provider->getAccessList($nodes, $currentAccess);
-
-			foreach ($tmp as $k => $v) {
-				if (isset($al[$k])) {
-					if (is_array($al[$k])) {
-						if ($currentAccess) {
-							$al[$k] += $v;
-						} else {
-							$al[$k] = array_merge($al[$k], $v);
-							$al[$k] = array_unique($al[$k]);
-							$al[$k] = array_values($al[$k]);
-						}
-					} else {
-						$al[$k] = $al[$k] || $v;
-					}
-				} else {
-					$al[$k] = $v;
-				}
-			}
-		}
-
-		return $al;
-	}
-
-	/**
-	 * Create a new share
-	 * @return \OCP\Share\IShare
-	 */
-	public function newShare() {
-		return new \OC\Share20\Share($this->rootFolder, $this->userManager);
-	}
-
-	/**
-	 * Is the share API enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiEnabled() {
-		return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * Is public link sharing enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiAllowLinks() {
-		return $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
-	}
-
-	/**
-	 * Is password on public link requires
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkEnforcePassword() {
-		return $this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default link expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDate() {
-		return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default link expire date enforced
-	 *`
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDateEnforced() {
-		return $this->shareApiLinkDefaultExpireDate() &&
-			$this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-	}
-
-
-	/**
-	 * Number of default link expire days
-	 * @return int
-	 */
-	public function shareApiLinkDefaultExpireDays() {
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Is default internal expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDate(): bool {
-		return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default expire date enforced
-	 *`
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDateEnforced(): bool {
-		return $this->shareApiInternalDefaultExpireDate() &&
-			$this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
-	}
-
-
-	/**
-	 * Number of default expire days
-	 * @return int
-	 */
-	public function shareApiInternalDefaultExpireDays(): int {
-		return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Allow public upload on link shares
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkAllowPublicUpload() {
-		return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
-	}
-
-	/**
-	 * check if user can only share with group members
-	 * @return bool
-	 */
-	public function shareWithGroupMembersOnly() {
-		return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-	}
-
-	/**
-	 * Check if users can share with groups
-	 * @return bool
-	 */
-	public function allowGroupSharing() {
-		return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
-	}
-
-	public function allowEnumeration(): bool {
-		return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
-
-	public function limitEnumerationToGroups(): bool {
-		return $this->allowEnumeration() &&
-			$this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	/**
-	 * Copied from \OC_Util::isSharingDisabledForUser
-	 *
-	 * TODO: Deprecate fuction from OC_Util
-	 *
-	 * @param string $userId
-	 * @return bool
-	 */
-	public function sharingDisabledForUser($userId) {
-		if ($userId === null) {
-			return false;
-		}
-
-		if (isset($this->sharingDisabledForUsersCache[$userId])) {
-			return $this->sharingDisabledForUsersCache[$userId];
-		}
-
-		if ($this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
-			$groupsList = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-			$excludedGroups = json_decode($groupsList);
-			if (is_null($excludedGroups)) {
-				$excludedGroups = explode(',', $groupsList);
-				$newValue = json_encode($excludedGroups);
-				$this->config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
-			}
-			$user = $this->userManager->get($userId);
-			$usersGroups = $this->groupManager->getUserGroupIds($user);
-			if (!empty($usersGroups)) {
-				$remainingGroups = array_diff($usersGroups, $excludedGroups);
-				// if the user is only in groups which are disabled for sharing then
-				// sharing is also disabled for the user
-				if (empty($remainingGroups)) {
-					$this->sharingDisabledForUsersCache[$userId] = true;
-					return true;
-				}
-			}
-		}
-
-		$this->sharingDisabledForUsersCache[$userId] = false;
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerGroupSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function shareProviderExists($shareType) {
-		try {
-			$this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function getAllShares(): iterable {
-		$providers = $this->factory->getAllProviders();
-
-		foreach ($providers as $provider) {
-			yield from $provider->getAllShares();
-		}
-	}
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK &&
+            !$this->shareApiLinkAllowPublicUpload()) {
+            $share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
+        }
+
+        return $share;
+    }
+
+    protected function checkExpireDate($share) {
+        if ($share->isExpired()) {
+            $this->deleteShare($share);
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+
+    }
+
+    /**
+     * Verify the password of a public share
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string $password
+     * @return bool
+     */
+    public function checkPassword(\OCP\Share\IShare $share, $password) {
+        $passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
+                             || $share->getShareType() !== IShare::TYPE_EMAIL
+                             || $share->getShareType() !== IShare::TYPE_CIRCLE;
+        if (!$passwordProtected) {
+            //TODO maybe exception?
+            return false;
+        }
+
+        if ($password === null || $share->getPassword() === null) {
+            return false;
+        }
+
+        $newHash = '';
+        if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
+            return false;
+        }
+
+        if (!empty($newHash)) {
+            $share->setPassword($newHash);
+            $provider = $this->factory->getProviderForType($share->getShareType());
+            $provider->update($share);
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeleted($uid) {
+        $types = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE, \OCP\Share::SHARE_TYPE_EMAIL];
+
+        foreach ($types as $type) {
+            try {
+                $provider = $this->factory->getProviderForType($type);
+            } catch (ProviderException $e) {
+                continue;
+            }
+            $provider->userDeleted($uid, $type);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function groupDeleted($gid) {
+        $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
+        $provider->groupDeleted($gid);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        $provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
+        $provider->userDeletedFromGroup($uid, $gid);
+    }
+
+    /**
+     * Get access list to a path. This means
+     * all the users that can access a given path.
+     *
+     * Consider:
+     * -root
+     * |-folder1 (23)
+     *  |-folder2 (32)
+     *   |-fileA (42)
+     *
+     * fileA is shared with user1 and user1@server1
+     * folder2 is shared with group2 (user4 is a member of group2)
+     * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
+     *
+     * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
+     * [
+     *  users  => [
+     *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
+     *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
+     *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
+     *  ],
+     *  remote => [
+     *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
+     *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
+     *  ],
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
+     * [
+     *  users  => ['user1', 'user2', 'user4'],
+     *  remote => bool,
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * This is required for encryption/activity
+     *
+     * @param \OCP\Files\Node $path
+     * @param bool $recursive Should we check all parent folders as well
+     * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
+     * @return array
+     */
+    public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
+        $owner = $path->getOwner();
+
+        if ($owner === null) {
+            return [];
+        }
+
+        $owner = $owner->getUID();
+
+        if ($currentAccess) {
+            $al = ['users' => [], 'remote' => [], 'public' => false];
+        } else {
+            $al = ['users' => [], 'remote' => false, 'public' => false];
+        }
+        if (!$this->userManager->userExists($owner)) {
+            return $al;
+        }
+
+        //Get node for the owner and correct the owner in case of external storages
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
+            $nodes = $userFolder->getById($path->getId());
+            $path = array_shift($nodes);
+            if ($path->getOwner() === null) {
+                return [];
+            }
+            $owner = $path->getOwner()->getUID();
+        }
+
+        $providers = $this->factory->getAllProviders();
+
+        /** @var Node[] $nodes */
+        $nodes = [];
+
+
+        if ($currentAccess) {
+            $ownerPath = $path->getPath();
+            $ownerPath = explode('/', $ownerPath, 4);
+            if (count($ownerPath) < 4) {
+                $ownerPath = '';
+            } else {
+                $ownerPath = $ownerPath[3];
+            }
+            $al['users'][$owner] = [
+                'node_id' => $path->getId(),
+                'node_path' => '/' . $ownerPath,
+            ];
+        } else {
+            $al['users'][] = $owner;
+        }
+
+        // Collect all the shares
+        while ($path->getPath() !== $userFolder->getPath()) {
+            $nodes[] = $path;
+            if (!$recursive) {
+                break;
+            }
+            $path = $path->getParent();
+        }
+
+        foreach ($providers as $provider) {
+            $tmp = $provider->getAccessList($nodes, $currentAccess);
+
+            foreach ($tmp as $k => $v) {
+                if (isset($al[$k])) {
+                    if (is_array($al[$k])) {
+                        if ($currentAccess) {
+                            $al[$k] += $v;
+                        } else {
+                            $al[$k] = array_merge($al[$k], $v);
+                            $al[$k] = array_unique($al[$k]);
+                            $al[$k] = array_values($al[$k]);
+                        }
+                    } else {
+                        $al[$k] = $al[$k] || $v;
+                    }
+                } else {
+                    $al[$k] = $v;
+                }
+            }
+        }
+
+        return $al;
+    }
+
+    /**
+     * Create a new share
+     * @return \OCP\Share\IShare
+     */
+    public function newShare() {
+        return new \OC\Share20\Share($this->rootFolder, $this->userManager);
+    }
+
+    /**
+     * Is the share API enabled
+     *
+     * @return bool
+     */
+    public function shareApiEnabled() {
+        return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * Is public link sharing enabled
+     *
+     * @return bool
+     */
+    public function shareApiAllowLinks() {
+        return $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
+    }
+
+    /**
+     * Is password on public link requires
+     *
+     * @return bool
+     */
+    public function shareApiLinkEnforcePassword() {
+        return $this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes';
+    }
+
+    /**
+     * Is default link expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDate() {
+        return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default link expire date enforced
+     *`
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDateEnforced() {
+        return $this->shareApiLinkDefaultExpireDate() &&
+            $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+    }
+
+
+    /**
+     * Number of default link expire days
+     * @return int
+     */
+    public function shareApiLinkDefaultExpireDays() {
+        return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+    }
+
+    /**
+     * Is default internal expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDate(): bool {
+        return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default expire date enforced
+     *`
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDateEnforced(): bool {
+        return $this->shareApiInternalDefaultExpireDate() &&
+            $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
+    }
+
+
+    /**
+     * Number of default expire days
+     * @return int
+     */
+    public function shareApiInternalDefaultExpireDays(): int {
+        return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+    }
+
+    /**
+     * Allow public upload on link shares
+     *
+     * @return bool
+     */
+    public function shareApiLinkAllowPublicUpload() {
+        return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+    }
+
+    /**
+     * check if user can only share with group members
+     * @return bool
+     */
+    public function shareWithGroupMembersOnly() {
+        return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+    }
+
+    /**
+     * Check if users can share with groups
+     * @return bool
+     */
+    public function allowGroupSharing() {
+        return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
+    }
+
+    public function allowEnumeration(): bool {
+        return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
+
+    public function limitEnumerationToGroups(): bool {
+        return $this->allowEnumeration() &&
+            $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    /**
+     * Copied from \OC_Util::isSharingDisabledForUser
+     *
+     * TODO: Deprecate fuction from OC_Util
+     *
+     * @param string $userId
+     * @return bool
+     */
+    public function sharingDisabledForUser($userId) {
+        if ($userId === null) {
+            return false;
+        }
+
+        if (isset($this->sharingDisabledForUsersCache[$userId])) {
+            return $this->sharingDisabledForUsersCache[$userId];
+        }
+
+        if ($this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
+            $groupsList = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+            $excludedGroups = json_decode($groupsList);
+            if (is_null($excludedGroups)) {
+                $excludedGroups = explode(',', $groupsList);
+                $newValue = json_encode($excludedGroups);
+                $this->config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
+            }
+            $user = $this->userManager->get($userId);
+            $usersGroups = $this->groupManager->getUserGroupIds($user);
+            if (!empty($usersGroups)) {
+                $remainingGroups = array_diff($usersGroups, $excludedGroups);
+                // if the user is only in groups which are disabled for sharing then
+                // sharing is also disabled for the user
+                if (empty($remainingGroups)) {
+                    $this->sharingDisabledForUsersCache[$userId] = true;
+                    return true;
+                }
+            }
+        }
+
+        $this->sharingDisabledForUsersCache[$userId] = false;
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerGroupSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function shareProviderExists($shareType) {
+        try {
+            $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getAllShares(): iterable {
+        $providers = $this->factory->getAllProviders();
+
+        foreach ($providers as $provider) {
+            yield from $provider->getAllShares();
+        }
+    }
 }

lib/private/Share20/DefaultShareProvider.php

Indentation +1405 added lines, -1405 removed lines

@@ -62,1445 +62,1445 @@
  */
 class DefaultShareProvider implements IShareProvider {
 
-	// Special share type for user modified group shares
-	const SHARE_TYPE_USERGROUP = 2;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IRootFolder $rootFolder
-	 * @param IMailer $mailer ;
-	 * @param Defaults $defaults
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(
-			IDBConnection $connection,
-			IUserManager $userManager,
-			IGroupManager $groupManager,
-			IRootFolder $rootFolder,
-			IMailer $mailer,
-			Defaults $defaults,
-			IL10N $l,
-			IURLGenerator $urlGenerator) {
-		$this->dbConn = $connection;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->rootFolder = $rootFolder;
-		$this->mailer = $mailer;
-		$this->defaults = $defaults;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocinternal';
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('share');
-		$qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			//Set the UID of the user we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-			$qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			//Set the GID of the group we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			//set label for public link
-			$qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
-			//Set the token of the share
-			$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
-
-			//If a password is set store it
-			if ($share->getPassword() !== null) {
-				$qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
-			}
-
-			$qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-
-			if (method_exists($share, 'getParent')) {
-				$qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
-			}
-		} else {
-			throw new \Exception('invalid share type!');
-		}
-
-		// Set what is shares
-		$qb->setValue('item_type', $qb->createParameter('itemType'));
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			$qb->setParameter('itemType', 'file');
-		} else {
-			$qb->setParameter('itemType', 'folder');
-		}
-
-		// Set the file id
-		$qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
-		$qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
-
-		// set the permissions
-		$qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
-
-		// Set who created this share
-		$qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
-
-		// Set who is the owner of this file/folder (and this the owner of the share)
-		$qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
-
-		// Set the file target
-		$qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
-
-		// Set the time this share was created
-		$qb->setValue('stime', $qb->createNamedParameter(time()));
-
-		// insert the data and fetch the id of the share
-		$this->dbConn->beginTransaction();
-		$qb->execute();
-		$id = $this->dbConn->lastInsertId('*PREFIX*share');
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$this->dbConn->commit();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		$mailSendValue = $share->getMailSend();
-		$data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
-
-		$share = $this->createShare($data);
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function update(\OCP\Share\IShare $share) {
-
-		$originalShare = $this->getShareById($share->getId());
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+    // Special share type for user modified group shares
+    const SHARE_TYPE_USERGROUP = 2;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IRootFolder $rootFolder
+     * @param IMailer $mailer ;
+     * @param Defaults $defaults
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(
+            IDBConnection $connection,
+            IUserManager $userManager,
+            IGroupManager $groupManager,
+            IRootFolder $rootFolder,
+            IMailer $mailer,
+            Defaults $defaults,
+            IL10N $l,
+            IURLGenerator $urlGenerator) {
+        $this->dbConn = $connection;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->rootFolder = $rootFolder;
+        $this->mailer = $mailer;
+        $this->defaults = $defaults;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocinternal';
+    }
+
+    /**
+     * Share a path
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('share');
+        $qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            //Set the UID of the user we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+            $qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            //Set the GID of the group we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            //set label for public link
+            $qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
+            //Set the token of the share
+            $qb->setValue('token', $qb->createNamedParameter($share->getToken()));
+
+            //If a password is set store it
+            if ($share->getPassword() !== null) {
+                $qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
+            }
+
+            $qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+
+            if (method_exists($share, 'getParent')) {
+                $qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
+            }
+        } else {
+            throw new \Exception('invalid share type!');
+        }
+
+        // Set what is shares
+        $qb->setValue('item_type', $qb->createParameter('itemType'));
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            $qb->setParameter('itemType', 'file');
+        } else {
+            $qb->setParameter('itemType', 'folder');
+        }
+
+        // Set the file id
+        $qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
+        $qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
+
+        // set the permissions
+        $qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
+
+        // Set who created this share
+        $qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
+
+        // Set who is the owner of this file/folder (and this the owner of the share)
+        $qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
+
+        // Set the file target
+        $qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
+
+        // Set the time this share was created
+        $qb->setValue('stime', $qb->createNamedParameter(time()));
+
+        // insert the data and fetch the id of the share
+        $this->dbConn->beginTransaction();
+        $qb->execute();
+        $id = $this->dbConn->lastInsertId('*PREFIX*share');
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $this->dbConn->commit();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        $mailSendValue = $share->getMailSend();
+        $data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
+
+        $share = $this->createShare($data);
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function update(\OCP\Share\IShare $share) {
+
+        $originalShare = $this->getShareById($share->getId());
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * We allow updating the recipient on user shares.
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('accepted', $qb->createNamedParameter($share->getStatus()))
-				->execute();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('accepted', $qb->createNamedParameter($share->getStatus()))
+                ->execute();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Update all user defined group shares
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Now update the permissions for all children that have not set it to 0
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
-				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('token', $qb->createNamedParameter($share->getToken()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('label', $qb->createNamedParameter($share->getLabel()))
-				->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->propagateNote($share);
-		}
-
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient
-	 * @return IShare The share object
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipient): IShare {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->execute();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('password', $qb->createNamedParameter($share->getPassword()))
+                ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('token', $qb->createNamedParameter($share->getToken()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('label', $qb->createNamedParameter($share->getLabel()))
+                ->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->propagateNote($share);
+        }
+
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipient
+     * @return IShare The share object
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipient): IShare {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->execute();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-			} else {
-				$id = $data['id'];
-			}
-
-		} else if ($share->getShareType() === IShare::TYPE_USER) {
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			$id = $share->getId();
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->execute();
-
-		return $share;
-	}
-
-	/**
-	 * Get all children of this share
-	 * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
-	 *
-	 * @param \OCP\Share\IShare $parent
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getChildren(\OCP\Share\IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->orderBy('id');
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			$children[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 */
-	public function delete(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
-
-		/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+            } else {
+                $id = $data['id'];
+            }
+
+        } else if ($share->getShareType() === IShare::TYPE_USER) {
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            $id = $share->getId();
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->execute();
+
+        return $share;
+    }
+
+    /**
+     * Get all children of this share
+     * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
+     *
+     * @param \OCP\Share\IShare $parent
+     * @return \OCP\Share\IShare[]
+     */
+    public function getChildren(\OCP\Share\IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->orderBy('id');
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            $children[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     */
+    public function delete(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
+
+        /*
 		 * If the share is a group share delete all possible
 		 * user defined groups shares.
 		 */
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Unshare a share from the recipient. If this is a group share
-	 * this means we need a special entry in the share db.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient UserId of recipient
-	 * @throws BackendError
-	 * @throws ProviderException
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->execute();
-
-			$data = $stmt->fetch();
-
-			/*
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Unshare a share from the recipient. If this is a group share
+     * this means we need a special entry in the share db.
+     *
+     * @param IShare $share
+     * @param string $recipient UserId of recipient
+     * @throws BackendError
+     * @throws ProviderException
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->execute();
+
+            $data = $stmt->fetch();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-				$permissions = $share->getPermissions();
-			} else {
-				$permissions = $data['permissions'];
-				$id = $data['id'];
-			}
-
-			if ($permissions !== 0) {
-				// Update existing usergroup share
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('permissions', $qb->createNamedParameter(0))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-					->execute();
-			}
-
-		} else if ($share->getShareType() === IShare::TYPE_USER) {
-
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			// We can just delete user and link shares
-			$this->delete($share);
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-	}
-
-	protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
-		$type = $share->getNodeType();
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->insert('share')
-			->values([
-				'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-				'share_with' => $qb->createNamedParameter($recipient),
-				'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-				'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-				'parent' => $qb->createNamedParameter($share->getId()),
-				'item_type' => $qb->createNamedParameter($type),
-				'item_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_target' => $qb->createNamedParameter($share->getTarget()),
-				'permissions' => $qb->createNamedParameter($share->getPermissions()),
-				'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-			])->execute();
-
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * @inheritdoc
-	 *
-	 * For now this only works for group shares
-	 * If this gets implemented for normal shares we have to extend it
-	 */
-	public function restore(IShare $share, string $recipient): IShare {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('permissions')
-			->from('share')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
-			);
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		$originalPermission = $data['permissions'];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('permissions', $qb->createNamedParameter($originalPermission))
-			->where(
-				$qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
-			)->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-			)->andWhere(
-				$qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
-			);
-
-		$qb->execute();
-
-		return $this->getShareById($share->getId(), $recipient);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(\OCP\Share\IShare $share, $recipient) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			// Just update the target
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->set('file_target', $qb->createNamedParameter($share->getTarget()))
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-
-			// Check if there is a usergroup share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('id')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->setMaxResults(1)
-				->execute();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			if ($data === false) {
-				// No usergroup share yet. Create one.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->insert('share')
-					->values([
-						'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-						'share_with' => $qb->createNamedParameter($recipient),
-						'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-						'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-						'parent' => $qb->createNamedParameter($share->getId()),
-						'item_type' => $qb->createNamedParameter($share->getNodeType()),
-						'item_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_target' => $qb->createNamedParameter($share->getTarget()),
-						'permissions' => $qb->createNamedParameter($share->getPermissions()),
-						'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-					])->execute();
-			} else {
-				// Already a usergroup share. Update it.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('file_target', $qb->createNamedParameter($share->getTarget()))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
-					->execute();
-			}
-		}
-
-		return $share;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			if ($node === null) {
-				$qb->andWhere(
-					$qb->expr()->orX(
-						$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-						$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-					)
-				);
-			}
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		// If the recipient is set for a group share resolve to that user
-		if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share = $this->resolveGroupShares([$share], $recipientId)[0];
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * Returns whether the given database result can be interpreted as
-	 * a share with accessible file (not trashed, not deleted)
-	 */
-	private function isAccessibleResult($data) {
-		// exclude shares leading to deleted file entries
-		if ($data['fileid'] === null) {
-			return false;
-		}
-
-		// exclude shares leading to trashbin on home storages
-		$pathSections = explode('/', $data['path'], 2);
-		// FIXME: would not detect rare md5'd home storage case properly
-		if ($pathSections[0] !== 'files'
-				&& in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var Share[] $shares */
-		$shares = [];
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			//Get shares directly with this user
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('s.*',
-				'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-				'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-				'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-			)
-				->selectAlias('st.id', 'storage_string_id')
-				->from('share', 's')
-				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
-
-			// Order by id
-			$qb->orderBy('s.id');
-
-			// Set limit and offset
-			if ($limit !== -1) {
-				$qb->setMaxResults($limit);
-			}
-			$qb->setFirstResult($offset);
-
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			// Filter by node if provided
-			if ($node !== null) {
-				$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-			}
-
-			$cursor = $qb->execute();
-
-			while($data = $cursor->fetch()) {
-				if ($this->isAccessibleResult($data)) {
-					$shares[] = $this->createShare($data);
-				}
-			}
-			$cursor->closeCursor();
-
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			$user = $this->userManager->get($userId);
-			$allGroups = $this->groupManager->getUserGroups($user);
-
-			/** @var Share[] $shares2 */
-			$shares2 = [];
-
-			$start = 0;
-			while(true) {
-				$groups = array_slice($allGroups, $start, 100);
-				$start += 100;
-
-				if ($groups === []) {
-					break;
-				}
-
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->select('s.*',
-					'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-					'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-					'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-				)
-					->selectAlias('st.id', 'storage_string_id')
-					->from('share', 's')
-					->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-					->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
-					->orderBy('s.id')
-					->setFirstResult(0);
-
-				if ($limit !== -1) {
-					$qb->setMaxResults($limit - count($shares));
-				}
-
-				// Filter by node if provided
-				if ($node !== null) {
-					$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-				}
-
-
-				$groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
-				$groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
-
-				$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-					->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
-						$groups,
-						IQueryBuilder::PARAM_STR_ARRAY
-					)))
-					->andWhere($qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-					));
-
-				$cursor = $qb->execute();
-				while($data = $cursor->fetch()) {
-					if ($offset > 0) {
-						$offset--;
-						continue;
-					}
-
-					if ($this->isAccessibleResult($data)) {
-						$shares2[] = $this->createShare($data);
-					}
-				}
-				$cursor->closeCursor();
-			}
-
-			/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+                $permissions = $share->getPermissions();
+            } else {
+                $permissions = $data['permissions'];
+                $id = $data['id'];
+            }
+
+            if ($permissions !== 0) {
+                // Update existing usergroup share
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('permissions', $qb->createNamedParameter(0))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+                    ->execute();
+            }
+
+        } else if ($share->getShareType() === IShare::TYPE_USER) {
+
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            // We can just delete user and link shares
+            $this->delete($share);
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+    }
+
+    protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
+        $type = $share->getNodeType();
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->insert('share')
+            ->values([
+                'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                'share_with' => $qb->createNamedParameter($recipient),
+                'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                'parent' => $qb->createNamedParameter($share->getId()),
+                'item_type' => $qb->createNamedParameter($type),
+                'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_target' => $qb->createNamedParameter($share->getTarget()),
+                'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+            ])->execute();
+
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * For now this only works for group shares
+     * If this gets implemented for normal shares we have to extend it
+     */
+    public function restore(IShare $share, string $recipient): IShare {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('permissions')
+            ->from('share')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
+            );
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        $originalPermission = $data['permissions'];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('permissions', $qb->createNamedParameter($originalPermission))
+            ->where(
+                $qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
+            )->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+            )->andWhere(
+                $qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
+            );
+
+        $qb->execute();
+
+        return $this->getShareById($share->getId(), $recipient);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(\OCP\Share\IShare $share, $recipient) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            // Just update the target
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+
+            // Check if there is a usergroup share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('id')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->setMaxResults(1)
+                ->execute();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            if ($data === false) {
+                // No usergroup share yet. Create one.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->insert('share')
+                    ->values([
+                        'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                        'share_with' => $qb->createNamedParameter($recipient),
+                        'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                        'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                        'parent' => $qb->createNamedParameter($share->getId()),
+                        'item_type' => $qb->createNamedParameter($share->getNodeType()),
+                        'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_target' => $qb->createNamedParameter($share->getTarget()),
+                        'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                        'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+                    ])->execute();
+            } else {
+                // Already a usergroup share. Update it.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
+                    ->execute();
+            }
+        }
+
+        return $share;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        ));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            if ($node === null) {
+                $qb->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                        $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                    )
+                );
+            }
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        // If the recipient is set for a group share resolve to that user
+        if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share = $this->resolveGroupShares([$share], $recipientId)[0];
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return \OCP\Share\IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * Returns whether the given database result can be interpreted as
+     * a share with accessible file (not trashed, not deleted)
+     */
+    private function isAccessibleResult($data) {
+        // exclude shares leading to deleted file entries
+        if ($data['fileid'] === null) {
+            return false;
+        }
+
+        // exclude shares leading to trashbin on home storages
+        $pathSections = explode('/', $data['path'], 2);
+        // FIXME: would not detect rare md5'd home storage case properly
+        if ($pathSections[0] !== 'files'
+                && in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var Share[] $shares */
+        $shares = [];
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            //Get shares directly with this user
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->select('s.*',
+                'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+            )
+                ->selectAlias('st.id', 'storage_string_id')
+                ->from('share', 's')
+                ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
+
+            // Order by id
+            $qb->orderBy('s.id');
+
+            // Set limit and offset
+            if ($limit !== -1) {
+                $qb->setMaxResults($limit);
+            }
+            $qb->setFirstResult($offset);
+
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            // Filter by node if provided
+            if ($node !== null) {
+                $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+            }
+
+            $cursor = $qb->execute();
+
+            while($data = $cursor->fetch()) {
+                if ($this->isAccessibleResult($data)) {
+                    $shares[] = $this->createShare($data);
+                }
+            }
+            $cursor->closeCursor();
+
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            $user = $this->userManager->get($userId);
+            $allGroups = $this->groupManager->getUserGroups($user);
+
+            /** @var Share[] $shares2 */
+            $shares2 = [];
+
+            $start = 0;
+            while(true) {
+                $groups = array_slice($allGroups, $start, 100);
+                $start += 100;
+
+                if ($groups === []) {
+                    break;
+                }
+
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->select('s.*',
+                    'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                    'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                    'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+                )
+                    ->selectAlias('st.id', 'storage_string_id')
+                    ->from('share', 's')
+                    ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                    ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+                    ->orderBy('s.id')
+                    ->setFirstResult(0);
+
+                if ($limit !== -1) {
+                    $qb->setMaxResults($limit - count($shares));
+                }
+
+                // Filter by node if provided
+                if ($node !== null) {
+                    $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+                }
+
+
+                $groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
+                $groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
+
+                $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+                    ->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
+                        $groups,
+                        IQueryBuilder::PARAM_STR_ARRAY
+                    )))
+                    ->andWhere($qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                    ));
+
+                $cursor = $qb->execute();
+                while($data = $cursor->fetch()) {
+                    if ($offset > 0) {
+                        $offset--;
+                        continue;
+                    }
+
+                    if ($this->isAccessibleResult($data)) {
+                        $shares2[] = $this->createShare($data);
+                    }
+                }
+                $cursor->closeCursor();
+            }
+
+            /*
 			 * Resolve all group shares to user specific shares
 			 */
-			$shares = $this->resolveGroupShares($shares2, $userId);
-		} else {
-			throw new BackendError('Invalid backend');
-		}
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param mixed[] $data
-	 * @return \OCP\Share\IShare
-	 * @throws InvalidShare
-	 */
-	private function createShare($data) {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setNote($data['note'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
-			->setLabel($data['label']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$share->setSharedWith($data['share_with']);
-			$user = $this->userManager->get($data['share_with']);
-			if ($user !== null) {
-				$share->setSharedWithDisplayName($user->getDisplayName());
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share->setSharedWith($data['share_with']);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-			$share->setToken($data['token']);
-		}
-
-		$share->setSharedBy($data['uid_initiator']);
-		$share->setShareOwner($data['uid_owner']);
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			$share->setExpirationDate($expiration);
-		}
-
-		if (isset($data['f_permissions'])) {
-			$entryData = $data;
-			$entryData['permissions'] = $entryData['f_permissions'];
-			$entryData['parent'] = $entryData['f_parent'];
-			$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
-				\OC::$server->getMimeTypeLoader()));
-		}
-
-		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
-
-		return $share;
-	}
-
-	/**
-	 * @param Share[] $shares
-	 * @param $userId
-	 * @return Share[] The updates shares if no update is found for a share return the original
-	 */
-	private function resolveGroupShares($shares, $userId) {
-		$result = [];
-
-		$start = 0;
-		while(true) {
-			/** @var Share[] $shareSlice */
-			$shareSlice = array_slice($shares, $start, 100);
-			$start += 100;
-
-			if ($shareSlice === []) {
-				break;
-			}
-
-			/** @var int[] $ids */
-			$ids = [];
-			/** @var Share[] $shareMap */
-			$shareMap = [];
-
-			foreach ($shareSlice as $share) {
-				$ids[] = (int)$share->getId();
-				$shareMap[$share->getId()] = $share;
-			}
-
-			$qb = $this->dbConn->getQueryBuilder();
-
-			$query = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			$stmt = $query->execute();
-
-			while($data = $stmt->fetch()) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
-				$shareMap[$data['parent']]->setStatus((int)$data['accepted']);
-				$shareMap[$data['parent']]->setTarget($data['file_target']);
-				$shareMap[$data['parent']]->setParent($data['parent']);
-			}
-
-			$stmt->closeCursor();
-
-			foreach ($shareMap as $share) {
-				$result[] = $share;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('share');
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+            $shares = $this->resolveGroupShares($shares2, $userId);
+        } else {
+            throw new BackendError('Invalid backend');
+        }
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param mixed[] $data
+     * @return \OCP\Share\IShare
+     * @throws InvalidShare
+     */
+    private function createShare($data) {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setNote($data['note'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setStatus((int)$data['accepted'])
+            ->setLabel($data['label']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $share->setSharedWith($data['share_with']);
+            $user = $this->userManager->get($data['share_with']);
+            if ($user !== null) {
+                $share->setSharedWithDisplayName($user->getDisplayName());
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share->setSharedWith($data['share_with']);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $share->setPassword($data['password']);
+            $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+            $share->setToken($data['token']);
+        }
+
+        $share->setSharedBy($data['uid_initiator']);
+        $share->setShareOwner($data['uid_owner']);
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            $share->setExpirationDate($expiration);
+        }
+
+        if (isset($data['f_permissions'])) {
+            $entryData = $data;
+            $entryData['permissions'] = $entryData['f_permissions'];
+            $entryData['parent'] = $entryData['f_parent'];
+            $share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
+                \OC::$server->getMimeTypeLoader()));
+        }
+
+        $share->setProviderId($this->identifier());
+        $share->setHideDownload((int)$data['hide_download'] === 1);
+
+        return $share;
+    }
+
+    /**
+     * @param Share[] $shares
+     * @param $userId
+     * @return Share[] The updates shares if no update is found for a share return the original
+     */
+    private function resolveGroupShares($shares, $userId) {
+        $result = [];
+
+        $start = 0;
+        while(true) {
+            /** @var Share[] $shareSlice */
+            $shareSlice = array_slice($shares, $start, 100);
+            $start += 100;
+
+            if ($shareSlice === []) {
+                break;
+            }
+
+            /** @var int[] $ids */
+            $ids = [];
+            /** @var Share[] $shareMap */
+            $shareMap = [];
+
+            foreach ($shareSlice as $share) {
+                $ids[] = (int)$share->getId();
+                $shareMap[$share->getId()] = $share;
+            }
+
+            $qb = $this->dbConn->getQueryBuilder();
+
+            $query = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            $stmt = $query->execute();
+
+            while($data = $stmt->fetch()) {
+                $shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
+                $shareMap[$data['parent']]->setStatus((int)$data['accepted']);
+                $shareMap[$data['parent']]->setTarget($data['file_target']);
+                $shareMap[$data['parent']]->setParent($data['parent']);
+            }
+
+            $stmt->closeCursor();
+
+            foreach ($shareMap as $share) {
+                $result[] = $share;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('share');
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * Delete all user shares that are owned by this user
 			 * or that are received by this user
 			 */
 
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
 
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			/*
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            /*
 			 * Delete all group shares that are owned by this user
 			 * Or special user group shares that are received by this user
 			 */
-			$qb->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-					),
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
-				)
-			);
-
-			$qb->orWhere(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
-			/*
+            $qb->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+                    ),
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
+                )
+            );
+
+            $qb->orWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
+            /*
 			 * Delete all link shares owned by this user.
 			 * And all link shares initiated by this user (until #22327 is in)
 			 */
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
-				)
-			);
-		} else {
-			\OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType));
-			return;
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Delete all shares received by this group. As well as any custom group
-	 * shares for group members.
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-		/*
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
+                )
+            );
+        } else {
+            \OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType));
+            return;
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Delete all shares received by this group. As well as any custom group
+     * shares for group members.
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+        /*
 		 * First delete all custom group shares for group members
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+
+        /*
 		 * Now delete all the group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-		$qb->execute();
-	}
-
-	/**
-	 * Delete custom group shares to this group for this user
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+        $qb->execute();
+    }
+
+    /**
+     * Delete custom group shares to this group for this user
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        /*
 		 * Get all group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                /*
 				 * Delete all special shares wit this users for the found group shares
 				 */
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$or = $qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		);
-
-		if ($currentAccess) {
-			$or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
-		}
-
-		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
-			->from('share')
-			->where(
-				$or
-			)
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-		$cursor = $qb->execute();
-
-		$users = [];
-		$link = false;
-		while($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
-			if ($type === \OCP\Share::SHARE_TYPE_USER) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			} else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
-				$gid = $row['share_with'];
-				$group = $this->groupManager->get($gid);
-
-				if ($group === null) {
-					continue;
-				}
-
-				$userList = $group->getUsers();
-				foreach ($userList as $user) {
-					$uid = $user->getUID();
-					$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-					$users[$uid][$row['id']] = $row;
-				}
-			} else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
-				$link = true;
-			} else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			}
-		}
-		$cursor->closeCursor();
-
-		if ($currentAccess === true) {
-			$users = array_map([$this, 'filterSharesOfUser'], $users);
-			$users = array_filter($users);
-		} else {
-			$users = array_keys($users);
-		}
-
-		return ['users' => $users, 'public' => $link];
-	}
-
-	/**
-	 * For each user the path with the fewest slashes is returned
-	 * @param array $shares
-	 * @return array
-	 */
-	protected function filterSharesOfUser(array $shares) {
-		// Group shares when the user has a share exception
-		foreach ($shares as $id => $share) {
-			$type = (int) $share['share_type'];
-			$permissions = (int) $share['permissions'];
-
-			if ($type === self::SHARE_TYPE_USERGROUP) {
-				unset($shares[$share['parent']]);
-
-				if ($permissions === 0) {
-					unset($shares[$id]);
-				}
-			}
-		}
-
-		$best = [];
-		$bestDepth = 0;
-		foreach ($shares as $id => $share) {
-			$depth = substr_count($share['file_target'], '/');
-			if (empty($best) || $depth < $bestDepth) {
-				$bestDepth = $depth;
-				$best = [
-					'node_id' => $share['file_source'],
-					'node_path' => $share['file_target'],
-				];
-			}
-		}
-
-		return $best;
-	}
-
-	/**
-	 * propagate notes to the recipients
-	 *
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function propagateNote(IShare $share) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$user = $this->userManager->get($share->getSharedWith());
-			$this->sendNote([$user], $share);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$groupMembers = $group->getUsers();
-			$this->sendNote($groupMembers, $share);
-		}
-	}
-
-	/**
-	 * send note by mail
-	 *
-	 * @param array $recipients
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function sendNote(array $recipients, IShare $share) {
-
-		$toList = [];
-
-		foreach ($recipients as $recipient) {
-			/** @var IUser $recipient */
-			$email = $recipient->getEMailAddress();
-			if ($email) {
-				$toList[$email] = $recipient->getDisplayName();
-			}
-		}
-
-		if (!empty($toList)) {
-
-			$filename = $share->getNode()->getName();
-			$initiator = $share->getSharedBy();
-			$note = $share->getNote();
-
-			$initiatorUser = $this->userManager->get($initiator);
-			$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-			$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-			$plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
-			$htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
-			$message = $this->mailer->createMessage();
-
-			$emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
-
-			$emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
-			$emailTemplate->addHeader();
-			$emailTemplate->addHeading($htmlHeading, $plainHeading);
-			$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-			$link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
-			$emailTemplate->addBodyButton(
-				$this->l->t('Open »%s«', [$filename]),
-				$link
-			);
-
-
-			// The "From" contains the sharers name
-			$instanceName = $this->defaults->getName();
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-			if ($initiatorEmailAddress !== null) {
-				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-			} else {
-				$emailTemplate->addFooter();
-			}
-
-			if (count($toList) === 1) {
-				$message->setTo($toList);
-			} else {
-				$message->setTo([]);
-				$message->setBcc($toList);
-			}
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		}
-
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_USER)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_GROUP)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_LINK))
-				)
-			);
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShare($data);
-			} catch (InvalidShare $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $or = $qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        );
+
+        if ($currentAccess) {
+            $or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
+        }
+
+        $qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
+            ->from('share')
+            ->where(
+                $or
+            )
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+        $cursor = $qb->execute();
+
+        $users = [];
+        $link = false;
+        while($row = $cursor->fetch()) {
+            $type = (int)$row['share_type'];
+            if ($type === \OCP\Share::SHARE_TYPE_USER) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            } else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
+                $gid = $row['share_with'];
+                $group = $this->groupManager->get($gid);
+
+                if ($group === null) {
+                    continue;
+                }
+
+                $userList = $group->getUsers();
+                foreach ($userList as $user) {
+                    $uid = $user->getUID();
+                    $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                    $users[$uid][$row['id']] = $row;
+                }
+            } else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
+                $link = true;
+            } else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            }
+        }
+        $cursor->closeCursor();
+
+        if ($currentAccess === true) {
+            $users = array_map([$this, 'filterSharesOfUser'], $users);
+            $users = array_filter($users);
+        } else {
+            $users = array_keys($users);
+        }
+
+        return ['users' => $users, 'public' => $link];
+    }
+
+    /**
+     * For each user the path with the fewest slashes is returned
+     * @param array $shares
+     * @return array
+     */
+    protected function filterSharesOfUser(array $shares) {
+        // Group shares when the user has a share exception
+        foreach ($shares as $id => $share) {
+            $type = (int) $share['share_type'];
+            $permissions = (int) $share['permissions'];
+
+            if ($type === self::SHARE_TYPE_USERGROUP) {
+                unset($shares[$share['parent']]);
+
+                if ($permissions === 0) {
+                    unset($shares[$id]);
+                }
+            }
+        }
+
+        $best = [];
+        $bestDepth = 0;
+        foreach ($shares as $id => $share) {
+            $depth = substr_count($share['file_target'], '/');
+            if (empty($best) || $depth < $bestDepth) {
+                $bestDepth = $depth;
+                $best = [
+                    'node_id' => $share['file_source'],
+                    'node_path' => $share['file_target'],
+                ];
+            }
+        }
+
+        return $best;
+    }
+
+    /**
+     * propagate notes to the recipients
+     *
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function propagateNote(IShare $share) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $user = $this->userManager->get($share->getSharedWith());
+            $this->sendNote([$user], $share);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $groupMembers = $group->getUsers();
+            $this->sendNote($groupMembers, $share);
+        }
+    }
+
+    /**
+     * send note by mail
+     *
+     * @param array $recipients
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function sendNote(array $recipients, IShare $share) {
+
+        $toList = [];
+
+        foreach ($recipients as $recipient) {
+            /** @var IUser $recipient */
+            $email = $recipient->getEMailAddress();
+            if ($email) {
+                $toList[$email] = $recipient->getDisplayName();
+            }
+        }
+
+        if (!empty($toList)) {
+
+            $filename = $share->getNode()->getName();
+            $initiator = $share->getSharedBy();
+            $note = $share->getNote();
+
+            $initiatorUser = $this->userManager->get($initiator);
+            $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+            $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+            $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
+            $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
+            $message = $this->mailer->createMessage();
+
+            $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
+
+            $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
+            $emailTemplate->addHeader();
+            $emailTemplate->addHeading($htmlHeading, $plainHeading);
+            $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+            $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+            $emailTemplate->addBodyButton(
+                $this->l->t('Open »%s«', [$filename]),
+                $link
+            );
+
+
+            // The "From" contains the sharers name
+            $instanceName = $this->defaults->getName();
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+            if ($initiatorEmailAddress !== null) {
+                $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+            } else {
+                $emailTemplate->addFooter();
+            }
+
+            if (count($toList) === 1) {
+                $message->setTo($toList);
+            } else {
+                $message->setTo([]);
+                $message->setBcc($toList);
+            }
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        }
+
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_USER)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_GROUP)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_LINK))
+                )
+            );
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShare($data);
+            } catch (InvalidShare $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
 }

lib/private/Comments/Comment.php

Indentation +422 added lines, -422 removed lines

@@ -31,426 +31,426 @@
 
 class Comment implements IComment {
 
-	protected $data = [
-		'id'              => '',
-		'parentId'        => '0',
-		'topmostParentId' => '0',
-		'childrenCount'   => '0',
-		'message'         => '',
-		'verb'            => '',
-		'actorType'       => '',
-		'actorId'         => '',
-		'objectType'      => '',
-		'objectId'        => '',
-		'referenceId'     => null,
-		'creationDT'      => null,
-		'latestChildDT'   => null,
-	];
-
-	/**
-	 * Comment constructor.
-	 *
-	 * @param array $data	optional, array with keys according to column names from
-	 * 						the comments database scheme
-	 */
-	public function __construct(array $data = null) {
-		if(is_array($data)) {
-			$this->fromArray($data);
-		}
-	}
-
-	/**
-	 * returns the ID of the comment
-	 *
-	 * It may return an empty string, if the comment was not stored.
-	 * It is expected that the concrete Comment implementation gives an ID
-	 * by itself (e.g. after saving).
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getId() {
-		return $this->data['id'];
-	}
-
-	/**
-	 * sets the ID of the comment and returns itself
-	 *
-	 * It is only allowed to set the ID only, if the current id is an empty
-	 * string (which means it is not stored in a database, storage or whatever
-	 * the concrete implementation does), or vice versa. Changing a given ID is
-	 * not permitted and must result in an IllegalIDChangeException.
-	 *
-	 * @param string $id
-	 * @return IComment
-	 * @throws IllegalIDChangeException
-	 * @since 9.0.0
-	 */
-	public function setId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		$id = trim($id);
-		if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
-			$this->data['id'] = $id;
-			return $this;
-		}
-
-		throw new IllegalIDChangeException('Not allowed to assign a new ID to an already saved comment.');
-	}
-
-	/**
-	 * returns the parent ID of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getParentId() {
-		return $this->data['parentId'];
-	}
-
-	/**
-	 * sets the parent ID and returns itself
-	 *
-	 * @param string $parentId
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setParentId($parentId) {
-		if(!is_string($parentId)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['parentId'] = trim($parentId);
-		return $this;
-	}
-
-	/**
-	 * returns the topmost parent ID of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTopmostParentId() {
-		return $this->data['topmostParentId'];
-	}
-
-
-	/**
-	 * sets the topmost parent ID and returns itself
-	 *
-	 * @param string $id
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setTopmostParentId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['topmostParentId'] = trim($id);
-		return $this;
-	}
-
-	/**
-	 * returns the number of children
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getChildrenCount() {
-		return $this->data['childrenCount'];
-	}
-
-	/**
-	 * sets the number of children
-	 *
-	 * @param int $count
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setChildrenCount($count) {
-		if(!is_int($count)) {
-			throw new \InvalidArgumentException('Integer expected.');
-		}
-		$this->data['childrenCount'] = $count;
-		return $this;
-	}
-
-	/**
-	 * returns the message of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getMessage() {
-		return $this->data['message'];
-	}
-
-	/**
-	 * sets the message of the comment and returns itself
-	 *
-	 * @param string $message
-	 * @param int $maxLength
-	 * @return IComment
-	 * @throws MessageTooLongException
-	 * @since 9.0.0
-	 */
-	public function setMessage($message, $maxLength = self::MAX_MESSAGE_LENGTH) {
-		if(!is_string($message)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$message = trim($message);
-		if ($maxLength && mb_strlen($message, 'UTF-8') > $maxLength) {
-			throw new MessageTooLongException('Comment message must not exceed ' . $maxLength. ' characters');
-		}
-		$this->data['message'] = $message;
-		return $this;
-	}
-
-	/**
-	 * returns an array containing mentions that are included in the comment
-	 *
-	 * @return array each mention provides a 'type' and an 'id', see example below
-	 * @since 11.0.0
-	 *
-	 * The return array looks like:
-	 * [
-	 *   [
-	 *     'type' => 'user',
-	 *     'id' => 'citizen4'
-	 *   ],
-	 *   [
-	 *     'type' => 'group',
-	 *     'id' => 'media'
-	 *   ],
-	 *   …
-	 * ]
-	 *
-	 */
-	public function getMentions() {
-		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"guest\/[a-f0-9]+\"|\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
-		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
-			return [];
-		}
-		$uids = array_unique($mentions[0]);
-		$result = [];
-		foreach ($uids as $uid) {
-			$cleanUid = trim(substr($uid, 1), '"');
-			if (strpos($cleanUid, 'guest/') === 0) {
-				$result[] = ['type' => 'guest', 'id' => $cleanUid];
-			} else {
-				$result[] = ['type' => 'user', 'id' => $cleanUid];
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * returns the verb of the comment
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getVerb() {
-		return $this->data['verb'];
-	}
-
-	/**
-	 * sets the verb of the comment, e.g. 'comment' or 'like'
-	 *
-	 * @param string $verb
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setVerb($verb) {
-		if(!is_string($verb) || !trim($verb)) {
-			throw new \InvalidArgumentException('Non-empty String expected.');
-		}
-		$this->data['verb'] = trim($verb);
-		return $this;
-	}
-
-	/**
-	 * returns the actor type
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getActorType() {
-		return $this->data['actorType'];
-	}
-
-	/**
-	 * returns the actor ID
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getActorId() {
-		return $this->data['actorId'];
-	}
-
-	/**
-	 * sets (overwrites) the actor type and id
-	 *
-	 * @param string $actorType e.g. 'users'
-	 * @param string $actorId e.g. 'zombie234'
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setActor($actorType, $actorId) {
-		if(
-			   !is_string($actorType) || !trim($actorType)
-			|| !is_string($actorId)   || $actorId === ''
-		) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['actorType'] = trim($actorType);
-		$this->data['actorId']   = $actorId;
-		return $this;
-	}
-
-	/**
-	 * returns the creation date of the comment.
-	 *
-	 * If not explicitly set, it shall default to the time of initialization.
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getCreationDateTime() {
-		return $this->data['creationDT'];
-	}
-
-	/**
-	 * sets the creation date of the comment and returns itself
-	 *
-	 * @param \DateTime $timestamp
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setCreationDateTime(\DateTime $timestamp) {
-		$this->data['creationDT'] = $timestamp;
-		return $this;
-	}
-
-	/**
-	 * returns the DateTime of the most recent child, if set, otherwise null
-	 *
-	 * @return \DateTime|null
-	 * @since 9.0.0
-	 */
-	public function getLatestChildDateTime() {
-		return $this->data['latestChildDT'];
-	}
-
-	/**
-	 * sets the date of the most recent child
-	 *
-	 * @param \DateTime $dateTime
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setLatestChildDateTime(\DateTime $dateTime = null) {
-		$this->data['latestChildDT'] = $dateTime;
-		return $this;
-	}
-
-	/**
-	 * returns the object type the comment is attached to
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectType() {
-		return $this->data['objectType'];
-	}
-
-	/**
-	 * returns the object id the comment is attached to
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getObjectId() {
-		return $this->data['objectId'];
-	}
-
-	/**
-	 * sets (overwrites) the object of the comment
-	 *
-	 * @param string $objectType e.g. 'files'
-	 * @param string $objectId e.g. '16435'
-	 * @return IComment
-	 * @since 9.0.0
-	 */
-	public function setObject($objectType, $objectId) {
-		if(
-			   !is_string($objectType) || !trim($objectType)
-			|| !is_string($objectId)   || trim($objectId) === ''
-		) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-		$this->data['objectType'] = trim($objectType);
-		$this->data['objectId']   = trim($objectId);
-		return $this;
-	}
-
-	/**
-	 * returns the reference id of the comment
-	 *
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getReferenceId(): ?string {
-		return $this->data['referenceId'];
-	}
-
-	/**
-	 * sets (overwrites) the reference id of the comment
-	 *
-	 * @param string $referenceId e.g. sha256 hash sum
-	 * @return IComment
-	 * @since 19.0.0
-	 */
-	public function setReferenceId(?string $referenceId): IComment {
-		if ($referenceId === null) {
-			$this->data['referenceId'] = $referenceId;
-		} else {
-			$referenceId = trim($referenceId);
-			if ($referenceId === '') {
-				throw new \InvalidArgumentException('Non empty string expected.');
-			}
-			$this->data['referenceId'] = $referenceId;
-		}
-		return $this;
-	}
-
-	/**
-	 * sets the comment data based on an array with keys as taken from the
-	 * database.
-	 *
-	 * @param array $data
-	 * @return IComment
-	 */
-	protected function fromArray($data) {
-		foreach(array_keys($data) as $key) {
-			// translate DB keys to internal setter names
-			$setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
-			$setter = str_replace('Timestamp', 'DateTime', $setter);
-
-			if(method_exists($this, $setter)) {
-				$this->$setter($data[$key]);
-			}
-		}
-
-		foreach(['actor', 'object'] as $role) {
-			if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
-				$setter = 'set' . ucfirst($role);
-				$this->$setter($data[$role . '_type'], $data[$role . '_id']);
-			}
-		}
-
-		return $this;
-	}
+    protected $data = [
+        'id'              => '',
+        'parentId'        => '0',
+        'topmostParentId' => '0',
+        'childrenCount'   => '0',
+        'message'         => '',
+        'verb'            => '',
+        'actorType'       => '',
+        'actorId'         => '',
+        'objectType'      => '',
+        'objectId'        => '',
+        'referenceId'     => null,
+        'creationDT'      => null,
+        'latestChildDT'   => null,
+    ];
+
+    /**
+     * Comment constructor.
+     *
+     * @param array $data	optional, array with keys according to column names from
+     * 						the comments database scheme
+     */
+    public function __construct(array $data = null) {
+        if(is_array($data)) {
+            $this->fromArray($data);
+        }
+    }
+
+    /**
+     * returns the ID of the comment
+     *
+     * It may return an empty string, if the comment was not stored.
+     * It is expected that the concrete Comment implementation gives an ID
+     * by itself (e.g. after saving).
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getId() {
+        return $this->data['id'];
+    }
+
+    /**
+     * sets the ID of the comment and returns itself
+     *
+     * It is only allowed to set the ID only, if the current id is an empty
+     * string (which means it is not stored in a database, storage or whatever
+     * the concrete implementation does), or vice versa. Changing a given ID is
+     * not permitted and must result in an IllegalIDChangeException.
+     *
+     * @param string $id
+     * @return IComment
+     * @throws IllegalIDChangeException
+     * @since 9.0.0
+     */
+    public function setId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        $id = trim($id);
+        if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
+            $this->data['id'] = $id;
+            return $this;
+        }
+
+        throw new IllegalIDChangeException('Not allowed to assign a new ID to an already saved comment.');
+    }
+
+    /**
+     * returns the parent ID of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getParentId() {
+        return $this->data['parentId'];
+    }
+
+    /**
+     * sets the parent ID and returns itself
+     *
+     * @param string $parentId
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setParentId($parentId) {
+        if(!is_string($parentId)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['parentId'] = trim($parentId);
+        return $this;
+    }
+
+    /**
+     * returns the topmost parent ID of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTopmostParentId() {
+        return $this->data['topmostParentId'];
+    }
+
+
+    /**
+     * sets the topmost parent ID and returns itself
+     *
+     * @param string $id
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setTopmostParentId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['topmostParentId'] = trim($id);
+        return $this;
+    }
+
+    /**
+     * returns the number of children
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getChildrenCount() {
+        return $this->data['childrenCount'];
+    }
+
+    /**
+     * sets the number of children
+     *
+     * @param int $count
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setChildrenCount($count) {
+        if(!is_int($count)) {
+            throw new \InvalidArgumentException('Integer expected.');
+        }
+        $this->data['childrenCount'] = $count;
+        return $this;
+    }
+
+    /**
+     * returns the message of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getMessage() {
+        return $this->data['message'];
+    }
+
+    /**
+     * sets the message of the comment and returns itself
+     *
+     * @param string $message
+     * @param int $maxLength
+     * @return IComment
+     * @throws MessageTooLongException
+     * @since 9.0.0
+     */
+    public function setMessage($message, $maxLength = self::MAX_MESSAGE_LENGTH) {
+        if(!is_string($message)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $message = trim($message);
+        if ($maxLength && mb_strlen($message, 'UTF-8') > $maxLength) {
+            throw new MessageTooLongException('Comment message must not exceed ' . $maxLength. ' characters');
+        }
+        $this->data['message'] = $message;
+        return $this;
+    }
+
+    /**
+     * returns an array containing mentions that are included in the comment
+     *
+     * @return array each mention provides a 'type' and an 'id', see example below
+     * @since 11.0.0
+     *
+     * The return array looks like:
+     * [
+     *   [
+     *     'type' => 'user',
+     *     'id' => 'citizen4'
+     *   ],
+     *   [
+     *     'type' => 'group',
+     *     'id' => 'media'
+     *   ],
+     *   …
+     * ]
+     *
+     */
+    public function getMentions() {
+        $ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"guest\/[a-f0-9]+\"|\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
+        if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
+            return [];
+        }
+        $uids = array_unique($mentions[0]);
+        $result = [];
+        foreach ($uids as $uid) {
+            $cleanUid = trim(substr($uid, 1), '"');
+            if (strpos($cleanUid, 'guest/') === 0) {
+                $result[] = ['type' => 'guest', 'id' => $cleanUid];
+            } else {
+                $result[] = ['type' => 'user', 'id' => $cleanUid];
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * returns the verb of the comment
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getVerb() {
+        return $this->data['verb'];
+    }
+
+    /**
+     * sets the verb of the comment, e.g. 'comment' or 'like'
+     *
+     * @param string $verb
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setVerb($verb) {
+        if(!is_string($verb) || !trim($verb)) {
+            throw new \InvalidArgumentException('Non-empty String expected.');
+        }
+        $this->data['verb'] = trim($verb);
+        return $this;
+    }
+
+    /**
+     * returns the actor type
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getActorType() {
+        return $this->data['actorType'];
+    }
+
+    /**
+     * returns the actor ID
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getActorId() {
+        return $this->data['actorId'];
+    }
+
+    /**
+     * sets (overwrites) the actor type and id
+     *
+     * @param string $actorType e.g. 'users'
+     * @param string $actorId e.g. 'zombie234'
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setActor($actorType, $actorId) {
+        if(
+                !is_string($actorType) || !trim($actorType)
+            || !is_string($actorId)   || $actorId === ''
+        ) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['actorType'] = trim($actorType);
+        $this->data['actorId']   = $actorId;
+        return $this;
+    }
+
+    /**
+     * returns the creation date of the comment.
+     *
+     * If not explicitly set, it shall default to the time of initialization.
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getCreationDateTime() {
+        return $this->data['creationDT'];
+    }
+
+    /**
+     * sets the creation date of the comment and returns itself
+     *
+     * @param \DateTime $timestamp
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setCreationDateTime(\DateTime $timestamp) {
+        $this->data['creationDT'] = $timestamp;
+        return $this;
+    }
+
+    /**
+     * returns the DateTime of the most recent child, if set, otherwise null
+     *
+     * @return \DateTime|null
+     * @since 9.0.0
+     */
+    public function getLatestChildDateTime() {
+        return $this->data['latestChildDT'];
+    }
+
+    /**
+     * sets the date of the most recent child
+     *
+     * @param \DateTime $dateTime
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setLatestChildDateTime(\DateTime $dateTime = null) {
+        $this->data['latestChildDT'] = $dateTime;
+        return $this;
+    }
+
+    /**
+     * returns the object type the comment is attached to
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectType() {
+        return $this->data['objectType'];
+    }
+
+    /**
+     * returns the object id the comment is attached to
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getObjectId() {
+        return $this->data['objectId'];
+    }
+
+    /**
+     * sets (overwrites) the object of the comment
+     *
+     * @param string $objectType e.g. 'files'
+     * @param string $objectId e.g. '16435'
+     * @return IComment
+     * @since 9.0.0
+     */
+    public function setObject($objectType, $objectId) {
+        if(
+                !is_string($objectType) || !trim($objectType)
+            || !is_string($objectId)   || trim($objectId) === ''
+        ) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+        $this->data['objectType'] = trim($objectType);
+        $this->data['objectId']   = trim($objectId);
+        return $this;
+    }
+
+    /**
+     * returns the reference id of the comment
+     *
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getReferenceId(): ?string {
+        return $this->data['referenceId'];
+    }
+
+    /**
+     * sets (overwrites) the reference id of the comment
+     *
+     * @param string $referenceId e.g. sha256 hash sum
+     * @return IComment
+     * @since 19.0.0
+     */
+    public function setReferenceId(?string $referenceId): IComment {
+        if ($referenceId === null) {
+            $this->data['referenceId'] = $referenceId;
+        } else {
+            $referenceId = trim($referenceId);
+            if ($referenceId === '') {
+                throw new \InvalidArgumentException('Non empty string expected.');
+            }
+            $this->data['referenceId'] = $referenceId;
+        }
+        return $this;
+    }
+
+    /**
+     * sets the comment data based on an array with keys as taken from the
+     * database.
+     *
+     * @param array $data
+     * @return IComment
+     */
+    protected function fromArray($data) {
+        foreach(array_keys($data) as $key) {
+            // translate DB keys to internal setter names
+            $setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
+            $setter = str_replace('Timestamp', 'DateTime', $setter);
+
+            if(method_exists($this, $setter)) {
+                $this->$setter($data[$key]);
+            }
+        }
+
+        foreach(['actor', 'object'] as $role) {
+            if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
+                $setter = 'set' . ucfirst($role);
+                $this->$setter($data[$role . '_type'], $data[$role . '_id']);
+            }
+        }
+
+        return $this;
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -54,7 +54,7 @@ 
 	 * 						the comments database scheme
 	 */
 	public function __construct(array $data = null) {
-		if(is_array($data)) {
+		if (is_array($data)) {
 			$this->fromArray($data);
 		}
 	}
@@ -87,12 +87,12 @@ 
 	 * @since 9.0.0
 	 */
 	public function setId($id) {
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 
 		$id = trim($id);
-		if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
+		if ($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
 			$this->data['id'] = $id;
 			return $this;
 		}
@@ -118,7 +118,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setParentId($parentId) {
-		if(!is_string($parentId)) {
+		if (!is_string($parentId)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$this->data['parentId'] = trim($parentId);
@@ -144,7 +144,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setTopmostParentId($id) {
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$this->data['topmostParentId'] = trim($id);
@@ -169,7 +169,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setChildrenCount($count) {
-		if(!is_int($count)) {
+		if (!is_int($count)) {
 			throw new \InvalidArgumentException('Integer expected.');
 		}
 		$this->data['childrenCount'] = $count;
@@ -196,12 +196,12 @@ 
 	 * @since 9.0.0
 	 */
 	public function setMessage($message, $maxLength = self::MAX_MESSAGE_LENGTH) {
-		if(!is_string($message)) {
+		if (!is_string($message)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$message = trim($message);
 		if ($maxLength && mb_strlen($message, 'UTF-8') > $maxLength) {
-			throw new MessageTooLongException('Comment message must not exceed ' . $maxLength. ' characters');
+			throw new MessageTooLongException('Comment message must not exceed '.$maxLength.' characters');
 		}
 		$this->data['message'] = $message;
 		return $this;
@@ -229,7 +229,7 @@ 
 	 */
 	public function getMentions() {
 		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"guest\/[a-f0-9]+\"|\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
-		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
+		if (!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
 			return [];
 		}
 		$uids = array_unique($mentions[0]);
@@ -263,7 +263,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setVerb($verb) {
-		if(!is_string($verb) || !trim($verb)) {
+		if (!is_string($verb) || !trim($verb)) {
 			throw new \InvalidArgumentException('Non-empty String expected.');
 		}
 		$this->data['verb'] = trim($verb);
@@ -299,9 +299,9 @@ 
 	 * @since 9.0.0
 	 */
 	public function setActor($actorType, $actorId) {
-		if(
+		if (
 			   !is_string($actorType) || !trim($actorType)
-			|| !is_string($actorId)   || $actorId === ''
+			|| !is_string($actorId) || $actorId === ''
 		) {
 			throw new \InvalidArgumentException('String expected.');
 		}
@@ -385,9 +385,9 @@ 
 	 * @since 9.0.0
 	 */
 	public function setObject($objectType, $objectId) {
-		if(
+		if (
 			   !is_string($objectType) || !trim($objectType)
-			|| !is_string($objectId)   || trim($objectId) === ''
+			|| !is_string($objectId) || trim($objectId) === ''
 		) {
 			throw new \InvalidArgumentException('String expected.');
 		}
@@ -434,20 +434,20 @@ 
 	 * @return IComment
 	 */
 	protected function fromArray($data) {
-		foreach(array_keys($data) as $key) {
+		foreach (array_keys($data) as $key) {
 			// translate DB keys to internal setter names
-			$setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
+			$setter = 'set'.implode('', array_map('ucfirst', explode('_', $key)));
 			$setter = str_replace('Timestamp', 'DateTime', $setter);
 
-			if(method_exists($this, $setter)) {
+			if (method_exists($this, $setter)) {
 				$this->$setter($data[$key]);
 			}
 		}
 
-		foreach(['actor', 'object'] as $role) {
-			if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
-				$setter = 'set' . ucfirst($role);
-				$this->$setter($data[$role . '_type'], $data[$role . '_id']);
+		foreach (['actor', 'object'] as $role) {
+			if (isset($data[$role.'_type']) && isset($data[$role.'_id'])) {
+				$setter = 'set'.ucfirst($role);
+				$this->$setter($data[$role.'_type'], $data[$role.'_id']);
 			}
 		}
 

lib/private/Authentication/TwoFactorAuth/Manager.php

Indentation +334 added lines, -334 removed lines

@@ -47,342 +47,342 @@
 
 class Manager {
 
-	const SESSION_UID_KEY = 'two_factor_auth_uid';
-	const SESSION_UID_DONE = 'two_factor_auth_passed';
-	const REMEMBER_LOGIN = 'two_factor_remember_login';
-	const BACKUP_CODES_PROVIDER_ID = 'backup_codes';
-
-	/** @var ProviderLoader */
-	private $providerLoader;
-
-	/** @var IRegistry */
-	private $providerRegistry;
-
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var TokenProvider */
-	private $tokenProvider;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct(ProviderLoader $providerLoader,
-								IRegistry $providerRegistry,
-								MandatoryTwoFactor $mandatoryTwoFactor,
-								ISession $session, IConfig $config,
-								IManager $activityManager, ILogger $logger, TokenProvider $tokenProvider,
-								ITimeFactory $timeFactory, EventDispatcherInterface $eventDispatcher) {
-		$this->providerLoader = $providerLoader;
-		$this->providerRegistry = $providerRegistry;
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->session = $session;
-		$this->config = $config;
-		$this->activityManager = $activityManager;
-		$this->logger = $logger;
-		$this->tokenProvider = $tokenProvider;
-		$this->timeFactory = $timeFactory;
-		$this->dispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * Determine whether the user must provide a second factor challenge
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthenticated(IUser $user): bool {
-		if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
-			return true;
-		}
-
-		$providerStates = $this->providerRegistry->getProviderStates($user);
-		$providers = $this->providerLoader->getProviders($user);
-		$fixedStates = $this->fixMissingProviderStates($providerStates, $providers, $user);
-		$enabled = array_filter($fixedStates);
-		$providerIds = array_keys($enabled);
-		$providerIdsWithoutBackupCodes = array_diff($providerIds, [self::BACKUP_CODES_PROVIDER_ID]);
-
-		return !empty($providerIdsWithoutBackupCodes);
-	}
-
-	/**
-	 * Get a 2FA provider by its ID
-	 *
-	 * @param IUser $user
-	 * @param string $challengeProviderId
-	 * @return IProvider|null
-	 */
-	public function getProvider(IUser $user, string $challengeProviderId) {
-		$providers = $this->getProviderSet($user)->getProviders();
-		return $providers[$challengeProviderId] ?? null;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return IActivatableAtLogin[]
-	 * @throws Exception
-	 */
-	public function getLoginSetupProviders(IUser $user): array {
-		$providers = $this->providerLoader->getProviders($user);
-		return array_filter($providers, function(IProvider $provider) {
-			return ($provider instanceof IActivatableAtLogin);
-		});
-	}
-
-	/**
-	 * Check if the persistant mapping of enabled/disabled state of each available
-	 * provider is missing an entry and add it to the registry in that case.
-	 *
-	 * @todo remove in Nextcloud 17 as by then all providers should have been updated
-	 *
-	 * @param string[] $providerStates
-	 * @param IProvider[] $providers
-	 * @param IUser $user
-	 * @return string[] the updated $providerStates variable
-	 */
-	private function fixMissingProviderStates(array $providerStates,
-		array $providers, IUser $user): array {
-
-		foreach ($providers as $provider) {
-			if (isset($providerStates[$provider->getId()])) {
-				// All good
-				continue;
-			}
-
-			$enabled = $provider->isTwoFactorAuthEnabledForUser($user);
-			if ($enabled) {
-				$this->providerRegistry->enableProviderFor($provider, $user);
-			} else {
-				$this->providerRegistry->disableProviderFor($provider, $user);
-			}
-			$providerStates[$provider->getId()] = $enabled;
-		}
-
-		return $providerStates;
-	}
-
-	/**
-	 * @param array $states
-	 * @param IProvider[] $providers
-	 */
-	private function isProviderMissing(array $states, array $providers): bool {
-		$indexed = [];
-		foreach ($providers as $provider) {
-			$indexed[$provider->getId()] = $provider;
-		}
-
-		$missing = [];
-		foreach ($states as $providerId => $enabled) {
-			if (!$enabled) {
-				// Don't care
-				continue;
-			}
-
-			if (!isset($indexed[$providerId])) {
-				$missing[] = $providerId;
-				$this->logger->alert("two-factor auth provider '$providerId' failed to load",
-					[
-						'app' => 'core',
-					]);
-			}
-		}
-
-		if (!empty($missing)) {
-			// There was at least one provider missing
-			$this->logger->alert(count($missing) . " two-factor auth providers failed to load", ['app' => 'core']);
-
-			return true;
-		}
-
-		// If we reach this, there was not a single provider missing
-		return false;
-	}
-
-	/**
-	 * Get the list of 2FA providers for the given user
-	 *
-	 * @param IUser $user
-	 * @throws Exception
-	 */
-	public function getProviderSet(IUser $user): ProviderSet {
-		$providerStates = $this->providerRegistry->getProviderStates($user);
-		$providers = $this->providerLoader->getProviders($user);
-
-		$fixedStates = $this->fixMissingProviderStates($providerStates, $providers, $user);
-		$isProviderMissing = $this->isProviderMissing($fixedStates, $providers);
-
-		$enabled = array_filter($providers, function (IProvider $provider) use ($fixedStates) {
-			return $fixedStates[$provider->getId()];
-		});
-		return new ProviderSet($enabled, $isProviderMissing);
-	}
-
-	/**
-	 * Verify the given challenge
-	 *
-	 * @param string $providerId
-	 * @param IUser $user
-	 * @param string $challenge
-	 * @return boolean
-	 */
-	public function verifyChallenge(string $providerId, IUser $user, string $challenge): bool {
-		$provider = $this->getProvider($user, $providerId);
-		if ($provider === null) {
-			return false;
-		}
-
-		$passed = $provider->verifyChallenge($user, $challenge);
-		if ($passed) {
-			if ($this->session->get(self::REMEMBER_LOGIN) === true) {
-				// TODO: resolve cyclic dependency and use DI
-				\OC::$server->getUserSession()->createRememberMeToken($user);
-			}
-			$this->session->remove(self::SESSION_UID_KEY);
-			$this->session->remove(self::REMEMBER_LOGIN);
-			$this->session->set(self::SESSION_UID_DONE, $user->getUID());
-
-			// Clear token from db
-			$sessionId = $this->session->getId();
-			$token = $this->tokenProvider->getToken($sessionId);
-			$tokenId = $token->getId();
-			$this->config->deleteUserValue($user->getUID(), 'login_token_2fa', $tokenId);
-
-			$dispatchEvent = new GenericEvent($user, ['provider' => $provider->getDisplayName()]);
-			$this->dispatcher->dispatch(IProvider::EVENT_SUCCESS, $dispatchEvent);
-
-			$this->publishEvent($user, 'twofactor_success', [
-				'provider' => $provider->getDisplayName(),
-			]);
-		} else {
-			$dispatchEvent = new GenericEvent($user, ['provider' => $provider->getDisplayName()]);
-			$this->dispatcher->dispatch(IProvider::EVENT_FAILED, $dispatchEvent);
-
-			$this->publishEvent($user, 'twofactor_failed', [
-				'provider' => $provider->getDisplayName(),
-			]);
-		}
-		return $passed;
-	}
-
-	/**
-	 * Push a 2fa event the user's activity stream
-	 *
-	 * @param IUser $user
-	 * @param string $event
-	 * @param array $params
-	 */
-	private function publishEvent(IUser $user, string $event, array $params) {
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('core')
-			->setType('security')
-			->setAuthor($user->getUID())
-			->setAffectedUser($user->getUID())
-			->setSubject($event, $params);
-		try {
-			$this->activityManager->publish($activity);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish activity', ['app' => 'core']);
-			$this->logger->logException($e, ['app' => 'core']);
-		}
-	}
-
-	/**
-	 * Check if the currently logged in user needs to pass 2FA
-	 *
-	 * @param IUser $user the currently logged in user
-	 * @return boolean
-	 */
-	public function needsSecondFactor(IUser $user = null): bool {
-		if ($user === null) {
-			return false;
-		}
-
-		// If we are authenticated using an app password skip all this
-		if ($this->session->exists('app_password')) {
-			return false;
-		}
-
-		// First check if the session tells us we should do 2FA (99% case)
-		if (!$this->session->exists(self::SESSION_UID_KEY)) {
-
-			// Check if the session tells us it is 2FA authenticated already
-			if ($this->session->exists(self::SESSION_UID_DONE) &&
-				$this->session->get(self::SESSION_UID_DONE) === $user->getUID()) {
-				return false;
-			}
-
-			/*
+    const SESSION_UID_KEY = 'two_factor_auth_uid';
+    const SESSION_UID_DONE = 'two_factor_auth_passed';
+    const REMEMBER_LOGIN = 'two_factor_remember_login';
+    const BACKUP_CODES_PROVIDER_ID = 'backup_codes';
+
+    /** @var ProviderLoader */
+    private $providerLoader;
+
+    /** @var IRegistry */
+    private $providerRegistry;
+
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var TokenProvider */
+    private $tokenProvider;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    public function __construct(ProviderLoader $providerLoader,
+                                IRegistry $providerRegistry,
+                                MandatoryTwoFactor $mandatoryTwoFactor,
+                                ISession $session, IConfig $config,
+                                IManager $activityManager, ILogger $logger, TokenProvider $tokenProvider,
+                                ITimeFactory $timeFactory, EventDispatcherInterface $eventDispatcher) {
+        $this->providerLoader = $providerLoader;
+        $this->providerRegistry = $providerRegistry;
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+        $this->session = $session;
+        $this->config = $config;
+        $this->activityManager = $activityManager;
+        $this->logger = $logger;
+        $this->tokenProvider = $tokenProvider;
+        $this->timeFactory = $timeFactory;
+        $this->dispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Determine whether the user must provide a second factor challenge
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthenticated(IUser $user): bool {
+        if ($this->mandatoryTwoFactor->isEnforcedFor($user)) {
+            return true;
+        }
+
+        $providerStates = $this->providerRegistry->getProviderStates($user);
+        $providers = $this->providerLoader->getProviders($user);
+        $fixedStates = $this->fixMissingProviderStates($providerStates, $providers, $user);
+        $enabled = array_filter($fixedStates);
+        $providerIds = array_keys($enabled);
+        $providerIdsWithoutBackupCodes = array_diff($providerIds, [self::BACKUP_CODES_PROVIDER_ID]);
+
+        return !empty($providerIdsWithoutBackupCodes);
+    }
+
+    /**
+     * Get a 2FA provider by its ID
+     *
+     * @param IUser $user
+     * @param string $challengeProviderId
+     * @return IProvider|null
+     */
+    public function getProvider(IUser $user, string $challengeProviderId) {
+        $providers = $this->getProviderSet($user)->getProviders();
+        return $providers[$challengeProviderId] ?? null;
+    }
+
+    /**
+     * @param IUser $user
+     * @return IActivatableAtLogin[]
+     * @throws Exception
+     */
+    public function getLoginSetupProviders(IUser $user): array {
+        $providers = $this->providerLoader->getProviders($user);
+        return array_filter($providers, function(IProvider $provider) {
+            return ($provider instanceof IActivatableAtLogin);
+        });
+    }
+
+    /**
+     * Check if the persistant mapping of enabled/disabled state of each available
+     * provider is missing an entry and add it to the registry in that case.
+     *
+     * @todo remove in Nextcloud 17 as by then all providers should have been updated
+     *
+     * @param string[] $providerStates
+     * @param IProvider[] $providers
+     * @param IUser $user
+     * @return string[] the updated $providerStates variable
+     */
+    private function fixMissingProviderStates(array $providerStates,
+        array $providers, IUser $user): array {
+
+        foreach ($providers as $provider) {
+            if (isset($providerStates[$provider->getId()])) {
+                // All good
+                continue;
+            }
+
+            $enabled = $provider->isTwoFactorAuthEnabledForUser($user);
+            if ($enabled) {
+                $this->providerRegistry->enableProviderFor($provider, $user);
+            } else {
+                $this->providerRegistry->disableProviderFor($provider, $user);
+            }
+            $providerStates[$provider->getId()] = $enabled;
+        }
+
+        return $providerStates;
+    }
+
+    /**
+     * @param array $states
+     * @param IProvider[] $providers
+     */
+    private function isProviderMissing(array $states, array $providers): bool {
+        $indexed = [];
+        foreach ($providers as $provider) {
+            $indexed[$provider->getId()] = $provider;
+        }
+
+        $missing = [];
+        foreach ($states as $providerId => $enabled) {
+            if (!$enabled) {
+                // Don't care
+                continue;
+            }
+
+            if (!isset($indexed[$providerId])) {
+                $missing[] = $providerId;
+                $this->logger->alert("two-factor auth provider '$providerId' failed to load",
+                    [
+                        'app' => 'core',
+                    ]);
+            }
+        }
+
+        if (!empty($missing)) {
+            // There was at least one provider missing
+            $this->logger->alert(count($missing) . " two-factor auth providers failed to load", ['app' => 'core']);
+
+            return true;
+        }
+
+        // If we reach this, there was not a single provider missing
+        return false;
+    }
+
+    /**
+     * Get the list of 2FA providers for the given user
+     *
+     * @param IUser $user
+     * @throws Exception
+     */
+    public function getProviderSet(IUser $user): ProviderSet {
+        $providerStates = $this->providerRegistry->getProviderStates($user);
+        $providers = $this->providerLoader->getProviders($user);
+
+        $fixedStates = $this->fixMissingProviderStates($providerStates, $providers, $user);
+        $isProviderMissing = $this->isProviderMissing($fixedStates, $providers);
+
+        $enabled = array_filter($providers, function (IProvider $provider) use ($fixedStates) {
+            return $fixedStates[$provider->getId()];
+        });
+        return new ProviderSet($enabled, $isProviderMissing);
+    }
+
+    /**
+     * Verify the given challenge
+     *
+     * @param string $providerId
+     * @param IUser $user
+     * @param string $challenge
+     * @return boolean
+     */
+    public function verifyChallenge(string $providerId, IUser $user, string $challenge): bool {
+        $provider = $this->getProvider($user, $providerId);
+        if ($provider === null) {
+            return false;
+        }
+
+        $passed = $provider->verifyChallenge($user, $challenge);
+        if ($passed) {
+            if ($this->session->get(self::REMEMBER_LOGIN) === true) {
+                // TODO: resolve cyclic dependency and use DI
+                \OC::$server->getUserSession()->createRememberMeToken($user);
+            }
+            $this->session->remove(self::SESSION_UID_KEY);
+            $this->session->remove(self::REMEMBER_LOGIN);
+            $this->session->set(self::SESSION_UID_DONE, $user->getUID());
+
+            // Clear token from db
+            $sessionId = $this->session->getId();
+            $token = $this->tokenProvider->getToken($sessionId);
+            $tokenId = $token->getId();
+            $this->config->deleteUserValue($user->getUID(), 'login_token_2fa', $tokenId);
+
+            $dispatchEvent = new GenericEvent($user, ['provider' => $provider->getDisplayName()]);
+            $this->dispatcher->dispatch(IProvider::EVENT_SUCCESS, $dispatchEvent);
+
+            $this->publishEvent($user, 'twofactor_success', [
+                'provider' => $provider->getDisplayName(),
+            ]);
+        } else {
+            $dispatchEvent = new GenericEvent($user, ['provider' => $provider->getDisplayName()]);
+            $this->dispatcher->dispatch(IProvider::EVENT_FAILED, $dispatchEvent);
+
+            $this->publishEvent($user, 'twofactor_failed', [
+                'provider' => $provider->getDisplayName(),
+            ]);
+        }
+        return $passed;
+    }
+
+    /**
+     * Push a 2fa event the user's activity stream
+     *
+     * @param IUser $user
+     * @param string $event
+     * @param array $params
+     */
+    private function publishEvent(IUser $user, string $event, array $params) {
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('core')
+            ->setType('security')
+            ->setAuthor($user->getUID())
+            ->setAffectedUser($user->getUID())
+            ->setSubject($event, $params);
+        try {
+            $this->activityManager->publish($activity);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish activity', ['app' => 'core']);
+            $this->logger->logException($e, ['app' => 'core']);
+        }
+    }
+
+    /**
+     * Check if the currently logged in user needs to pass 2FA
+     *
+     * @param IUser $user the currently logged in user
+     * @return boolean
+     */
+    public function needsSecondFactor(IUser $user = null): bool {
+        if ($user === null) {
+            return false;
+        }
+
+        // If we are authenticated using an app password skip all this
+        if ($this->session->exists('app_password')) {
+            return false;
+        }
+
+        // First check if the session tells us we should do 2FA (99% case)
+        if (!$this->session->exists(self::SESSION_UID_KEY)) {
+
+            // Check if the session tells us it is 2FA authenticated already
+            if ($this->session->exists(self::SESSION_UID_DONE) &&
+                $this->session->get(self::SESSION_UID_DONE) === $user->getUID()) {
+                return false;
+            }
+
+            /*
 			 * If the session is expired check if we are not logged in by a token
 			 * that still needs 2FA auth
 			 */
-			try {
-				$sessionId = $this->session->getId();
-				$token = $this->tokenProvider->getToken($sessionId);
-				$tokenId = $token->getId();
-				$tokensNeeding2FA = $this->config->getUserKeys($user->getUID(), 'login_token_2fa');
-
-				if (!\in_array($tokenId, $tokensNeeding2FA, true)) {
-					$this->session->set(self::SESSION_UID_DONE, $user->getUID());
-					return false;
-				}
-			} catch (InvalidTokenException $e) {
-			}
-		}
-
-		if (!$this->isTwoFactorAuthenticated($user)) {
-			// There is no second factor any more -> let the user pass
-			//   This prevents infinite redirect loops when a user is about
-			//   to solve the 2FA challenge, and the provider app is
-			//   disabled the same time
-			$this->session->remove(self::SESSION_UID_KEY);
-
-			$keys = $this->config->getUserKeys($user->getUID(), 'login_token_2fa');
-			foreach ($keys as $key) {
-				$this->config->deleteUserValue($user->getUID(), 'login_token_2fa', $key);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Prepare the 2FA login
-	 *
-	 * @param IUser $user
-	 * @param boolean $rememberMe
-	 */
-	public function prepareTwoFactorLogin(IUser $user, bool $rememberMe) {
-		$this->session->set(self::SESSION_UID_KEY, $user->getUID());
-		$this->session->set(self::REMEMBER_LOGIN, $rememberMe);
-
-		$id = $this->session->getId();
-		$token = $this->tokenProvider->getToken($id);
-		$this->config->setUserValue($user->getUID(), 'login_token_2fa', $token->getId(), $this->timeFactory->getTime());
-	}
-
-	public function clearTwoFactorPending(string $userId) {
-		$tokensNeeding2FA = $this->config->getUserKeys($userId, 'login_token_2fa');
-
-		foreach ($tokensNeeding2FA as $tokenId) {
-			$this->tokenProvider->invalidateTokenById($userId, $tokenId);
-		}
-	}
+            try {
+                $sessionId = $this->session->getId();
+                $token = $this->tokenProvider->getToken($sessionId);
+                $tokenId = $token->getId();
+                $tokensNeeding2FA = $this->config->getUserKeys($user->getUID(), 'login_token_2fa');
+
+                if (!\in_array($tokenId, $tokensNeeding2FA, true)) {
+                    $this->session->set(self::SESSION_UID_DONE, $user->getUID());
+                    return false;
+                }
+            } catch (InvalidTokenException $e) {
+            }
+        }
+
+        if (!$this->isTwoFactorAuthenticated($user)) {
+            // There is no second factor any more -> let the user pass
+            //   This prevents infinite redirect loops when a user is about
+            //   to solve the 2FA challenge, and the provider app is
+            //   disabled the same time
+            $this->session->remove(self::SESSION_UID_KEY);
+
+            $keys = $this->config->getUserKeys($user->getUID(), 'login_token_2fa');
+            foreach ($keys as $key) {
+                $this->config->deleteUserValue($user->getUID(), 'login_token_2fa', $key);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Prepare the 2FA login
+     *
+     * @param IUser $user
+     * @param boolean $rememberMe
+     */
+    public function prepareTwoFactorLogin(IUser $user, bool $rememberMe) {
+        $this->session->set(self::SESSION_UID_KEY, $user->getUID());
+        $this->session->set(self::REMEMBER_LOGIN, $rememberMe);
+
+        $id = $this->session->getId();
+        $token = $this->tokenProvider->getToken($id);
+        $this->config->setUserValue($user->getUID(), 'login_token_2fa', $token->getId(), $this->timeFactory->getTime());
+    }
+
+    public function clearTwoFactorPending(string $userId) {
+        $tokensNeeding2FA = $this->config->getUserKeys($userId, 'login_token_2fa');
+
+        foreach ($tokensNeeding2FA as $tokenId) {
+            $this->tokenProvider->invalidateTokenById($userId, $tokenId);
+        }
+    }
 
 }

lib/private/DB/MySQLMigrator.php

Indentation +38 added lines, -38 removed lines

@@ -30,48 +30,48 @@
 use Doctrine\DBAL\Schema\Table;
 
 class MySQLMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('enum', 'string');
-		$platform->registerDoctrineTypeMapping('bit', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+        $platform->registerDoctrineTypeMapping('bit', 'string');
 
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		// identifiers need to be quoted for mysql
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-			}
-		}
+        // identifiers need to be quoted for mysql
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 
-		/**
-		 * Speed up migration test by disabling autocommit and unique indexes check
-		 *
-		 * @param \Doctrine\DBAL\Schema\Table $table
-		 * @throws \OC\DB\MigrationException
-		 */
-		protected function checkTableMigrate(Table $table) {
-				$this->connection->exec('SET autocommit=0');
-				$this->connection->exec('SET unique_checks=0');
+        /**
+         * Speed up migration test by disabling autocommit and unique indexes check
+         *
+         * @param \Doctrine\DBAL\Schema\Table $table
+         * @throws \OC\DB\MigrationException
+         */
+        protected function checkTableMigrate(Table $table) {
+                $this->connection->exec('SET autocommit=0');
+                $this->connection->exec('SET unique_checks=0');
 
-				try {
-						parent::checkTableMigrate($table);
-				} catch (\Exception $e) {
-						$this->connection->exec('SET unique_checks=1');
-						$this->connection->exec('SET autocommit=1');
-						throw new MigrationException($table->getName(), $e->getMessage());
-				}
-				$this->connection->exec('SET unique_checks=1');
-				$this->connection->exec('SET autocommit=1');
-		}
+                try {
+                        parent::checkTableMigrate($table);
+                } catch (\Exception $e) {
+                        $this->connection->exec('SET unique_checks=1');
+                        $this->connection->exec('SET autocommit=1');
+                        throw new MigrationException($table->getName(), $e->getMessage());
+                }
+                $this->connection->exec('SET unique_checks=1');
+                $this->connection->exec('SET autocommit=1');
+        }
 
 }

lib/private/Tagging/Tag.php

Indentation +47 added lines, -47 removed lines

@@ -38,54 +38,54 @@
  */
 class Tag extends Entity {
 
-	protected $owner;
-	protected $type;
-	protected $name;
+    protected $owner;
+    protected $type;
+    protected $name;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param string $owner The tag's owner
-	 * @param string $type The type of item this tag is used for
-	 * @param string $name The tag's name
-	 */
-	public function __construct($owner = null, $type = null, $name = null) {
-		$this->setOwner($owner);
-		$this->setType($type);
-		$this->setName($name);
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $owner The tag's owner
+     * @param string $type The type of item this tag is used for
+     * @param string $name The tag's name
+     */
+    public function __construct($owner = null, $type = null, $name = null) {
+        $this->setOwner($owner);
+        $this->setType($type);
+        $this->setName($name);
+    }
 
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @todo migrate existing database columns to the correct names
-	 * to be able to drop this direct mapping
-	 */
-	public function columnToProperty($columnName){
-		if ($columnName === 'category') {
-			return 'name';
-		} elseif ($columnName === 'uid') {
-			return 'owner';
-		} else {
-			return parent::columnToProperty($columnName);
-		}
-	}
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @todo migrate existing database columns to the correct names
+     * to be able to drop this direct mapping
+     */
+    public function columnToProperty($columnName){
+        if ($columnName === 'category') {
+            return 'name';
+        } elseif ($columnName === 'uid') {
+            return 'owner';
+        } else {
+            return parent::columnToProperty($columnName);
+        }
+    }
 
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 */
-	public function propertyToColumn($property){
-		if ($property === 'name') {
-			return 'category';
-		} elseif ($property === 'owner') {
-			return 'uid';
-		} else {
-			return parent::propertyToColumn($property);
-		}
-	}
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     */
+    public function propertyToColumn($property){
+        if ($property === 'name') {
+            return 'category';
+        } elseif ($property === 'owner') {
+            return 'uid';
+        } else {
+            return parent::propertyToColumn($property);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 	 * @todo migrate existing database columns to the correct names
 	 * to be able to drop this direct mapping
 	 */
-	public function columnToProperty($columnName){
+	public function columnToProperty($columnName) {
 		if ($columnName === 'category') {
 			return 'name';
 		} elseif ($columnName === 'uid') {
@@ -79,7 +79,7 @@ 
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
-	public function propertyToColumn($property){
+	public function propertyToColumn($property) {
 		if ($property === 'name') {
 			return 'category';
 		} elseif ($property === 'owner') {

lib/private/User/Database.php

Indentation +419 added lines, -419 removed lines

@@ -77,423 +77,423 @@
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class Database extends ABackend
-	implements ICreateUserBackend,
-			   ISetPasswordBackend,
-			   ISetDisplayNameBackend,
-			   IGetDisplayNameBackend,
-			   ICheckPasswordBackend,
-			   IGetHomeBackend,
-			   ICountUsersBackend,
-			   IGetRealUIDBackend {
-	/** @var CappedMemoryCache */
-	private $cache;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/** @var string */
-	private $table;
-
-	/**
-	 * \OC\User\Database constructor.
-	 *
-	 * @param IEventDispatcher $eventDispatcher
-	 * @param string $table
-	 */
-	public function __construct($eventDispatcher = null, $table = 'users') {
-		$this->cache = new CappedMemoryCache();
-		$this->table = $table;
-		$this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OC::$server->query(IEventDispatcher::class);
-	}
-
-	/**
-	 * FIXME: This function should not be required!
-	 */
-	private function fixDI() {
-		if ($this->dbConn === null) {
-			$this->dbConn = \OC::$server->getDatabaseConnection();
-		}
-	}
-
-	/**
-	 * Create a new user
-	 *
-	 * @param string $uid The username of the user to create
-	 * @param string $password The password of the new user
-	 * @return bool
-	 *
-	 * Creates a new user. Basic checking of username is done in OC_User
-	 * itself, not in its subclasses.
-	 */
-	public function createUser(string $uid, string $password): bool {
-		$this->fixDI();
-
-		if (!$this->userExists($uid)) {
-			$this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
-
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->insert($this->table)
-				->values([
-					'uid' => $qb->createNamedParameter($uid),
-					'password' => $qb->createNamedParameter(\OC::$server->getHasher()->hash($password)),
-					'uid_lower' => $qb->createNamedParameter(mb_strtolower($uid)),
-				]);
-
-			$result = $qb->execute();
-
-			// Clear cache
-			unset($this->cache[$uid]);
-
-			return $result ? true : false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * delete a user
-	 *
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser($uid) {
-		$this->fixDI();
-
-		// Delete user-group-relation
-		$query = $this->dbConn->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
-		$result = $query->execute();
-
-		if (isset($this->cache[$uid])) {
-			unset($this->cache[$uid]);
-		}
-
-		return $result ? true : false;
-	}
-
-	private function updatePassword(string $uid, string $passwordHash): bool {
-		$query = $this->dbConn->getQueryBuilder();
-		$query->update($this->table)
-			->set('password', $query->createNamedParameter($passwordHash))
-			->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
-		$result = $query->execute();
-
-		return $result ? true : false;
-	}
-
-	/**
-	 * Set password
-	 *
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @return bool
-	 *
-	 * Change the password of a user
-	 */
-	public function setPassword(string $uid, string $password): bool {
-		$this->fixDI();
-
-		if ($this->userExists($uid)) {
-			$this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
-
-			$hasher = \OC::$server->getHasher();
-			$hashedPassword = $hasher->hash($password);
-
-			return $this->updatePassword($uid, $hashedPassword);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set display name
-	 *
-	 * @param string $uid The username
-	 * @param string $displayName The new display name
-	 * @return bool
-	 *
-	 * Change the display name of a user
-	 */
-	public function setDisplayName(string $uid, string $displayName): bool {
-		$this->fixDI();
-
-		if ($this->userExists($uid)) {
-			$query = $this->dbConn->getQueryBuilder();
-			$query->update($this->table)
-				->set('displayname', $query->createNamedParameter($displayName))
-				->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
-			$query->execute();
-
-			$this->cache[$uid]['displayname'] = $displayName;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get display name of the user
-	 *
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid): string {
-		$uid = (string)$uid;
-		$this->loadUser($uid);
-		return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
-	}
-
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$limit = $this->fixLimit($limit);
-
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-
-		$query->select('uid', 'displayname')
-			->from($this->table, 'u')
-			->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
-				$query->expr()->eq('userid', 'uid'),
-				$query->expr()->eq('appid', $query->expr()->literal('settings')),
-				$query->expr()->eq('configkey', $query->expr()->literal('email')))
-			)
-			// sqlite doesn't like re-using a single named parameter here
-			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
-			->orderBy($query->func()->lower('displayname'), 'ASC')
-			->orderBy('uid_lower', 'ASC')
-			->setMaxResults($limit)
-			->setFirstResult($offset);
-
-		$result = $query->execute();
-		$displayNames = [];
-		while ($row = $result->fetch()) {
-			$displayNames[(string)$row['uid']] = (string)$row['displayname'];
-		}
-
-		return $displayNames;
-	}
-
-	/**
-	 * Check if the password is correct
-	 *
-	 * @param string $uid The username
-	 * @param string $password The password
-	 * @return string
-	 *
-	 * Check if the password is correct without logging in the user
-	 * returns the user id or false
-	 */
-	public function checkPassword(string $uid, string $password) {
-		$this->fixDI();
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('uid', 'password')
-			->from($this->table)
-			->where(
-				$qb->expr()->eq(
-					'uid_lower', $qb->createNamedParameter(mb_strtolower($uid))
-				)
-			);
-		$result = $qb->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			$storedHash = $row['password'];
-			$newHash = '';
-			if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
-				if (!empty($newHash)) {
-					$this->updatePassword($uid, $newHash);
-				}
-				return (string)$row['uid'];
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Load an user in the cache
-	 *
-	 * @param string $uid the username
-	 * @return boolean true if user was found, false otherwise
-	 */
-	private function loadUser($uid) {
-		$this->fixDI();
-
-		$uid = (string)$uid;
-		if (!isset($this->cache[$uid])) {
-			//guests $uid could be NULL or ''
-			if ($uid === '') {
-				$this->cache[$uid] = false;
-				return true;
-			}
-
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('uid', 'displayname')
-				->from($this->table)
-				->where(
-					$qb->expr()->eq(
-						'uid_lower', $qb->createNamedParameter(mb_strtolower($uid))
-					)
-				);
-			$result = $qb->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			$this->cache[$uid] = false;
-
-			// "uid" is primary key, so there can only be a single result
-			if ($row !== false) {
-				$this->cache[$uid]['uid'] = (string)$row['uid'];
-				$this->cache[$uid]['displayname'] = (string)$row['displayname'];
-			} else {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		$limit = $this->fixLimit($limit);
-
-		$users = $this->getDisplayNames($search, $limit, $offset);
-		$userIds = array_map(function ($uid) {
-			return (string)$uid;
-		}, array_keys($users));
-		sort($userIds, SORT_STRING | SORT_FLAG_CASE);
-		return $userIds;
-	}
-
-	/**
-	 * check if a user exists
-	 *
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function userExists($uid) {
-		$this->loadUser($uid);
-		return $this->cache[$uid] !== false;
-	}
-
-	/**
-	 * get the user's home directory
-	 *
-	 * @param string $uid the username
-	 * @return string|false
-	 */
-	public function getHome(string $uid) {
-		if ($this->userExists($uid)) {
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function hasUserListings() {
-		return true;
-	}
-
-	/**
-	 * counts the users in the database
-	 *
-	 * @return int|bool
-	 */
-	public function countUsers() {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select($query->func()->count('uid'))
-			->from($this->table);
-		$result = $query->execute();
-
-		return $result->fetchColumn();
-	}
-
-	/**
-	 * returns the username for the given login name in the correct casing
-	 *
-	 * @param string $loginName
-	 * @return string|false
-	 */
-	public function loginName2UserName($loginName) {
-		if ($this->userExists($loginName)) {
-			return $this->cache[$loginName]['uid'];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Backend name to be shown in user management
-	 *
-	 * @return string the name of the backend to be shown
-	 */
-	public function getBackendName() {
-		return 'Database';
-	}
-
-	public static function preLoginNameUsedAsUserName($param) {
-		if (!isset($param['uid'])) {
-			throw new \Exception('key uid is expected to be set in $param');
-		}
-
-		$backends = \OC::$server->getUserManager()->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend instanceof Database) {
-				/** @var \OC\User\Database $backend */
-				$uid = $backend->loginName2UserName($param['uid']);
-				if ($uid !== false) {
-					$param['uid'] = $uid;
-					return;
-				}
-			}
-		}
-	}
-
-	public function getRealUID(string $uid): string {
-		if (!$this->userExists($uid)) {
-			throw new \RuntimeException($uid . ' does not exist');
-		}
-
-		return $this->cache[$uid]['uid'];
-	}
-
-	private function fixLimit($limit) {
-		if (is_int($limit) && $limit >= 0) {
-			return $limit;
-		}
-
-		return null;
-	}
+    implements ICreateUserBackend,
+                ISetPasswordBackend,
+                ISetDisplayNameBackend,
+                IGetDisplayNameBackend,
+                ICheckPasswordBackend,
+                IGetHomeBackend,
+                ICountUsersBackend,
+                IGetRealUIDBackend {
+    /** @var CappedMemoryCache */
+    private $cache;
+
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /** @var string */
+    private $table;
+
+    /**
+     * \OC\User\Database constructor.
+     *
+     * @param IEventDispatcher $eventDispatcher
+     * @param string $table
+     */
+    public function __construct($eventDispatcher = null, $table = 'users') {
+        $this->cache = new CappedMemoryCache();
+        $this->table = $table;
+        $this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OC::$server->query(IEventDispatcher::class);
+    }
+
+    /**
+     * FIXME: This function should not be required!
+     */
+    private function fixDI() {
+        if ($this->dbConn === null) {
+            $this->dbConn = \OC::$server->getDatabaseConnection();
+        }
+    }
+
+    /**
+     * Create a new user
+     *
+     * @param string $uid The username of the user to create
+     * @param string $password The password of the new user
+     * @return bool
+     *
+     * Creates a new user. Basic checking of username is done in OC_User
+     * itself, not in its subclasses.
+     */
+    public function createUser(string $uid, string $password): bool {
+        $this->fixDI();
+
+        if (!$this->userExists($uid)) {
+            $this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
+
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->insert($this->table)
+                ->values([
+                    'uid' => $qb->createNamedParameter($uid),
+                    'password' => $qb->createNamedParameter(\OC::$server->getHasher()->hash($password)),
+                    'uid_lower' => $qb->createNamedParameter(mb_strtolower($uid)),
+                ]);
+
+            $result = $qb->execute();
+
+            // Clear cache
+            unset($this->cache[$uid]);
+
+            return $result ? true : false;
+        }
+
+        return false;
+    }
+
+    /**
+     * delete a user
+     *
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser($uid) {
+        $this->fixDI();
+
+        // Delete user-group-relation
+        $query = $this->dbConn->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
+        $result = $query->execute();
+
+        if (isset($this->cache[$uid])) {
+            unset($this->cache[$uid]);
+        }
+
+        return $result ? true : false;
+    }
+
+    private function updatePassword(string $uid, string $passwordHash): bool {
+        $query = $this->dbConn->getQueryBuilder();
+        $query->update($this->table)
+            ->set('password', $query->createNamedParameter($passwordHash))
+            ->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
+        $result = $query->execute();
+
+        return $result ? true : false;
+    }
+
+    /**
+     * Set password
+     *
+     * @param string $uid The username
+     * @param string $password The new password
+     * @return bool
+     *
+     * Change the password of a user
+     */
+    public function setPassword(string $uid, string $password): bool {
+        $this->fixDI();
+
+        if ($this->userExists($uid)) {
+            $this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
+
+            $hasher = \OC::$server->getHasher();
+            $hashedPassword = $hasher->hash($password);
+
+            return $this->updatePassword($uid, $hashedPassword);
+        }
+
+        return false;
+    }
+
+    /**
+     * Set display name
+     *
+     * @param string $uid The username
+     * @param string $displayName The new display name
+     * @return bool
+     *
+     * Change the display name of a user
+     */
+    public function setDisplayName(string $uid, string $displayName): bool {
+        $this->fixDI();
+
+        if ($this->userExists($uid)) {
+            $query = $this->dbConn->getQueryBuilder();
+            $query->update($this->table)
+                ->set('displayname', $query->createNamedParameter($displayName))
+                ->where($query->expr()->eq('uid_lower', $query->createNamedParameter(mb_strtolower($uid))));
+            $query->execute();
+
+            $this->cache[$uid]['displayname'] = $displayName;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get display name of the user
+     *
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid): string {
+        $uid = (string)$uid;
+        $this->loadUser($uid);
+        return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
+    }
+
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $limit = $this->fixLimit($limit);
+
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+
+        $query->select('uid', 'displayname')
+            ->from($this->table, 'u')
+            ->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
+                $query->expr()->eq('userid', 'uid'),
+                $query->expr()->eq('appid', $query->expr()->literal('settings')),
+                $query->expr()->eq('configkey', $query->expr()->literal('email')))
+            )
+            // sqlite doesn't like re-using a single named parameter here
+            ->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
+            ->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
+            ->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
+            ->orderBy($query->func()->lower('displayname'), 'ASC')
+            ->orderBy('uid_lower', 'ASC')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset);
+
+        $result = $query->execute();
+        $displayNames = [];
+        while ($row = $result->fetch()) {
+            $displayNames[(string)$row['uid']] = (string)$row['displayname'];
+        }
+
+        return $displayNames;
+    }
+
+    /**
+     * Check if the password is correct
+     *
+     * @param string $uid The username
+     * @param string $password The password
+     * @return string
+     *
+     * Check if the password is correct without logging in the user
+     * returns the user id or false
+     */
+    public function checkPassword(string $uid, string $password) {
+        $this->fixDI();
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('uid', 'password')
+            ->from($this->table)
+            ->where(
+                $qb->expr()->eq(
+                    'uid_lower', $qb->createNamedParameter(mb_strtolower($uid))
+                )
+            );
+        $result = $qb->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            $storedHash = $row['password'];
+            $newHash = '';
+            if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
+                if (!empty($newHash)) {
+                    $this->updatePassword($uid, $newHash);
+                }
+                return (string)$row['uid'];
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Load an user in the cache
+     *
+     * @param string $uid the username
+     * @return boolean true if user was found, false otherwise
+     */
+    private function loadUser($uid) {
+        $this->fixDI();
+
+        $uid = (string)$uid;
+        if (!isset($this->cache[$uid])) {
+            //guests $uid could be NULL or ''
+            if ($uid === '') {
+                $this->cache[$uid] = false;
+                return true;
+            }
+
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->select('uid', 'displayname')
+                ->from($this->table)
+                ->where(
+                    $qb->expr()->eq(
+                        'uid_lower', $qb->createNamedParameter(mb_strtolower($uid))
+                    )
+                );
+            $result = $qb->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+
+            $this->cache[$uid] = false;
+
+            // "uid" is primary key, so there can only be a single result
+            if ($row !== false) {
+                $this->cache[$uid]['uid'] = (string)$row['uid'];
+                $this->cache[$uid]['displayname'] = (string)$row['displayname'];
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        $limit = $this->fixLimit($limit);
+
+        $users = $this->getDisplayNames($search, $limit, $offset);
+        $userIds = array_map(function ($uid) {
+            return (string)$uid;
+        }, array_keys($users));
+        sort($userIds, SORT_STRING | SORT_FLAG_CASE);
+        return $userIds;
+    }
+
+    /**
+     * check if a user exists
+     *
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        $this->loadUser($uid);
+        return $this->cache[$uid] !== false;
+    }
+
+    /**
+     * get the user's home directory
+     *
+     * @param string $uid the username
+     * @return string|false
+     */
+    public function getHome(string $uid) {
+        if ($this->userExists($uid)) {
+            return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasUserListings() {
+        return true;
+    }
+
+    /**
+     * counts the users in the database
+     *
+     * @return int|bool
+     */
+    public function countUsers() {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select($query->func()->count('uid'))
+            ->from($this->table);
+        $result = $query->execute();
+
+        return $result->fetchColumn();
+    }
+
+    /**
+     * returns the username for the given login name in the correct casing
+     *
+     * @param string $loginName
+     * @return string|false
+     */
+    public function loginName2UserName($loginName) {
+        if ($this->userExists($loginName)) {
+            return $this->cache[$loginName]['uid'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Backend name to be shown in user management
+     *
+     * @return string the name of the backend to be shown
+     */
+    public function getBackendName() {
+        return 'Database';
+    }
+
+    public static function preLoginNameUsedAsUserName($param) {
+        if (!isset($param['uid'])) {
+            throw new \Exception('key uid is expected to be set in $param');
+        }
+
+        $backends = \OC::$server->getUserManager()->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend instanceof Database) {
+                /** @var \OC\User\Database $backend */
+                $uid = $backend->loginName2UserName($param['uid']);
+                if ($uid !== false) {
+                    $param['uid'] = $uid;
+                    return;
+                }
+            }
+        }
+    }
+
+    public function getRealUID(string $uid): string {
+        if (!$this->userExists($uid)) {
+            throw new \RuntimeException($uid . ' does not exist');
+        }
+
+        return $this->cache[$uid]['uid'];
+    }
+
+    private function fixLimit($limit) {
+        if (is_int($limit) && $limit >= 0) {
+            return $limit;
+        }
+
+        return null;
+    }
 }

lib/private/Group/MetaData.php

Indentation +172 added lines, -172 removed lines

@@ -35,176 +35,176 @@
 use OCP\IUserSession;
 
 class MetaData {
-	const SORT_NONE = 0;
-	const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
-	const SORT_GROUPNAME = 2;
-
-	/** @var string */
-	protected $user;
-	/** @var bool */
-	protected $isAdmin;
-	/** @var array */
-	protected $metaData = [];
-	/** @var IGroupManager */
-	protected $groupManager;
-	/** @var bool */
-	protected $sorting = false;
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param string $user the uid of the current user
-	 * @param bool $isAdmin whether the current users is an admin
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-			$user,
-			$isAdmin,
-			IGroupManager $groupManager,
-			IUserSession $userSession
-			) {
-		$this->user = $user;
-		$this->isAdmin = (bool)$isAdmin;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * returns an array with meta data about all available groups
-	 * the array is structured as follows:
-	 * [0] array containing meta data about admin groups
-	 * [1] array containing meta data about unprivileged groups
-	 * @param string $groupSearch only effective when instance was created with
-	 * isAdmin being true
-	 * @param string $userSearch the pattern users are search for
-	 * @return array
-	 */
-	public function get($groupSearch = '', $userSearch = '') {
-		$key = $groupSearch . '::' . $userSearch;
-		if(isset($this->metaData[$key])) {
-			return $this->metaData[$key];
-		}
-
-		$adminGroups = [];
-		$groups = [];
-		$sortGroupsIndex = 0;
-		$sortGroupsKeys = [];
-		$sortAdminGroupsIndex = 0;
-		$sortAdminGroupsKeys = [];
-
-		foreach($this->getGroups($groupSearch) as $group) {
-			$groupMetaData = $this->generateGroupMetaData($group, $userSearch);
-			if (strtolower($group->getGID()) !== 'admin') {
-				$this->addEntry(
-					$groups,
-					$sortGroupsKeys,
-					$sortGroupsIndex,
-					$groupMetaData);
-			} else {
-				//admin group is hard coded to 'admin' for now. In future,
-				//backends may define admin groups too. Then the if statement
-				//has to be adjusted accordingly.
-				$this->addEntry(
-					$adminGroups,
-					$sortAdminGroupsKeys,
-					$sortAdminGroupsIndex,
-					$groupMetaData);
-			}
-		}
-
-		//whether sorting is necessary is will be checked in sort()
-		$this->sort($groups, $sortGroupsKeys);
-		$this->sort($adminGroups, $sortAdminGroupsKeys);
-
-		$this->metaData[$key] = [$adminGroups, $groups];
-		return $this->metaData[$key];
-	}
-
-	/**
-	 * sets the sort mode, see SORT_* constants for supported modes
-	 *
-	 * @param int $sortMode
-	 */
-	public function setSorting($sortMode) {
-		switch ($sortMode) {
-			case self::SORT_USERCOUNT:
-			case self::SORT_GROUPNAME:
-				$this->sorting = $sortMode;
-				break;
-
-			default:
-				$this->sorting = self::SORT_NONE;
-		}
-	}
-
-	/**
-	 * adds an group entry to the resulting array
-	 * @param array $entries the resulting array, by reference
-	 * @param array $sortKeys the sort key array, by reference
-	 * @param int $sortIndex the sort key index, by reference
-	 * @param array $data the group's meta data as returned by generateGroupMetaData()
-	 */
-	private function addEntry(&$entries, &$sortKeys, &$sortIndex, $data) {
-		$entries[] = $data;
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			$sortKeys[$sortIndex] = $data['usercount'];
-			$sortIndex++;
-		} else if ($this->sorting === self::SORT_GROUPNAME) {
-			$sortKeys[$sortIndex] = $data['name'];
-			$sortIndex++;
-		}
-	}
-
-	/**
-	 * creates an array containing the group meta data
-	 * @param \OCP\IGroup $group
-	 * @param string $userSearch
-	 * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
-	 */
-	private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) {
-		return [
-			'id' => $group->getGID(),
-			'name' => $group->getDisplayName(),
-			'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
-			'disabled' => $group->countDisabled(),
-			'canAdd' => $group->canAddUser(),
-			'canRemove' => $group->canRemoveUser(),
-		];
-	}
-
-	/**
-	 * sorts the result array, if applicable
-	 * @param array $entries the result array, by reference
-	 * @param array $sortKeys the array containing the sort keys
-	 * @param return null
-	 */
-	private function sort(&$entries, $sortKeys) {
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			array_multisort($sortKeys, SORT_DESC, $entries);
-		} else if ($this->sorting === self::SORT_GROUPNAME) {
-			array_multisort($sortKeys, SORT_ASC, $entries);
-		}
-	}
-
-	/**
-	 * returns the available groups
-	 * @param string $search a search string
-	 * @return \OCP\IGroup[]
-	 */
-	public function getGroups($search = '') {
-		if($this->isAdmin) {
-			return $this->groupManager->search($search);
-		} else {
-			$userObject = $this->userSession->getUser();
-			if($userObject !== null) {
-				$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
-			} else {
-				$groups = [];
-			}
-
-			return $groups;
-		}
-	}
+    const SORT_NONE = 0;
+    const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
+    const SORT_GROUPNAME = 2;
+
+    /** @var string */
+    protected $user;
+    /** @var bool */
+    protected $isAdmin;
+    /** @var array */
+    protected $metaData = [];
+    /** @var IGroupManager */
+    protected $groupManager;
+    /** @var bool */
+    protected $sorting = false;
+    /** @var IUserSession */
+    protected $userSession;
+
+    /**
+     * @param string $user the uid of the current user
+     * @param bool $isAdmin whether the current users is an admin
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+            $user,
+            $isAdmin,
+            IGroupManager $groupManager,
+            IUserSession $userSession
+            ) {
+        $this->user = $user;
+        $this->isAdmin = (bool)$isAdmin;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * returns an array with meta data about all available groups
+     * the array is structured as follows:
+     * [0] array containing meta data about admin groups
+     * [1] array containing meta data about unprivileged groups
+     * @param string $groupSearch only effective when instance was created with
+     * isAdmin being true
+     * @param string $userSearch the pattern users are search for
+     * @return array
+     */
+    public function get($groupSearch = '', $userSearch = '') {
+        $key = $groupSearch . '::' . $userSearch;
+        if(isset($this->metaData[$key])) {
+            return $this->metaData[$key];
+        }
+
+        $adminGroups = [];
+        $groups = [];
+        $sortGroupsIndex = 0;
+        $sortGroupsKeys = [];
+        $sortAdminGroupsIndex = 0;
+        $sortAdminGroupsKeys = [];
+
+        foreach($this->getGroups($groupSearch) as $group) {
+            $groupMetaData = $this->generateGroupMetaData($group, $userSearch);
+            if (strtolower($group->getGID()) !== 'admin') {
+                $this->addEntry(
+                    $groups,
+                    $sortGroupsKeys,
+                    $sortGroupsIndex,
+                    $groupMetaData);
+            } else {
+                //admin group is hard coded to 'admin' for now. In future,
+                //backends may define admin groups too. Then the if statement
+                //has to be adjusted accordingly.
+                $this->addEntry(
+                    $adminGroups,
+                    $sortAdminGroupsKeys,
+                    $sortAdminGroupsIndex,
+                    $groupMetaData);
+            }
+        }
+
+        //whether sorting is necessary is will be checked in sort()
+        $this->sort($groups, $sortGroupsKeys);
+        $this->sort($adminGroups, $sortAdminGroupsKeys);
+
+        $this->metaData[$key] = [$adminGroups, $groups];
+        return $this->metaData[$key];
+    }
+
+    /**
+     * sets the sort mode, see SORT_* constants for supported modes
+     *
+     * @param int $sortMode
+     */
+    public function setSorting($sortMode) {
+        switch ($sortMode) {
+            case self::SORT_USERCOUNT:
+            case self::SORT_GROUPNAME:
+                $this->sorting = $sortMode;
+                break;
+
+            default:
+                $this->sorting = self::SORT_NONE;
+        }
+    }
+
+    /**
+     * adds an group entry to the resulting array
+     * @param array $entries the resulting array, by reference
+     * @param array $sortKeys the sort key array, by reference
+     * @param int $sortIndex the sort key index, by reference
+     * @param array $data the group's meta data as returned by generateGroupMetaData()
+     */
+    private function addEntry(&$entries, &$sortKeys, &$sortIndex, $data) {
+        $entries[] = $data;
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            $sortKeys[$sortIndex] = $data['usercount'];
+            $sortIndex++;
+        } else if ($this->sorting === self::SORT_GROUPNAME) {
+            $sortKeys[$sortIndex] = $data['name'];
+            $sortIndex++;
+        }
+    }
+
+    /**
+     * creates an array containing the group meta data
+     * @param \OCP\IGroup $group
+     * @param string $userSearch
+     * @return array with the keys 'id', 'name', 'usercount' and 'disabled'
+     */
+    private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) {
+        return [
+            'id' => $group->getGID(),
+            'name' => $group->getDisplayName(),
+            'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
+            'disabled' => $group->countDisabled(),
+            'canAdd' => $group->canAddUser(),
+            'canRemove' => $group->canRemoveUser(),
+        ];
+    }
+
+    /**
+     * sorts the result array, if applicable
+     * @param array $entries the result array, by reference
+     * @param array $sortKeys the array containing the sort keys
+     * @param return null
+     */
+    private function sort(&$entries, $sortKeys) {
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            array_multisort($sortKeys, SORT_DESC, $entries);
+        } else if ($this->sorting === self::SORT_GROUPNAME) {
+            array_multisort($sortKeys, SORT_ASC, $entries);
+        }
+    }
+
+    /**
+     * returns the available groups
+     * @param string $search a search string
+     * @return \OCP\IGroup[]
+     */
+    public function getGroups($search = '') {
+        if($this->isAdmin) {
+            return $this->groupManager->search($search);
+        } else {
+            $userObject = $this->userSession->getUser();
+            if($userObject !== null) {
+                $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
+            } else {
+                $groups = [];
+            }
+
+            return $groups;
+        }
+    }
 }