nextcloud / server

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php

Indentation +61 added lines, -61 removed lines

@@ -16,73 +16,73 @@
 
 class Version1002Date20170607113030 extends SimpleMigrationStep {
 
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(
-		protected IDBConnection $connection,
-	) {
-	}
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(
+        protected IDBConnection $connection,
+    ) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_backup_codes')) {
-			// Legacy table does not exist
-			return;
-		}
+        if (!$schema->hasTable('twofactor_backup_codes')) {
+            // Legacy table does not exist
+            return;
+        }
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('twofactor_backupcodes')
-			->values([
-				// Inserting with id might fail: 'id' => $insert->createParameter('id'),
-				'user_id' => $insert->createParameter('user_id'),
-				'code' => $insert->createParameter('code'),
-				'used' => $insert->createParameter('used'),
-			]);
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('twofactor_backupcodes')
+            ->values([
+                // Inserting with id might fail: 'id' => $insert->createParameter('id'),
+                'user_id' => $insert->createParameter('user_id'),
+                'code' => $insert->createParameter('code'),
+                'used' => $insert->createParameter('used'),
+            ]);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('twofactor_backup_codes')
-			->orderBy('id', 'ASC');
-		$result = $query->executeQuery();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('twofactor_backup_codes')
+            ->orderBy('id', 'ASC');
+        $result = $query->executeQuery();
 
-		$output->startProgress();
-		while ($row = $result->fetchAssociative()) {
-			$output->advance();
+        $output->startProgress();
+        while ($row = $result->fetchAssociative()) {
+            $output->advance();
 
-			$insert
-				// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
-				->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
-				->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
-				->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
-				->executeStatement();
-		}
-		$output->finishProgress();
-	}
+            $insert
+                // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
+                ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
+                ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
+                ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+        }
+        $output->finishProgress();
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('twofactor_backup_codes')) {
-			$schema->dropTable('twofactor_backup_codes');
-			return $schema;
-		}
-		return null;
-	}
+        if ($schema->hasTable('twofactor_backup_codes')) {
+            $schema->dropTable('twofactor_backup_codes');
+            return $schema;
+        }
+        return null;
+    }
 }

apps/user_ldap/lib/Mapping/AbstractMapping.php

Indentation +485 added lines, -485 removed lines

@@ -23,507 +23,507 @@
  * @package OCA\User_LDAP\Mapping
  */
 abstract class AbstractMapping {
-	/**
-	 * returns the DB table name which holds the mappings
-	 *
-	 * @return string
-	 */
-	abstract protected function getTableName(bool $includePrefix = true);
-
-	/**
-	 * A month worth of cache time for as good as never changing mapping data.
-	 * Implemented when it was found that name-to-DN lookups are quite frequent.
-	 */
-	protected const LOCAL_CACHE_TTL = 2592000;
-
-	/**
-	 * A week worth of cache time for rarely changing user count data.
-	 */
-	protected const LOCAL_USER_COUNT_TTL = 604800;
-
-	/**
-	 * By default, the local cache is only used up to a certain amount of objects.
-	 * This constant holds this number. The amount of entries would amount up to
-	 * 1 MiB (worst case) per mappings table.
-	 * Setting `use_local_mapping_cache` for `user_ldap` to `yes` or `no`
-	 * deliberately enables or disables this mechanism.
-	 */
-	protected const LOCAL_CACHE_OBJECT_THRESHOLD = 2000;
-
-	protected ?ICache $localNameToDnCache = null;
-
-	/** @var array caches Names (value) by DN (key) */
-	protected array $cache = [];
-
-	/**
-	 * @param IDBConnection $dbc
-	 */
-	public function __construct(
-		protected IDBConnection $dbc,
-		protected ICacheFactory $cacheFactory,
-		protected IAppConfig $config,
-		protected bool $isCLI,
-	) {
-		$this->initLocalCache();
-	}
-
-	protected function initLocalCache(): void {
-		if ($this->isCLI || !$this->cacheFactory->isLocalCacheAvailable()) {
-			return;
-		}
-
-		$useLocalCache = $this->config->getValueString('user_ldap', 'use_local_mapping_cache', 'auto', false);
-		if ($useLocalCache !== 'yes' && $useLocalCache !== 'auto') {
-			return;
-		}
-
-		$section = \str_contains($this->getTableName(), 'user') ? 'u/' : 'g/';
-		$this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/' . $section);
-
-		// We use the cache as well to store whether it shall be used. If the
-		// answer was no, we unset it again.
-		if ($useLocalCache === 'auto' && !$this->useCacheByUserCount()) {
-			$this->localNameToDnCache = null;
-		}
-	}
-
-	protected function useCacheByUserCount(): bool {
-		$use = $this->localNameToDnCache->get('use');
-		if ($use !== null) {
-			return $use;
-		}
-
-		$qb = $this->dbc->getQueryBuilder();
-		$q = $qb->selectAlias($qb->createFunction('COUNT(owncloud_name)'), 'count')
-			->from($this->getTableName());
-		$q->setMaxResults(self::LOCAL_CACHE_OBJECT_THRESHOLD + 1);
-		$result = $q->executeQuery();
-		$row = $result->fetchAssociative();
-		$result->closeCursor();
-
-		$use = (int)$row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
-		$this->localNameToDnCache->set('use', $use, self::LOCAL_USER_COUNT_TTL);
-		return $use;
-	}
-
-	/**
-	 * checks whether a provided string represents an existing table col
-	 *
-	 * @param string $col
-	 * @return bool
-	 */
-	public function isColNameValid($col) {
-		switch ($col) {
-			case 'ldap_dn':
-			case 'ldap_dn_hash':
-			case 'owncloud_name':
-			case 'directory_uuid':
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Gets the value of one column based on a provided value of another column
-	 *
-	 * @param string $fetchCol
-	 * @param string $compareCol
-	 * @param string $search
-	 * @return string|false
-	 * @throws \Exception
-	 */
-	protected function getXbyY($fetchCol, $compareCol, $search) {
-		if (!$this->isColNameValid($fetchCol)) {
-			//this is used internally only, but we don't want to risk
-			//having SQL injection at all.
-			throw new \Exception('Invalid Column Name');
-		}
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select($fetchCol)
-			->from($this->getTableName())
-			->where($qb->expr()->eq($compareCol, $qb->createNamedParameter($search)));
-
-		try {
-			$res = $qb->executeQuery();
-			$data = $res->fetchOne();
-			$res->closeCursor();
-			return $data;
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Performs a DELETE or UPDATE query to the database.
-	 *
-	 * @param IPreparedStatement $statement
-	 * @param array $parameters
-	 * @return bool true if at least one row was modified, false otherwise
-	 */
-	protected function modify(IPreparedStatement $statement, $parameters) {
-		try {
-			$result = $statement->execute($parameters);
-			$updated = $result->rowCount() > 0;
-			$result->closeCursor();
-			return $updated;
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Gets the LDAP DN based on the provided name.
-	 */
-	public function getDNByName(string $name): string|false {
-		$dn = array_search($name, $this->cache, true);
-		if ($dn === false) {
-			$dn = $this->localNameToDnCache?->get($name);
-			if ($dn === null) {
-				$dn = $this->getXbyY('ldap_dn', 'owncloud_name', $name);
-				if ($dn !== false) {
-					$this->cache[$dn] = $name;
-				}
-				$this->localNameToDnCache?->set($name, $dn, self::LOCAL_CACHE_TTL);
-			}
-		}
-		return $dn ?? false;
-	}
-
-	/**
-	 * Updates the DN based on the given UUID
-	 *
-	 * @param string $fdn
-	 * @param string $uuid
-	 * @return bool
-	 */
-	public function setDNbyUUID($fdn, $uuid) {
-		$oldDn = $this->getDnByUUID($uuid);
-		$statement = $this->dbc->prepare('
+    /**
+     * returns the DB table name which holds the mappings
+     *
+     * @return string
+     */
+    abstract protected function getTableName(bool $includePrefix = true);
+
+    /**
+     * A month worth of cache time for as good as never changing mapping data.
+     * Implemented when it was found that name-to-DN lookups are quite frequent.
+     */
+    protected const LOCAL_CACHE_TTL = 2592000;
+
+    /**
+     * A week worth of cache time for rarely changing user count data.
+     */
+    protected const LOCAL_USER_COUNT_TTL = 604800;
+
+    /**
+     * By default, the local cache is only used up to a certain amount of objects.
+     * This constant holds this number. The amount of entries would amount up to
+     * 1 MiB (worst case) per mappings table.
+     * Setting `use_local_mapping_cache` for `user_ldap` to `yes` or `no`
+     * deliberately enables or disables this mechanism.
+     */
+    protected const LOCAL_CACHE_OBJECT_THRESHOLD = 2000;
+
+    protected ?ICache $localNameToDnCache = null;
+
+    /** @var array caches Names (value) by DN (key) */
+    protected array $cache = [];
+
+    /**
+     * @param IDBConnection $dbc
+     */
+    public function __construct(
+        protected IDBConnection $dbc,
+        protected ICacheFactory $cacheFactory,
+        protected IAppConfig $config,
+        protected bool $isCLI,
+    ) {
+        $this->initLocalCache();
+    }
+
+    protected function initLocalCache(): void {
+        if ($this->isCLI || !$this->cacheFactory->isLocalCacheAvailable()) {
+            return;
+        }
+
+        $useLocalCache = $this->config->getValueString('user_ldap', 'use_local_mapping_cache', 'auto', false);
+        if ($useLocalCache !== 'yes' && $useLocalCache !== 'auto') {
+            return;
+        }
+
+        $section = \str_contains($this->getTableName(), 'user') ? 'u/' : 'g/';
+        $this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/' . $section);
+
+        // We use the cache as well to store whether it shall be used. If the
+        // answer was no, we unset it again.
+        if ($useLocalCache === 'auto' && !$this->useCacheByUserCount()) {
+            $this->localNameToDnCache = null;
+        }
+    }
+
+    protected function useCacheByUserCount(): bool {
+        $use = $this->localNameToDnCache->get('use');
+        if ($use !== null) {
+            return $use;
+        }
+
+        $qb = $this->dbc->getQueryBuilder();
+        $q = $qb->selectAlias($qb->createFunction('COUNT(owncloud_name)'), 'count')
+            ->from($this->getTableName());
+        $q->setMaxResults(self::LOCAL_CACHE_OBJECT_THRESHOLD + 1);
+        $result = $q->executeQuery();
+        $row = $result->fetchAssociative();
+        $result->closeCursor();
+
+        $use = (int)$row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
+        $this->localNameToDnCache->set('use', $use, self::LOCAL_USER_COUNT_TTL);
+        return $use;
+    }
+
+    /**
+     * checks whether a provided string represents an existing table col
+     *
+     * @param string $col
+     * @return bool
+     */
+    public function isColNameValid($col) {
+        switch ($col) {
+            case 'ldap_dn':
+            case 'ldap_dn_hash':
+            case 'owncloud_name':
+            case 'directory_uuid':
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Gets the value of one column based on a provided value of another column
+     *
+     * @param string $fetchCol
+     * @param string $compareCol
+     * @param string $search
+     * @return string|false
+     * @throws \Exception
+     */
+    protected function getXbyY($fetchCol, $compareCol, $search) {
+        if (!$this->isColNameValid($fetchCol)) {
+            //this is used internally only, but we don't want to risk
+            //having SQL injection at all.
+            throw new \Exception('Invalid Column Name');
+        }
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select($fetchCol)
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq($compareCol, $qb->createNamedParameter($search)));
+
+        try {
+            $res = $qb->executeQuery();
+            $data = $res->fetchOne();
+            $res->closeCursor();
+            return $data;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Performs a DELETE or UPDATE query to the database.
+     *
+     * @param IPreparedStatement $statement
+     * @param array $parameters
+     * @return bool true if at least one row was modified, false otherwise
+     */
+    protected function modify(IPreparedStatement $statement, $parameters) {
+        try {
+            $result = $statement->execute($parameters);
+            $updated = $result->rowCount() > 0;
+            $result->closeCursor();
+            return $updated;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Gets the LDAP DN based on the provided name.
+     */
+    public function getDNByName(string $name): string|false {
+        $dn = array_search($name, $this->cache, true);
+        if ($dn === false) {
+            $dn = $this->localNameToDnCache?->get($name);
+            if ($dn === null) {
+                $dn = $this->getXbyY('ldap_dn', 'owncloud_name', $name);
+                if ($dn !== false) {
+                    $this->cache[$dn] = $name;
+                }
+                $this->localNameToDnCache?->set($name, $dn, self::LOCAL_CACHE_TTL);
+            }
+        }
+        return $dn ?? false;
+    }
+
+    /**
+     * Updates the DN based on the given UUID
+     *
+     * @param string $fdn
+     * @param string $uuid
+     * @return bool
+     */
+    public function setDNbyUUID($fdn, $uuid) {
+        $oldDn = $this->getDnByUUID($uuid);
+        $statement = $this->dbc->prepare('
 			UPDATE `' . $this->getTableName() . '`
 			SET `ldap_dn_hash` = ?, `ldap_dn` = ?
 			WHERE `directory_uuid` = ?
 		');
 
-		$r = $this->modify($statement, [$this->getDNHash($fdn), $fdn, $uuid]);
-		if ($r) {
-			if (is_string($oldDn) && isset($this->cache[$oldDn])) {
-				$userId = $this->cache[$oldDn];
-			}
-			$userId = $userId ?? $this->getNameByUUID($uuid);
-			if ($userId) {
-				$this->cache[$fdn] = $userId;
-				$this->localNameToDnCache?->set($userId, $fdn, self::LOCAL_CACHE_TTL);
-			}
-			unset($this->cache[$oldDn]);
-		}
-
-		return $r;
-	}
-
-	/**
-	 * Updates the UUID based on the given DN
-	 *
-	 * required by Migration/UUIDFix
-	 *
-	 * @param $uuid
-	 * @param $fdn
-	 * @return bool
-	 */
-	public function setUUIDbyDN($uuid, $fdn): bool {
-		$statement = $this->dbc->prepare('
+        $r = $this->modify($statement, [$this->getDNHash($fdn), $fdn, $uuid]);
+        if ($r) {
+            if (is_string($oldDn) && isset($this->cache[$oldDn])) {
+                $userId = $this->cache[$oldDn];
+            }
+            $userId = $userId ?? $this->getNameByUUID($uuid);
+            if ($userId) {
+                $this->cache[$fdn] = $userId;
+                $this->localNameToDnCache?->set($userId, $fdn, self::LOCAL_CACHE_TTL);
+            }
+            unset($this->cache[$oldDn]);
+        }
+
+        return $r;
+    }
+
+    /**
+     * Updates the UUID based on the given DN
+     *
+     * required by Migration/UUIDFix
+     *
+     * @param $uuid
+     * @param $fdn
+     * @return bool
+     */
+    public function setUUIDbyDN($uuid, $fdn): bool {
+        $statement = $this->dbc->prepare('
 			UPDATE `' . $this->getTableName() . '`
 			SET `directory_uuid` = ?
 			WHERE `ldap_dn_hash` = ?
 		');
 
-		unset($this->cache[$fdn]);
-
-		return $this->modify($statement, [$uuid, $this->getDNHash($fdn)]);
-	}
-
-	/**
-	 * Get the hash to store in database column ldap_dn_hash for a given dn
-	 */
-	protected function getDNHash(string $fdn): string {
-		return hash('sha256', $fdn, false);
-	}
-
-	/**
-	 * Gets the name based on the provided LDAP DN.
-	 *
-	 * @param string $fdn
-	 * @return string|false
-	 */
-	public function getNameByDN($fdn) {
-		if (!isset($this->cache[$fdn])) {
-			$this->cache[$fdn] = $this->getXbyY('owncloud_name', 'ldap_dn_hash', $this->getDNHash($fdn));
-		}
-		return $this->cache[$fdn];
-	}
-
-	/**
-	 * @param array<string> $hashList
-	 */
-	protected function prepareListOfIdsQuery(array $hashList): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'ldap_dn_hash', 'ldap_dn')
-			->from($this->getTableName(false))
-			->where($qb->expr()->in('ldap_dn_hash', $qb->createNamedParameter($hashList, IQueryBuilder::PARAM_STR_ARRAY)));
-		return $qb;
-	}
-
-	protected function collectResultsFromListOfIdsQuery(IQueryBuilder $qb, array &$results): void {
-		$stmt = $qb->executeQuery();
-		while ($entry = $stmt->fetchAssociative()) {
-			$results[$entry['ldap_dn']] = $entry['owncloud_name'];
-			$this->cache[$entry['ldap_dn']] = $entry['owncloud_name'];
-		}
-		$stmt->closeCursor();
-	}
-
-	/**
-	 * @param array<string> $fdns
-	 * @return array<string,string>
-	 */
-	public function getListOfIdsByDn(array $fdns): array {
-		$totalDBParamLimit = 65000;
-		$sliceSize = 1000;
-		$maxSlices = $this->dbc->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE ? 9 : $totalDBParamLimit / $sliceSize;
-		$results = [];
-
-		$slice = 1;
-		$fdns = array_map([$this, 'getDNHash'], $fdns);
-		$fdnsSlice = count($fdns) > $sliceSize ? array_slice($fdns, 0, $sliceSize) : $fdns;
-		$qb = $this->prepareListOfIdsQuery($fdnsSlice);
-
-		while (isset($fdnsSlice[999])) {
-			// Oracle does not allow more than 1000 values in the IN list,
-			// but allows slicing
-			$slice++;
-			$fdnsSlice = array_slice($fdns, $sliceSize * ($slice - 1), $sliceSize);
-
-			/** @see https://github.com/vimeo/psalm/issues/4995 */
-			/** @psalm-suppress TypeDoesNotContainType */
-			if (!isset($qb)) {
-				$qb = $this->prepareListOfIdsQuery($fdnsSlice);
-				continue;
-			}
-
-			if (!empty($fdnsSlice)) {
-				$qb->orWhere($qb->expr()->in('ldap_dn_hash', $qb->createNamedParameter($fdnsSlice, IQueryBuilder::PARAM_STR_ARRAY)));
-			}
-
-			if ($slice % $maxSlices === 0) {
-				$this->collectResultsFromListOfIdsQuery($qb, $results);
-				unset($qb);
-			}
-		}
-
-		if (isset($qb)) {
-			$this->collectResultsFromListOfIdsQuery($qb, $results);
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Searches mapped names by the giving string in the name column
-	 *
-	 * @return string[]
-	 */
-	public function getNamesBySearch(string $search, string $prefixMatch = '', string $postfixMatch = ''): array {
-		$statement = $this->dbc->prepare('
+        unset($this->cache[$fdn]);
+
+        return $this->modify($statement, [$uuid, $this->getDNHash($fdn)]);
+    }
+
+    /**
+     * Get the hash to store in database column ldap_dn_hash for a given dn
+     */
+    protected function getDNHash(string $fdn): string {
+        return hash('sha256', $fdn, false);
+    }
+
+    /**
+     * Gets the name based on the provided LDAP DN.
+     *
+     * @param string $fdn
+     * @return string|false
+     */
+    public function getNameByDN($fdn) {
+        if (!isset($this->cache[$fdn])) {
+            $this->cache[$fdn] = $this->getXbyY('owncloud_name', 'ldap_dn_hash', $this->getDNHash($fdn));
+        }
+        return $this->cache[$fdn];
+    }
+
+    /**
+     * @param array<string> $hashList
+     */
+    protected function prepareListOfIdsQuery(array $hashList): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'ldap_dn_hash', 'ldap_dn')
+            ->from($this->getTableName(false))
+            ->where($qb->expr()->in('ldap_dn_hash', $qb->createNamedParameter($hashList, IQueryBuilder::PARAM_STR_ARRAY)));
+        return $qb;
+    }
+
+    protected function collectResultsFromListOfIdsQuery(IQueryBuilder $qb, array &$results): void {
+        $stmt = $qb->executeQuery();
+        while ($entry = $stmt->fetchAssociative()) {
+            $results[$entry['ldap_dn']] = $entry['owncloud_name'];
+            $this->cache[$entry['ldap_dn']] = $entry['owncloud_name'];
+        }
+        $stmt->closeCursor();
+    }
+
+    /**
+     * @param array<string> $fdns
+     * @return array<string,string>
+     */
+    public function getListOfIdsByDn(array $fdns): array {
+        $totalDBParamLimit = 65000;
+        $sliceSize = 1000;
+        $maxSlices = $this->dbc->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE ? 9 : $totalDBParamLimit / $sliceSize;
+        $results = [];
+
+        $slice = 1;
+        $fdns = array_map([$this, 'getDNHash'], $fdns);
+        $fdnsSlice = count($fdns) > $sliceSize ? array_slice($fdns, 0, $sliceSize) : $fdns;
+        $qb = $this->prepareListOfIdsQuery($fdnsSlice);
+
+        while (isset($fdnsSlice[999])) {
+            // Oracle does not allow more than 1000 values in the IN list,
+            // but allows slicing
+            $slice++;
+            $fdnsSlice = array_slice($fdns, $sliceSize * ($slice - 1), $sliceSize);
+
+            /** @see https://github.com/vimeo/psalm/issues/4995 */
+            /** @psalm-suppress TypeDoesNotContainType */
+            if (!isset($qb)) {
+                $qb = $this->prepareListOfIdsQuery($fdnsSlice);
+                continue;
+            }
+
+            if (!empty($fdnsSlice)) {
+                $qb->orWhere($qb->expr()->in('ldap_dn_hash', $qb->createNamedParameter($fdnsSlice, IQueryBuilder::PARAM_STR_ARRAY)));
+            }
+
+            if ($slice % $maxSlices === 0) {
+                $this->collectResultsFromListOfIdsQuery($qb, $results);
+                unset($qb);
+            }
+        }
+
+        if (isset($qb)) {
+            $this->collectResultsFromListOfIdsQuery($qb, $results);
+        }
+
+        return $results;
+    }
+
+    /**
+     * Searches mapped names by the giving string in the name column
+     *
+     * @return string[]
+     */
+    public function getNamesBySearch(string $search, string $prefixMatch = '', string $postfixMatch = ''): array {
+        $statement = $this->dbc->prepare('
 			SELECT `owncloud_name`
 			FROM `' . $this->getTableName() . '`
 			WHERE `owncloud_name` LIKE ?
 		');
 
-		try {
-			$res = $statement->execute([$prefixMatch . $this->dbc->escapeLikeParameter($search) . $postfixMatch]);
-		} catch (Exception $e) {
-			return [];
-		}
-		$names = [];
-		while ($row = $res->fetchAssociative()) {
-			$names[] = $row['owncloud_name'];
-		}
-		return $names;
-	}
-
-	/**
-	 * Gets the name based on the provided LDAP UUID.
-	 *
-	 * @param string $uuid
-	 * @return string|false
-	 */
-	public function getNameByUUID($uuid) {
-		return $this->getXbyY('owncloud_name', 'directory_uuid', $uuid);
-	}
-
-	public function getDnByUUID($uuid) {
-		return $this->getXbyY('ldap_dn', 'directory_uuid', $uuid);
-	}
-
-	/**
-	 * Gets the UUID based on the provided LDAP DN
-	 *
-	 * @param string $dn
-	 * @return false|string
-	 * @throws \Exception
-	 */
-	public function getUUIDByDN($dn) {
-		return $this->getXbyY('directory_uuid', 'ldap_dn_hash', $this->getDNHash($dn));
-	}
-
-	public function getList(int $offset = 0, ?int $limit = null, bool $invalidatedOnly = false): array {
-		$select = $this->dbc->getQueryBuilder();
-		$select->selectAlias('ldap_dn', 'dn')
-			->selectAlias('owncloud_name', 'name')
-			->selectAlias('directory_uuid', 'uuid')
-			->from($this->getTableName())
-			->setMaxResults($limit)
-			->setFirstResult($offset);
-
-		if ($invalidatedOnly) {
-			$select->where($select->expr()->like('directory_uuid', $select->createNamedParameter('invalidated_%')));
-		}
-
-		$result = $select->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $entries;
-	}
-
-	/**
-	 * attempts to map the given entry
-	 *
-	 * @param string $fdn fully distinguished name (from LDAP)
-	 * @param string $name
-	 * @param string $uuid a unique identifier as used in LDAP
-	 * @return bool
-	 */
-	public function map($fdn, $name, $uuid) {
-		if (mb_strlen($fdn) > 4000) {
-			Server::get(LoggerInterface::class)->error(
-				'Cannot map, because the DN exceeds 4000 characters: {dn}',
-				[
-					'app' => 'user_ldap',
-					'dn' => $fdn,
-				]
-			);
-			return false;
-		}
-
-		$row = [
-			'ldap_dn_hash' => $this->getDNHash($fdn),
-			'ldap_dn' => $fdn,
-			'owncloud_name' => $name,
-			'directory_uuid' => $uuid
-		];
-
-		try {
-			$result = $this->dbc->insertIfNotExist($this->getTableName(), $row);
-			if ((bool)$result === true) {
-				$this->cache[$fdn] = $name;
-				$this->localNameToDnCache?->set($name, $fdn, self::LOCAL_CACHE_TTL);
-			}
-			// insertIfNotExist returns values as int
-			return (bool)$result;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * removes a mapping based on the owncloud_name of the entry
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function unmap($name) {
-		$statement = $this->dbc->prepare('
+        try {
+            $res = $statement->execute([$prefixMatch . $this->dbc->escapeLikeParameter($search) . $postfixMatch]);
+        } catch (Exception $e) {
+            return [];
+        }
+        $names = [];
+        while ($row = $res->fetchAssociative()) {
+            $names[] = $row['owncloud_name'];
+        }
+        return $names;
+    }
+
+    /**
+     * Gets the name based on the provided LDAP UUID.
+     *
+     * @param string $uuid
+     * @return string|false
+     */
+    public function getNameByUUID($uuid) {
+        return $this->getXbyY('owncloud_name', 'directory_uuid', $uuid);
+    }
+
+    public function getDnByUUID($uuid) {
+        return $this->getXbyY('ldap_dn', 'directory_uuid', $uuid);
+    }
+
+    /**
+     * Gets the UUID based on the provided LDAP DN
+     *
+     * @param string $dn
+     * @return false|string
+     * @throws \Exception
+     */
+    public function getUUIDByDN($dn) {
+        return $this->getXbyY('directory_uuid', 'ldap_dn_hash', $this->getDNHash($dn));
+    }
+
+    public function getList(int $offset = 0, ?int $limit = null, bool $invalidatedOnly = false): array {
+        $select = $this->dbc->getQueryBuilder();
+        $select->selectAlias('ldap_dn', 'dn')
+            ->selectAlias('owncloud_name', 'name')
+            ->selectAlias('directory_uuid', 'uuid')
+            ->from($this->getTableName())
+            ->setMaxResults($limit)
+            ->setFirstResult($offset);
+
+        if ($invalidatedOnly) {
+            $select->where($select->expr()->like('directory_uuid', $select->createNamedParameter('invalidated_%')));
+        }
+
+        $result = $select->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $entries;
+    }
+
+    /**
+     * attempts to map the given entry
+     *
+     * @param string $fdn fully distinguished name (from LDAP)
+     * @param string $name
+     * @param string $uuid a unique identifier as used in LDAP
+     * @return bool
+     */
+    public function map($fdn, $name, $uuid) {
+        if (mb_strlen($fdn) > 4000) {
+            Server::get(LoggerInterface::class)->error(
+                'Cannot map, because the DN exceeds 4000 characters: {dn}',
+                [
+                    'app' => 'user_ldap',
+                    'dn' => $fdn,
+                ]
+            );
+            return false;
+        }
+
+        $row = [
+            'ldap_dn_hash' => $this->getDNHash($fdn),
+            'ldap_dn' => $fdn,
+            'owncloud_name' => $name,
+            'directory_uuid' => $uuid
+        ];
+
+        try {
+            $result = $this->dbc->insertIfNotExist($this->getTableName(), $row);
+            if ((bool)$result === true) {
+                $this->cache[$fdn] = $name;
+                $this->localNameToDnCache?->set($name, $fdn, self::LOCAL_CACHE_TTL);
+            }
+            // insertIfNotExist returns values as int
+            return (bool)$result;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * removes a mapping based on the owncloud_name of the entry
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function unmap($name) {
+        $statement = $this->dbc->prepare('
 			DELETE FROM `' . $this->getTableName() . '`
 			WHERE `owncloud_name` = ?');
 
-		$dn = array_search($name, $this->cache);
-		if ($dn !== false) {
-			unset($this->cache[$dn]);
-		}
-		$this->localNameToDnCache?->remove($name);
-
-		return $this->modify($statement, [$name]);
-	}
-
-	/**
-	 * Truncates the mapping table
-	 *
-	 * @return bool
-	 */
-	public function clear() {
-		$sql = $this->dbc
-			->getDatabasePlatform()
-			->getTruncateTableSQL('`' . $this->getTableName() . '`');
-		try {
-			$this->dbc->executeQuery($sql);
-			$this->localNameToDnCache?->clear();
-
-			return true;
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * clears the mapping table one by one and executing a callback with
-	 * each row's id (=owncloud_name col)
-	 *
-	 * @param callable $preCallback
-	 * @param callable $postCallback
-	 * @return bool true on success, false when at least one row was not
-	 *              deleted
-	 */
-	public function clearCb(callable $preCallback, callable $postCallback): bool {
-		$picker = $this->dbc->getQueryBuilder();
-		$picker->select('owncloud_name')
-			->from($this->getTableName());
-		$cursor = $picker->executeQuery();
-		$result = true;
-		while (($id = $cursor->fetchOne()) !== false) {
-			$preCallback($id);
-			if ($isUnmapped = $this->unmap($id)) {
-				$postCallback($id);
-			}
-			$result = $result && $isUnmapped;
-		}
-		$cursor->closeCursor();
-		return $result;
-	}
-
-	/**
-	 * returns the number of entries in the mappings table
-	 *
-	 * @return int
-	 */
-	public function count(): int {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select($query->func()->count('ldap_dn_hash'))
-			->from($this->getTableName());
-		$res = $query->executeQuery();
-		$count = $res->fetchOne();
-		$res->closeCursor();
-		return (int)$count;
-	}
-
-	public function countInvalidated(): int {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select($query->func()->count('ldap_dn_hash'))
-			->from($this->getTableName())
-			->where($query->expr()->like('directory_uuid', $query->createNamedParameter('invalidated_%')));
-		$res = $query->executeQuery();
-		$count = $res->fetchOne();
-		$res->closeCursor();
-		return (int)$count;
-	}
+        $dn = array_search($name, $this->cache);
+        if ($dn !== false) {
+            unset($this->cache[$dn]);
+        }
+        $this->localNameToDnCache?->remove($name);
+
+        return $this->modify($statement, [$name]);
+    }
+
+    /**
+     * Truncates the mapping table
+     *
+     * @return bool
+     */
+    public function clear() {
+        $sql = $this->dbc
+            ->getDatabasePlatform()
+            ->getTruncateTableSQL('`' . $this->getTableName() . '`');
+        try {
+            $this->dbc->executeQuery($sql);
+            $this->localNameToDnCache?->clear();
+
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * clears the mapping table one by one and executing a callback with
+     * each row's id (=owncloud_name col)
+     *
+     * @param callable $preCallback
+     * @param callable $postCallback
+     * @return bool true on success, false when at least one row was not
+     *              deleted
+     */
+    public function clearCb(callable $preCallback, callable $postCallback): bool {
+        $picker = $this->dbc->getQueryBuilder();
+        $picker->select('owncloud_name')
+            ->from($this->getTableName());
+        $cursor = $picker->executeQuery();
+        $result = true;
+        while (($id = $cursor->fetchOne()) !== false) {
+            $preCallback($id);
+            if ($isUnmapped = $this->unmap($id)) {
+                $postCallback($id);
+            }
+            $result = $result && $isUnmapped;
+        }
+        $cursor->closeCursor();
+        return $result;
+    }
+
+    /**
+     * returns the number of entries in the mappings table
+     *
+     * @return int
+     */
+    public function count(): int {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select($query->func()->count('ldap_dn_hash'))
+            ->from($this->getTableName());
+        $res = $query->executeQuery();
+        $count = $res->fetchOne();
+        $res->closeCursor();
+        return (int)$count;
+    }
+
+    public function countInvalidated(): int {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select($query->func()->count('ldap_dn_hash'))
+            ->from($this->getTableName())
+            ->where($query->expr()->like('directory_uuid', $query->createNamedParameter('invalidated_%')));
+        $res = $query->executeQuery();
+        $count = $res->fetchOne();
+        $res->closeCursor();
+        return (int)$count;
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -78,7 +78,7 @@ 
 		}
 
 		$section = \str_contains($this->getTableName(), 'user') ? 'u/' : 'g/';
-		$this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/' . $section);
+		$this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/'.$section);
 
 		// We use the cache as well to store whether it shall be used. If the
 		// answer was no, we unset it again.
@@ -101,7 +101,7 @@ 
 		$row = $result->fetchAssociative();
 		$result->closeCursor();
 
-		$use = (int)$row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
+		$use = (int) $row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
 		$this->localNameToDnCache->set('use', $use, self::LOCAL_USER_COUNT_TTL);
 		return $use;
 	}
@@ -175,7 +175,7 @@ 
 	/**
 	 * Gets the LDAP DN based on the provided name.
 	 */
-	public function getDNByName(string $name): string|false {
+	public function getDNByName(string $name): string | false {
 		$dn = array_search($name, $this->cache, true);
 		if ($dn === false) {
 			$dn = $this->localNameToDnCache?->get($name);
@@ -200,7 +200,7 @@ 
 	public function setDNbyUUID($fdn, $uuid) {
 		$oldDn = $this->getDnByUUID($uuid);
 		$statement = $this->dbc->prepare('
-			UPDATE `' . $this->getTableName() . '`
+			UPDATE `' . $this->getTableName().'`
 			SET `ldap_dn_hash` = ?, `ldap_dn` = ?
 			WHERE `directory_uuid` = ?
 		');
@@ -232,7 +232,7 @@ 
 	 */
 	public function setUUIDbyDN($uuid, $fdn): bool {
 		$statement = $this->dbc->prepare('
-			UPDATE `' . $this->getTableName() . '`
+			UPDATE `' . $this->getTableName().'`
 			SET `directory_uuid` = ?
 			WHERE `ldap_dn_hash` = ?
 		');
@@ -335,12 +335,12 @@ 
 	public function getNamesBySearch(string $search, string $prefixMatch = '', string $postfixMatch = ''): array {
 		$statement = $this->dbc->prepare('
 			SELECT `owncloud_name`
-			FROM `' . $this->getTableName() . '`
+			FROM `' . $this->getTableName().'`
 			WHERE `owncloud_name` LIKE ?
 		');
 
 		try {
-			$res = $statement->execute([$prefixMatch . $this->dbc->escapeLikeParameter($search) . $postfixMatch]);
+			$res = $statement->execute([$prefixMatch.$this->dbc->escapeLikeParameter($search).$postfixMatch]);
 		} catch (Exception $e) {
 			return [];
 		}
@@ -425,12 +425,12 @@ 
 
 		try {
 			$result = $this->dbc->insertIfNotExist($this->getTableName(), $row);
-			if ((bool)$result === true) {
+			if ((bool) $result === true) {
 				$this->cache[$fdn] = $name;
 				$this->localNameToDnCache?->set($name, $fdn, self::LOCAL_CACHE_TTL);
 			}
 			// insertIfNotExist returns values as int
-			return (bool)$result;
+			return (bool) $result;
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -444,7 +444,7 @@ 
 	 */
 	public function unmap($name) {
 		$statement = $this->dbc->prepare('
-			DELETE FROM `' . $this->getTableName() . '`
+			DELETE FROM `' . $this->getTableName().'`
 			WHERE `owncloud_name` = ?');
 
 		$dn = array_search($name, $this->cache);
@@ -464,7 +464,7 @@ 
 	public function clear() {
 		$sql = $this->dbc
 			->getDatabasePlatform()
-			->getTruncateTableSQL('`' . $this->getTableName() . '`');
+			->getTruncateTableSQL('`'.$this->getTableName().'`');
 		try {
 			$this->dbc->executeQuery($sql);
 			$this->localNameToDnCache?->clear();
@@ -513,7 +513,7 @@ 
 		$res = $query->executeQuery();
 		$count = $res->fetchOne();
 		$res->closeCursor();
-		return (int)$count;
+		return (int) $count;
 	}
 
 	public function countInvalidated(): int {
@@ -524,6 +524,6 @@ 
 		$res = $query->executeQuery();
 		$count = $res->fetchOne();
 		$res->closeCursor();
-		return (int)$count;
+		return (int) $count;
 	}
 }

apps/user_ldap/lib/Db/GroupMembershipMapper.php

Indentation +44 added lines, -44 removed lines

@@ -17,56 +17,56 @@
  * @template-extends QBMapper<GroupMembership>
  */
 class GroupMembershipMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'ldap_group_membership', GroupMembership::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'ldap_group_membership', GroupMembership::class);
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getKnownGroups(): array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->selectDistinct('groupid')
-			->from($this->getTableName())
-			->executeQuery();
+    /**
+     * @return string[]
+     */
+    public function getKnownGroups(): array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->selectDistinct('groupid')
+            ->from($this->getTableName())
+            ->executeQuery();
 
-		$groups = array_column($result->fetchAllAssociative(), 'groupid');
-		$result->closeCursor();
-		return $groups;
-	}
+        $groups = array_column($result->fetchAllAssociative(), 'groupid');
+        $result->closeCursor();
+        return $groups;
+    }
 
-	/**
-	 * @return GroupMembership[]
-	 */
-	public function findGroupMemberships(string $groupid): array {
-		$qb = $this->db->getQueryBuilder();
-		$select = $qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('groupid', $qb->createNamedParameter($groupid)));
+    /**
+     * @return GroupMembership[]
+     */
+    public function findGroupMemberships(string $groupid): array {
+        $qb = $this->db->getQueryBuilder();
+        $select = $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('groupid', $qb->createNamedParameter($groupid)));
 
-		return $this->findEntities($select);
-	}
+        return $this->findEntities($select);
+    }
 
-	/**
-	 * @return GroupMembership[]
-	 */
-	public function findGroupMembershipsForUser(string $userid): array {
-		$qb = $this->db->getQueryBuilder();
-		$select = $qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($userid)));
+    /**
+     * @return GroupMembership[]
+     */
+    public function findGroupMembershipsForUser(string $userid): array {
+        $qb = $this->db->getQueryBuilder();
+        $select = $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($userid)));
 
-		return $this->findEntities($select);
-	}
+        return $this->findEntities($select);
+    }
 
-	public function deleteGroups(array $removedGroups): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->getTableName())
-			->where($query->expr()->in('groupid', $query->createParameter('groupids')));
+    public function deleteGroups(array $removedGroups): void {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->getTableName())
+            ->where($query->expr()->in('groupid', $query->createParameter('groupids')));
 
-		foreach (array_chunk($removedGroups, 1000) as $removedGroupsChunk) {
-			$query->setParameter('groupids', $removedGroupsChunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$query->executeStatement();
-		}
-	}
+        foreach (array_chunk($removedGroups, 1000) as $removedGroupsChunk) {
+            $query->setParameter('groupids', $removedGroupsChunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $query->executeStatement();
+        }
+    }
 }

apps/user_ldap/lib/Migration/Version1190Date20230706134108.php

Indentation +75 added lines, -75 removed lines

@@ -17,92 +17,92 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1190Date20230706134108 extends SimpleMigrationStep {
-	public function __construct(
-		private IDBConnection $dbc,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+    ) {
+    }
 
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-	}
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+    }
 
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('ldap_group_membership')) {
-			$table = $schema->createTable('ldap_group_membership');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('groupid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('userid', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['groupid', 'userid'], 'user_ldap_membership_unique');
-			return $schema;
-		} else {
-			return null;
-		}
-	}
+        if (!$schema->hasTable('ldap_group_membership')) {
+            $table = $schema->createTable('ldap_group_membership');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('groupid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('userid', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['groupid', 'userid'], 'user_ldap_membership_unique');
+            return $schema;
+        } else {
+            return null;
+        }
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('ldap_group_members')) {
-			// Old table does not exist
-			return;
-		}
+        if (!$schema->hasTable('ldap_group_members')) {
+            // Old table does not exist
+            return;
+        }
 
-		$output->startProgress();
-		$this->copyGroupMembershipData();
-		$output->finishProgress();
-	}
+        $output->startProgress();
+        $this->copyGroupMembershipData();
+        $output->finishProgress();
+    }
 
-	protected function copyGroupMembershipData(): void {
-		$insert = $this->dbc->getQueryBuilder();
-		$insert->insert('ldap_group_membership')
-			->values([
-				'userid' => $insert->createParameter('userid'),
-				'groupid' => $insert->createParameter('groupid'),
-			]);
+    protected function copyGroupMembershipData(): void {
+        $insert = $this->dbc->getQueryBuilder();
+        $insert->insert('ldap_group_membership')
+            ->values([
+                'userid' => $insert->createParameter('userid'),
+                'groupid' => $insert->createParameter('groupid'),
+            ]);
 
-		$query = $this->dbc->getQueryBuilder();
-		$query->select('*')
-			->from('ldap_group_members');
+        $query = $this->dbc->getQueryBuilder();
+        $query->select('*')
+            ->from('ldap_group_members');
 
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$knownUsers = unserialize($row['owncloudusers']);
-			if (!is_array($knownUsers)) {
-				/* Unserialize failed or data was incorrect in database, ignore */
-				continue;
-			}
-			$knownUsers = array_unique($knownUsers);
-			foreach ($knownUsers as $knownUser) {
-				try {
-					$insert
-						->setParameter('groupid', $row['owncloudname'])
-						->setParameter('userid', $knownUser)
-					;
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $knownUsers = unserialize($row['owncloudusers']);
+            if (!is_array($knownUsers)) {
+                /* Unserialize failed or data was incorrect in database, ignore */
+                continue;
+            }
+            $knownUsers = array_unique($knownUsers);
+            foreach ($knownUsers as $knownUser) {
+                try {
+                    $insert
+                        ->setParameter('groupid', $row['owncloudname'])
+                        ->setParameter('userid', $knownUser)
+                    ;
 
-					$insert->executeStatement();
-				} catch (\OCP\DB\Exception $e) {
-					/*
+                    $insert->executeStatement();
+                } catch (\OCP\DB\Exception $e) {
+                    /*
 					 * If it fails on unique constaint violation it may just be left over value from previous half-migration
 					 * If it fails on something else, ignore as well, data will be filled by background job later anyway
 					 */
-				}
-			}
-		}
-		$result->closeCursor();
-	}
+                }
+            }
+        }
+        $result->closeCursor();
+    }
 }

apps/user_ldap/lib/Migration/Version1130Date20211102154716.php

Indentation +219 added lines, -219 removed lines

@@ -22,245 +22,245 @@
 
 class Version1130Date20211102154716 extends SimpleMigrationStep {
 
-	/** @var string[] */
-	private $hashColumnAddedToTables = [];
+    /** @var string[] */
+    private $hashColumnAddedToTables = [];
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName() {
-		return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
-	}
+    public function getName() {
+        return 'Adjust LDAP user and group ldap_dn column lengths and add ldap_dn_hash columns';
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$this->processDuplicateUUIDs($tableName);
-		}
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $this->processDuplicateUUIDs($tableName);
+        }
 
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			// Previous upgrades of a broken release might have left an incomplete
-			// ldap_group_mapping_backup table. No need to recreate, but it
-			// should be empty.
-			// TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
-			$sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
-			$this->dbc->executeStatement($sql);
-		}
-	}
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            // Previous upgrades of a broken release might have left an incomplete
+            // ldap_group_mapping_backup table. No need to recreate, but it
+            // should be empty.
+            // TRUNCATE is not available from Query Builder, but faster than DELETE FROM.
+            $sql = $this->dbc->getDatabasePlatform()->getTruncateTableSQL('`*PREFIX*ldap_group_mapping_backup`', false);
+            $this->dbc->executeStatement($sql);
+        }
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$changeSchema = false;
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			if (!$table->hasColumn('ldap_dn_hash')) {
-				$table->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$changeSchema = true;
-				$this->hashColumnAddedToTables[] = $tableName;
-			}
-			$column = $table->getColumn('ldap_dn');
-			if ($tableName === 'ldap_user_mapping') {
-				if ($column->getLength() < 4000) {
-					$column->setLength(4000);
-					$changeSchema = true;
-				}
+        $changeSchema = false;
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            if (!$table->hasColumn('ldap_dn_hash')) {
+                $table->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $changeSchema = true;
+                $this->hashColumnAddedToTables[] = $tableName;
+            }
+            $column = $table->getColumn('ldap_dn');
+            if ($tableName === 'ldap_user_mapping') {
+                if ($column->getLength() < 4000) {
+                    $column->setLength(4000);
+                    $changeSchema = true;
+                }
 
-				if ($table->hasIndex('ldap_dn_users')) {
-					$table->dropIndex('ldap_dn_users');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_dn_hashes')) {
-					$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
-					$changeSchema = true;
-				}
-				if (!$table->hasIndex('ldap_user_directory_uuid')) {
-					$table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
-					$changeSchema = true;
-				}
-			} elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
-				// We need to copy the table twice to be able to change primary key, prepare the backup table
-				$table2 = $schema->createTable('ldap_group_mapping_backup');
-				$table2->addColumn('ldap_dn', Types::STRING, [
-					'notnull' => true,
-					'length' => 4000,
-					'default' => '',
-				]);
-				$table2->addColumn('owncloud_name', Types::STRING, [
-					'notnull' => true,
-					'length' => 64,
-					'default' => '',
-				]);
-				$table2->addColumn('directory_uuid', Types::STRING, [
-					'notnull' => true,
-					'length' => 255,
-					'default' => '',
-				]);
-				$table2->addColumn('ldap_dn_hash', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
-				$changeSchema = true;
-			}
-		}
+                if ($table->hasIndex('ldap_dn_users')) {
+                    $table->dropIndex('ldap_dn_users');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_dn_hashes')) {
+                    $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes');
+                    $changeSchema = true;
+                }
+                if (!$table->hasIndex('ldap_user_directory_uuid')) {
+                    $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid');
+                    $changeSchema = true;
+                }
+            } elseif (!$schema->hasTable('ldap_group_mapping_backup')) {
+                // We need to copy the table twice to be able to change primary key, prepare the backup table
+                $table2 = $schema->createTable('ldap_group_mapping_backup');
+                $table2->addColumn('ldap_dn', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 4000,
+                    'default' => '',
+                ]);
+                $table2->addColumn('owncloud_name', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 64,
+                    'default' => '',
+                ]);
+                $table2->addColumn('directory_uuid', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 255,
+                    'default' => '',
+                ]);
+                $table2->addColumn('ldap_dn_hash', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
+                $changeSchema = true;
+            }
+        }
 
-		return $changeSchema ? $schema : null;
-	}
+        return $changeSchema ? $schema : null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$this->handleDNHashes('ldap_group_mapping');
-		$this->handleDNHashes('ldap_user_mapping');
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $this->handleDNHashes('ldap_group_mapping');
+        $this->handleDNHashes('ldap_user_mapping');
+    }
 
-	protected function handleDNHashes(string $table): void {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
+    protected function handleDNHashes(string $table): void {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
 
-		$result = $select->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$dnHash = hash('sha256', $row['ldap_dn'], false);
-			$update->setParameter('name', $row['owncloud_name']);
-			$update->setParameter('dn_hash', $dnHash);
-			try {
-				$update->executeStatement();
-			} catch (Exception $e) {
-				$this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'name' => $row['owncloud_name'],
-						'dnHash' => $dnHash,
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $dnHash = hash('sha256', $row['ldap_dn'], false);
+            $update->setParameter('name', $row['owncloud_name']);
+            $update->setParameter('dn_hash', $dnHash);
+            try {
+                $update->executeStatement();
+            } catch (Exception $e) {
+                $this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'name' => $row['owncloud_name'],
+                        'dnHash' => $dnHash,
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
 
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'ldap_dn')
-			->from($table);
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'ldap_dn')
+            ->from($table);
 
-		// when added we may run into risk that it's read from a DB node
-		// where the column is not present. Then the where clause is also
-		// not necessary since all rows qualify.
-		if (!in_array($table, $this->hashColumnAddedToTables, true)) {
-			$qb->where($qb->expr()->isNull('ldap_dn_hash'));
-		}
+        // when added we may run into risk that it's read from a DB node
+        // where the column is not present. Then the where clause is also
+        // not necessary since all rows qualify.
+        if (!in_array($table, $this->hashColumnAddedToTables, true)) {
+            $qb->where($qb->expr()->isNull('ldap_dn_hash'));
+        }
 
-		return $qb;
-	}
+        return $qb;
+    }
 
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
-			->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
-		return $qb;
-	}
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
+            ->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
+        return $qb;
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function processDuplicateUUIDs(string $table): void {
-		$uuids = $this->getDuplicatedUuids($table);
-		$idsWithUuidToInvalidate = [];
-		foreach ($uuids as $uuid) {
-			array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
-		}
-		$this->invalidateUuids($table, $idsWithUuidToInvalidate);
-	}
+    /**
+     * @throws Exception
+     */
+    protected function processDuplicateUUIDs(string $table): void {
+        $uuids = $this->getDuplicatedUuids($table);
+        $idsWithUuidToInvalidate = [];
+        foreach ($uuids as $uuid) {
+            array_push($idsWithUuidToInvalidate, ...$this->getNextcloudIdsByUuid($table, $uuid));
+        }
+        $this->invalidateUuids($table, $idsWithUuidToInvalidate);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	protected function invalidateUuids(string $table, array $idList): void {
-		$update = $this->dbc->getQueryBuilder();
-		$update->update($table)
-			->set('directory_uuid', $update->createParameter('invalidatedUuid'))
-			->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
+    /**
+     * @throws Exception
+     */
+    protected function invalidateUuids(string $table, array $idList): void {
+        $update = $this->dbc->getQueryBuilder();
+        $update->update($table)
+            ->set('directory_uuid', $update->createParameter('invalidatedUuid'))
+            ->where($update->expr()->eq('owncloud_name', $update->createParameter('nextcloudId')));
 
-		while ($nextcloudId = array_shift($idList)) {
-			$update->setParameter('nextcloudId', $nextcloudId);
-			$update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
-			try {
-				$update->executeStatement();
-				$this->logger->warning(
-					'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
-					[
-						'app' => 'user_ldap',
-						'nid' => $nextcloudId,
-					]
-				);
-			} catch (Exception $e) {
-				// Catch possible, but unlikely duplications if new invalidated errors.
-				// There is the theoretical chance of an infinity loop is, when
-				// the constraint violation has a different background. I cannot
-				// think of one at the moment.
-				if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-				$idList[] = $nextcloudId;
-			}
-		}
-	}
+        while ($nextcloudId = array_shift($idList)) {
+            $update->setParameter('nextcloudId', $nextcloudId);
+            $update->setParameter('invalidatedUuid', 'invalidated_' . \bin2hex(\random_bytes(6)));
+            try {
+                $update->executeStatement();
+                $this->logger->warning(
+                    'LDAP user or group with ID {nid} has a duplicated UUID value which therefore was invalidated. You may double-check your LDAP configuration and trigger an update of the UUID.',
+                    [
+                        'app' => 'user_ldap',
+                        'nid' => $nextcloudId,
+                    ]
+                );
+            } catch (Exception $e) {
+                // Catch possible, but unlikely duplications if new invalidated errors.
+                // There is the theoretical chance of an infinity loop is, when
+                // the constraint violation has a different background. I cannot
+                // think of one at the moment.
+                if ($e->getReason() !== Exception::REASON_CONSTRAINT_VIOLATION) {
+                    throw $e;
+                }
+                $idList[] = $nextcloudId;
+            }
+        }
+    }
 
-	/**
-	 * @throws \OCP\DB\Exception
-	 * @return array<string>
-	 */
-	protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('owncloud_name')
-			->from($table)
-			->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
+    /**
+     * @throws \OCP\DB\Exception
+     * @return array<string>
+     */
+    protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('owncloud_name')
+            ->from($table)
+            ->where($select->expr()->eq('directory_uuid', $select->createNamedParameter($uuid)));
 
-		$result = $select->executeQuery();
-		$idList = [];
-		while (($id = $result->fetchOne()) !== false) {
-			$idList[] = $id;
-		}
-		$result->closeCursor();
-		return $idList;
-	}
+        $result = $select->executeQuery();
+        $idList = [];
+        while (($id = $result->fetchOne()) !== false) {
+            $idList[] = $id;
+        }
+        $result->closeCursor();
+        return $idList;
+    }
 
-	/**
-	 * @return Generator<string>
-	 * @throws \OCP\DB\Exception
-	 */
-	protected function getDuplicatedUuids(string $table): Generator {
-		$select = $this->dbc->getQueryBuilder();
-		$select->select('directory_uuid')
-			->from($table)
-			->groupBy('directory_uuid')
-			->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
+    /**
+     * @return Generator<string>
+     * @throws \OCP\DB\Exception
+     */
+    protected function getDuplicatedUuids(string $table): Generator {
+        $select = $this->dbc->getQueryBuilder();
+        $select->select('directory_uuid')
+            ->from($table)
+            ->groupBy('directory_uuid')
+            ->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
 
-		$result = $select->executeQuery();
-		while (($uuid = $result->fetchOne()) !== false) {
-			yield $uuid;
-		}
-		$result->closeCursor();
-	}
+        $result = $select->executeQuery();
+        while (($uuid = $result->fetchOne()) !== false) {
+            yield $uuid;
+        }
+        $result->closeCursor();
+    }
 }

apps/user_ldap/lib/Migration/GroupMappingMigration.php

Indentation +33 added lines, -33 removed lines

@@ -14,37 +14,37 @@
 
 abstract class GroupMappingMigration extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $dbc,
-	) {
-	}
-
-	protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void {
-		$insert = $this->dbc->getQueryBuilder();
-		$insert->insert($destinationTable)
-			->values([
-				'ldap_dn' => $insert->createParameter('ldap_dn'),
-				'owncloud_name' => $insert->createParameter('owncloud_name'),
-				'directory_uuid' => $insert->createParameter('directory_uuid'),
-				'ldap_dn_hash' => $insert->createParameter('ldap_dn_hash'),
-			]);
-
-		$query = $this->dbc->getQueryBuilder();
-		$query->select('*')
-			->from($sourceTable);
-
-
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$insert
-				->setParameter('ldap_dn', $row['ldap_dn'])
-				->setParameter('owncloud_name', $row['owncloud_name'])
-				->setParameter('directory_uuid', $row['directory_uuid'])
-				->setParameter('ldap_dn_hash', $row['ldap_dn_hash'])
-			;
-
-			$insert->executeStatement();
-		}
-		$result->closeCursor();
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+    ) {
+    }
+
+    protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void {
+        $insert = $this->dbc->getQueryBuilder();
+        $insert->insert($destinationTable)
+            ->values([
+                'ldap_dn' => $insert->createParameter('ldap_dn'),
+                'owncloud_name' => $insert->createParameter('owncloud_name'),
+                'directory_uuid' => $insert->createParameter('directory_uuid'),
+                'ldap_dn_hash' => $insert->createParameter('ldap_dn_hash'),
+            ]);
+
+        $query = $this->dbc->getQueryBuilder();
+        $query->select('*')
+            ->from($sourceTable);
+
+
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $insert
+                ->setParameter('ldap_dn', $row['ldap_dn'])
+                ->setParameter('owncloud_name', $row['owncloud_name'])
+                ->setParameter('directory_uuid', $row['directory_uuid'])
+                ->setParameter('ldap_dn_hash', $row['ldap_dn_hash'])
+            ;
+
+            $insert->executeStatement();
+        }
+        $result->closeCursor();
+    }
 }

apps/user_ldap/lib/Migration/Version1120Date20210917155206.php

Indentation +106 added lines, -106 removed lines

@@ -22,110 +22,110 @@
 
 class Version1120Date20210917155206 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function getName() {
-		return 'Adjust LDAP user and group id column lengths to match server lengths';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		// ensure that there is no user or group id longer than 64char in LDAP table
-		$this->handleIDs('ldap_group_mapping', false);
-		$this->handleIDs('ldap_user_mapping', true);
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$changeSchema = false;
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			$column = $table->getColumn('owncloud_name');
-			if ($column->getLength() > 64) {
-				$column->setLength(64);
-				$changeSchema = true;
-			}
-		}
-
-		return $changeSchema ? $schema : null;
-	}
-
-	protected function handleIDs(string $table, bool $emitHooks) {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
-
-		$result = $select->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$newId = hash('sha256', $row['owncloud_name'], false);
-			if ($emitHooks) {
-				$this->emitUnassign($row['owncloud_name'], true);
-			}
-			$update->setParameter('uuid', $row['directory_uuid']);
-			$update->setParameter('newId', $newId);
-			try {
-				$update->executeStatement();
-				if ($emitHooks) {
-					$this->emitUnassign($row['owncloud_name'], false);
-					$this->emitAssign($newId);
-				}
-			} catch (Exception $e) {
-				$this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'oldId' => $row['owncloud_name'],
-						'newId' => $newId,
-						'uuid' => $row['directory_uuid'],
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
-
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'directory_uuid')
-			->from($table)
-			->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
-		return $qb;
-	}
-
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('owncloud_name', $qb->createParameter('newId'))
-			->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
-		return $qb;
-	}
-
-	protected function emitUnassign(string $oldId, bool $pre): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
-		}
-	}
-
-	protected function emitAssign(string $newId): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
-		}
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function getName() {
+        return 'Adjust LDAP user and group id column lengths to match server lengths';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        // ensure that there is no user or group id longer than 64char in LDAP table
+        $this->handleIDs('ldap_group_mapping', false);
+        $this->handleIDs('ldap_user_mapping', true);
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $changeSchema = false;
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            $column = $table->getColumn('owncloud_name');
+            if ($column->getLength() > 64) {
+                $column->setLength(64);
+                $changeSchema = true;
+            }
+        }
+
+        return $changeSchema ? $schema : null;
+    }
+
+    protected function handleIDs(string $table, bool $emitHooks) {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
+
+        $result = $select->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $newId = hash('sha256', $row['owncloud_name'], false);
+            if ($emitHooks) {
+                $this->emitUnassign($row['owncloud_name'], true);
+            }
+            $update->setParameter('uuid', $row['directory_uuid']);
+            $update->setParameter('newId', $newId);
+            try {
+                $update->executeStatement();
+                if ($emitHooks) {
+                    $this->emitUnassign($row['owncloud_name'], false);
+                    $this->emitAssign($newId);
+                }
+            } catch (Exception $e) {
+                $this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'oldId' => $row['owncloud_name'],
+                        'newId' => $newId,
+                        'uuid' => $row['directory_uuid'],
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
+
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'directory_uuid')
+            ->from($table)
+            ->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
+        return $qb;
+    }
+
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('owncloud_name', $qb->createParameter('newId'))
+            ->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
+        return $qb;
+    }
+
+    protected function emitUnassign(string $oldId, bool $pre): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
+        }
+    }
+
+    protected function emitAssign(string $newId): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
+        }
+    }
 }

apps/federatedfilesharing/tests/FederatedShareProviderTest.php

Indentation +912 added lines, -912 removed lines

@@ -39,916 +39,916 @@
  */
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class FederatedShareProviderTest extends \Test\TestCase {
-	protected IDBConnection $connection;
-	protected AddressHandler&MockObject $addressHandler;
-	protected Notifications&MockObject $notifications;
-	protected TokenHandler&MockObject $tokenHandler;
-	protected IL10N $l;
-	protected LoggerInterface $logger;
-	protected IRootFolder&MockObject $rootFolder;
-	protected IConfig&MockObject $config;
-	protected IUserManager&MockObject $userManager;
-	protected \OCP\GlobalScale\IConfig&MockObject $gsConfig;
-	protected IManager $shareManager;
-	protected FederatedShareProvider $provider;
-	protected IContactsManager&MockObject $contactsManager;
-	private ICloudIdManager $cloudIdManager;
-	private ICloudFederationProviderManager&MockObject $cloudFederationProviderManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->notifications = $this->createMock(Notifications::class);
-		$this->tokenHandler = $this->createMock(TokenHandler::class);
-		$this->l = $this->createMock(IL10N::class);
-		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		//$this->addressHandler = new AddressHandler(\OC::$server->getURLGenerator(), $this->l);
-		$this->addressHandler = $this->createMock(AddressHandler::class);
-		$this->contactsManager = $this->createMock(IContactsManager::class);
-		$this->cloudIdManager = new CloudIdManager(
-			$this->createMock(ICacheFactory::class),
-			$this->createMock(IEventDispatcher::class),
-			$this->contactsManager,
-			$this->createMock(IURLGenerator::class),
-			$this->userManager,
-		);
-		$this->gsConfig = $this->createMock(\OCP\GlobalScale\IConfig::class);
-
-		$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
-
-		$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
-
-		$this->provider = new FederatedShareProvider(
-			$this->connection,
-			$this->addressHandler,
-			$this->notifications,
-			$this->tokenHandler,
-			$this->l,
-			$this->rootFolder,
-			$this->config,
-			$this->userManager,
-			$this->cloudIdManager,
-			$this->gsConfig,
-			$this->cloudFederationProviderManager,
-			$this->logger,
-		);
-
-		$this->shareManager = Server::get(IManager::class);
-	}
-
-	protected function tearDown(): void {
-		$this->connection->getQueryBuilder()->delete('share')->executeStatement();
-
-		parent::tearDown();
-	}
-
-	public static function dataTestCreate(): array {
-		return [
-			[null, null],
-			[new \DateTime('2020-03-01T01:02:03'), '2020-03-01 01:02:03'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCreate')]
-	public function testCreate(?\DateTime $expirationDate, ?string $expectedDataDate): void {
-		$share = $this->shareManager->newShare();
-
-		/** @var File&MockObject $node */
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setExpirationDate($expirationDate)
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				'shareOwner',
-				'shareOwner@http://localhost',
-				'sharedBy',
-				'sharedBy@http://localhost'
-			)
-			->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->provider->create($share);
-
-		$qb = $this->connection->getQueryBuilder();
-		$stmt = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->executeQuery();
-
-		$data = $stmt->fetchAssociative();
-		$stmt->closeCursor();
-
-		$expected = [
-			'share_type' => IShare::TYPE_REMOTE,
-			'share_with' => 'user@server.com',
-			'uid_owner' => 'shareOwner',
-			'uid_initiator' => 'sharedBy',
-			'item_type' => 'file',
-			'item_source' => 42,
-			'file_source' => 42,
-			'permissions' => 19,
-			'accepted' => 0,
-			'token' => 'token',
-			'expiration' => $expectedDataDate,
-		];
-		foreach (array_keys($expected) as $key) {
-			$this->assertEquals($expected[$key], $data[$key], "Assert that value for key '$key' is the same");
-		}
-
-		$this->assertEquals($data['id'], $share->getId());
-		$this->assertEquals(IShare::TYPE_REMOTE, $share->getShareType());
-		$this->assertEquals('user@server.com', $share->getSharedWith());
-		$this->assertEquals('sharedBy', $share->getSharedBy());
-		$this->assertEquals('shareOwner', $share->getShareOwner());
-		$this->assertEquals('file', $share->getNodeType());
-		$this->assertEquals(42, $share->getNodeId());
-		$this->assertEquals(19, $share->getPermissions());
-		$this->assertEquals('token', $share->getToken());
-		$this->assertEquals($expirationDate, $share->getExpirationDate());
-	}
-
-	public function testCreateCouldNotFindServer(): void {
-		$share = $this->shareManager->newShare();
-
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				'shareOwner',
-				'shareOwner@http://localhost',
-				'sharedBy',
-				'sharedBy@http://localhost'
-			)->willReturn(false);
-
-		$this->rootFolder->method('getById')
-			->with('42')
-			->willReturn([$node]);
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		try {
-			$share = $this->provider->create($share);
-			$this->fail();
-		} catch (\Exception $e) {
-			$this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$stmt = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->executeQuery();
-
-		$data = $stmt->fetchAssociative();
-		$stmt->closeCursor();
-
-		$this->assertFalse($data);
-	}
-
-	public function testCreateException(): void {
-		$share = $this->shareManager->newShare();
-
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				'shareOwner',
-				'shareOwner@http://localhost',
-				'sharedBy',
-				'sharedBy@http://localhost'
-			)->willThrowException(new \Exception('dummy'));
-
-		$this->rootFolder->method('getById')
-			->with('42')
-			->willReturn([$node]);
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		try {
-			$share = $this->provider->create($share);
-			$this->fail();
-		} catch (\Exception $e) {
-			$this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$stmt = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->executeQuery();
-
-		$data = $stmt->fetchAssociative();
-		$stmt->closeCursor();
-
-		$this->assertFalse($data);
-	}
-
-	public function testCreateShareWithSelf(): void {
-		$share = $this->shareManager->newShare();
-
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->addressHandler->expects($this->any())->method('compareAddresses')
-			->willReturn(true);
-
-		$shareWith = 'sharedBy@localhost';
-
-		$share->setSharedWith($shareWith)
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setNode($node);
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		try {
-			$share = $this->provider->create($share);
-			$this->fail();
-		} catch (\Exception $e) {
-			$this->assertEquals('Not allowed to create a federated share to the same account', $e->getMessage());
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$stmt = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->executeQuery();
-
-		$data = $stmt->fetchAssociative();
-		$stmt->closeCursor();
-
-		$this->assertFalse($data);
-	}
-
-	public function testCreateAlreadyShared(): void {
-		$share = $this->shareManager->newShare();
-
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				'shareOwner',
-				'shareOwner@http://localhost',
-				'sharedBy',
-				'sharedBy@http://localhost'
-			)->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$this->provider->create($share);
-
-		try {
-			$this->provider->create($share);
-		} catch (\Exception $e) {
-			$this->assertEquals('Sharing myFile failed, because this item is already shared with the account user@server.com', $e->getMessage());
-		}
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdate')]
-	public function testUpdate(string $owner, string $sharedBy, ?\DateTime $expirationDate): void {
-		$this->provider = $this->getMockBuilder(FederatedShareProvider::class)
-			->setConstructorArgs(
-				[
-					$this->connection,
-					$this->addressHandler,
-					$this->notifications,
-					$this->tokenHandler,
-					$this->l,
-					$this->rootFolder,
-					$this->config,
-					$this->userManager,
-					$this->cloudIdManager,
-					$this->gsConfig,
-					$this->cloudFederationProviderManager,
-					$this->logger,
-				]
-			)
-			->onlyMethods(['sendPermissionUpdate'])
-			->getMock();
-
-		$share = $this->shareManager->newShare();
-
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturn(['user', 'server.com']);
-
-		$share->setSharedWith('user@server.com')
-			->setSharedBy($sharedBy)
-			->setShareOwner($owner)
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setExpirationDate(new \DateTime('2019-02-01T01:02:03'))
-			->setNode($node);
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->addressHandler->expects($this->any())->method('generateRemoteURL')
-			->willReturn('http://localhost/');
-
-		$this->notifications->expects($this->once())
-			->method('sendRemoteShare')
-			->with(
-				$this->equalTo('token'),
-				$this->equalTo('user@server.com'),
-				$this->equalTo('myFile'),
-				$this->anything(),
-				$owner,
-				$owner . '@http://localhost',
-				$sharedBy,
-				$sharedBy . '@http://localhost'
-			)->willReturn(true);
-
-		if ($owner === $sharedBy) {
-			$this->provider->expects($this->never())->method('sendPermissionUpdate');
-		} else {
-			$this->provider->expects($this->once())->method('sendPermissionUpdate');
-		}
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->provider->create($share);
-
-		$share->setPermissions(1);
-		$share->setExpirationDate($expirationDate);
-		$this->provider->update($share);
-
-		$share = $this->provider->getShareById($share->getId());
-
-		$this->assertEquals(1, $share->getPermissions());
-		$this->assertEquals($expirationDate, $share->getExpirationDate());
-	}
-
-	public static function dataTestUpdate(): array {
-		return [
-			['sharedBy', 'shareOwner', new \DateTime('2020-03-01T01:02:03')],
-			['shareOwner', 'shareOwner', null],
-		];
-	}
-
-	public function testGetSharedBy(): void {
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->addressHandler->expects($this->never())->method('splitUserRemote');
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->notifications
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->shareManager->newShare();
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user2@server.com')
-			->setSharedBy('sharedBy2')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share2);
-
-		$shares = $this->provider->getSharesBy('sharedBy', IShare::TYPE_REMOTE, null, false, -1, 0);
-
-		$this->assertCount(1, $shares);
-		$this->assertEquals('user@server.com', $shares[0]->getSharedWith());
-		$this->assertEquals('sharedBy', $shares[0]->getSharedBy());
-	}
-
-	public function testGetSharedByWithNode(): void {
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->notifications
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->shareManager->newShare();
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share);
-
-		$node2 = $this->getMockBuilder(File::class)->getMock();
-		$node2->method('getId')->willReturn(43);
-		$node2->method('getName')->willReturn('myOtherFile');
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node2);
-		$this->provider->create($share2);
-
-		$shares = $this->provider->getSharesBy('sharedBy', IShare::TYPE_REMOTE, $node2, false, -1, 0);
-
-		$this->assertCount(1, $shares);
-		$this->assertEquals(43, $shares[0]->getNodeId());
-	}
-
-	public function testGetSharedByWithReshares(): void {
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->notifications
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->shareManager->newShare();
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('shareOwner')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user2@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share2);
-
-		$shares = $this->provider->getSharesBy('shareOwner', IShare::TYPE_REMOTE, null, true, -1, 0);
-
-		$this->assertCount(2, $shares);
-	}
-
-	public function testGetSharedByWithLimit(): void {
-		$node = $this->createMock(File::class);
-		$node->method('getId')->willReturn(42);
-		$node->method('getName')->willReturn('myFile');
-
-		$this->addressHandler->expects($this->any())->method('splitUserRemote')
-			->willReturnCallback(function ($uid) {
-				if ($uid === 'user@server.com') {
-					return ['user', 'server.com'];
-				}
-				return ['user2', 'server.com'];
-			});
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->notifications
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->rootFolder->expects($this->never())->method($this->anything());
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share = $this->shareManager->newShare();
-		$share->setSharedWith('user@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user2@server.com')
-			->setSharedBy('sharedBy')
-			->setShareOwner('shareOwner')
-			->setPermissions(19)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node);
-		$this->provider->create($share2);
-
-		$shares = $this->provider->getSharesBy('shareOwner', IShare::TYPE_REMOTE, null, true, 1, 1);
-
-		$this->assertCount(1, $shares);
-		$this->assertEquals('user2@server.com', $shares[0]->getSharedWith());
-	}
-
-	public static function dataDeleteUser(): array {
-		return [
-			['a', 'b', 'c', 'a', true],
-			['a', 'b', 'c', 'b', false],
-			// The recipient is non local.
-			['a', 'b', 'c', 'c', false],
-			['a', 'b', 'c', 'd', false],
-		];
-	}
-
-	/**
-	 *
-	 * @param string $owner The owner of the share (uid)
-	 * @param string $initiator The initiator of the share (uid)
-	 * @param string $recipient The recipient of the share (uid/gid/pass)
-	 * @param string $deletedUser The user that is deleted
-	 * @param bool $rowDeleted Is the row deleted in this setup
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataDeleteUser')]
-	public function testDeleteUser(string $owner, string $initiator, string $recipient, string $deletedUser, bool $rowDeleted): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE))
-			->setValue('uid_owner', $qb->createNamedParameter($owner))
-			->setValue('uid_initiator', $qb->createNamedParameter($initiator))
-			->setValue('share_with', $qb->createNamedParameter($recipient))
-			->setValue('item_type', $qb->createNamedParameter('file'))
-			->setValue('item_source', $qb->createNamedParameter(42))
-			->setValue('file_source', $qb->createNamedParameter(42))
-			->executeStatement();
-
-		$id = $qb->getLastInsertId();
-
-		$this->provider->userDeleted($deletedUser, IShare::TYPE_REMOTE);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($id))
-			);
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetchAllAssociative();
-		$cursor->closeCursor();
-
-		$this->assertCount($rowDeleted ? 0 : 1, $data);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsOutgoingServer2serverShareEnabled')]
-	public function testIsOutgoingServer2serverShareEnabled(bool $internalOnly, string $isEnabled, bool $expected): void {
-		$this->gsConfig->expects($this->once())->method('onlyInternalFederation')
-			->willReturn($internalOnly);
-		$this->config->expects($this->any())->method('getAppValue')
-			->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes')
-			->willReturn($isEnabled);
-
-		$this->assertSame($expected,
-			$this->provider->isOutgoingServer2serverShareEnabled()
-		);
-	}
-
-	public static function dataTestIsOutgoingServer2serverShareEnabled(): array {
-		return [
-			[false, 'yes', true],
-			[false, 'no', false],
-			[true, 'yes', false],
-			[true, 'no', false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsIncomingServer2serverShareEnabled')]
-	public function testIsIncomingServer2serverShareEnabled(bool $onlyInternal, string $isEnabled, bool $expected): void {
-		$this->gsConfig->expects($this->once())->method('onlyInternalFederation')
-			->willReturn($onlyInternal);
-		$this->config->expects($this->any())->method('getAppValue')
-			->with('files_sharing', 'incoming_server2server_share_enabled', 'yes')
-			->willReturn($isEnabled);
-
-		$this->assertSame($expected,
-			$this->provider->isIncomingServer2serverShareEnabled()
-		);
-	}
-
-	public static function dataTestIsIncomingServer2serverShareEnabled(): array {
-		return [
-			[false, 'yes', true],
-			[false, 'no', false],
-			[true, 'yes', false],
-			[true, 'no', false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsLookupServerQueriesEnabled')]
-	public function testIsLookupServerQueriesEnabled(bool $gsEnabled, string $isEnabled, bool $expected): void {
-		$this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled')
-			->willReturn($gsEnabled);
-		$this->config->expects($this->any())->method('getAppValue')
-			->with('files_sharing', 'lookupServerEnabled', 'no')
-			->willReturn($isEnabled);
-
-		$this->assertSame($expected,
-			$this->provider->isLookupServerQueriesEnabled()
-		);
-	}
-
-
-	public static function dataTestIsLookupServerQueriesEnabled(): array {
-		return [
-			[true, 'yes', true],
-			[true, 'no', true],
-			// TODO: reenable if we use the lookup server for non-global scale
-			// [false, 'yes', true],
-			// [false, 'no', false],
-			[false, 'no', false],
-			[false, 'yes', false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsLookupServerUploadEnabled')]
-	public function testIsLookupServerUploadEnabled(bool $gsEnabled, string $isEnabled, bool $expected): void {
-		$this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled')
-			->willReturn($gsEnabled);
-		$this->config->expects($this->any())->method('getAppValue')
-			->with('files_sharing', 'lookupServerUploadEnabled', 'no')
-			->willReturn($isEnabled);
-
-		$this->assertSame($expected,
-			$this->provider->isLookupServerUploadEnabled()
-		);
-	}
-
-	public static function dataTestIsLookupServerUploadEnabled(): array {
-		return [
-			[true, 'yes', false],
-			[true, 'no', false],
-			// TODO: reenable if we use the lookup server again
-			// [false, 'yes', true],
-			// [false, 'no', false],
-			[false, 'yes', false],
-			[false, 'no', false],
-		];
-	}
-
-	public function testGetSharesInFolder(): void {
-		$userManager = Server::get(IUserManager::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
-
-		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
-		$file1 = $folder1->newFile('bar1');
-		$file2 = $folder1->newFile('bar2');
-
-		$this->tokenHandler->method('generateToken')->willReturn('token');
-		$this->notifications
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$share1 = $this->shareManager->newShare();
-		$share1->setSharedWith('user@server.com')
-			->setSharedBy($u1->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($file1);
-		$this->provider->create($share1);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('user@server.com')
-			->setSharedBy($u2->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($file2);
-		$this->provider->create($share2);
-
-		$result = $this->provider->getSharesInFolder($u1->getUID(), $folder1, false);
-		$this->assertCount(1, $result);
-		$this->assertCount(1, $result[$file1->getId()]);
-
-		$result = $this->provider->getSharesInFolder($u1->getUID(), $folder1, true);
-		$this->assertCount(2, $result);
-		$this->assertCount(1, $result[$file1->getId()]);
-		$this->assertCount(1, $result[$file2->getId()]);
-
-		$u1->delete();
-		$u2->delete();
-	}
-
-	public function testGetAccessList(): void {
-		$userManager = Server::get(IUserManager::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-
-		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
-		$file1 = $folder1->newFile('bar1');
-
-		$this->tokenHandler->expects($this->exactly(2))
-			->method('generateToken')
-			->willReturnOnConsecutiveCalls('token1', 'token2');
-		$this->notifications->expects($this->atLeastOnce())
-			->method('sendRemoteShare')
-			->willReturn(true);
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturn([]);
-
-		$result = $this->provider->getAccessList([$file1], true);
-		$this->assertEquals(['remote' => []], $result);
-
-		$result = $this->provider->getAccessList([$file1], false);
-		$this->assertEquals(['remote' => false], $result);
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('remoteurl.com');
-
-		$share1 = $this->shareManager->newShare();
-		$share1->setSharedWith('user@server.com')
-			->setSharedBy($u1->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($file1);
-		$this->provider->create($share1);
-
-		$share2 = $this->shareManager->newShare();
-		$share2->setSharedWith('foobar@localhost')
-			->setSharedBy($u1->getUID())
-			->setShareOwner($u1->getUID())
-			->setPermissions(Constants::PERMISSION_READ)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($file1);
-		$this->provider->create($share2);
-
-		$result = $this->provider->getAccessList([$file1], true);
-		$this->assertEquals(['remote' => [
-			'user@server.com' => [
-				'token' => 'token1',
-				'node_id' => $file1->getId(),
-			],
-			'foobar@localhost' => [
-				'token' => 'token2',
-				'node_id' => $file1->getId(),
-			],
-		]], $result);
-
-		$result = $this->provider->getAccessList([$file1], false);
-		$this->assertEquals(['remote' => true], $result);
-
-		$u1->delete();
-	}
+    protected IDBConnection $connection;
+    protected AddressHandler&MockObject $addressHandler;
+    protected Notifications&MockObject $notifications;
+    protected TokenHandler&MockObject $tokenHandler;
+    protected IL10N $l;
+    protected LoggerInterface $logger;
+    protected IRootFolder&MockObject $rootFolder;
+    protected IConfig&MockObject $config;
+    protected IUserManager&MockObject $userManager;
+    protected \OCP\GlobalScale\IConfig&MockObject $gsConfig;
+    protected IManager $shareManager;
+    protected FederatedShareProvider $provider;
+    protected IContactsManager&MockObject $contactsManager;
+    private ICloudIdManager $cloudIdManager;
+    private ICloudFederationProviderManager&MockObject $cloudFederationProviderManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->notifications = $this->createMock(Notifications::class);
+        $this->tokenHandler = $this->createMock(TokenHandler::class);
+        $this->l = $this->createMock(IL10N::class);
+        $this->l->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        //$this->addressHandler = new AddressHandler(\OC::$server->getURLGenerator(), $this->l);
+        $this->addressHandler = $this->createMock(AddressHandler::class);
+        $this->contactsManager = $this->createMock(IContactsManager::class);
+        $this->cloudIdManager = new CloudIdManager(
+            $this->createMock(ICacheFactory::class),
+            $this->createMock(IEventDispatcher::class),
+            $this->contactsManager,
+            $this->createMock(IURLGenerator::class),
+            $this->userManager,
+        );
+        $this->gsConfig = $this->createMock(\OCP\GlobalScale\IConfig::class);
+
+        $this->userManager->expects($this->any())->method('userExists')->willReturn(true);
+
+        $this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
+
+        $this->provider = new FederatedShareProvider(
+            $this->connection,
+            $this->addressHandler,
+            $this->notifications,
+            $this->tokenHandler,
+            $this->l,
+            $this->rootFolder,
+            $this->config,
+            $this->userManager,
+            $this->cloudIdManager,
+            $this->gsConfig,
+            $this->cloudFederationProviderManager,
+            $this->logger,
+        );
+
+        $this->shareManager = Server::get(IManager::class);
+    }
+
+    protected function tearDown(): void {
+        $this->connection->getQueryBuilder()->delete('share')->executeStatement();
+
+        parent::tearDown();
+    }
+
+    public static function dataTestCreate(): array {
+        return [
+            [null, null],
+            [new \DateTime('2020-03-01T01:02:03'), '2020-03-01 01:02:03'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCreate')]
+    public function testCreate(?\DateTime $expirationDate, ?string $expectedDataDate): void {
+        $share = $this->shareManager->newShare();
+
+        /** @var File&MockObject $node */
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setExpirationDate($expirationDate)
+            ->setNode($node);
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+
+        $this->addressHandler->expects($this->any())->method('generateRemoteURL')
+            ->willReturn('http://localhost/');
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturn(['user', 'server.com']);
+
+        $this->notifications->expects($this->once())
+            ->method('sendRemoteShare')
+            ->with(
+                $this->equalTo('token'),
+                $this->equalTo('user@server.com'),
+                $this->equalTo('myFile'),
+                $this->anything(),
+                'shareOwner',
+                'shareOwner@http://localhost',
+                'sharedBy',
+                'sharedBy@http://localhost'
+            )
+            ->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->provider->create($share);
+
+        $qb = $this->connection->getQueryBuilder();
+        $stmt = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->executeQuery();
+
+        $data = $stmt->fetchAssociative();
+        $stmt->closeCursor();
+
+        $expected = [
+            'share_type' => IShare::TYPE_REMOTE,
+            'share_with' => 'user@server.com',
+            'uid_owner' => 'shareOwner',
+            'uid_initiator' => 'sharedBy',
+            'item_type' => 'file',
+            'item_source' => 42,
+            'file_source' => 42,
+            'permissions' => 19,
+            'accepted' => 0,
+            'token' => 'token',
+            'expiration' => $expectedDataDate,
+        ];
+        foreach (array_keys($expected) as $key) {
+            $this->assertEquals($expected[$key], $data[$key], "Assert that value for key '$key' is the same");
+        }
+
+        $this->assertEquals($data['id'], $share->getId());
+        $this->assertEquals(IShare::TYPE_REMOTE, $share->getShareType());
+        $this->assertEquals('user@server.com', $share->getSharedWith());
+        $this->assertEquals('sharedBy', $share->getSharedBy());
+        $this->assertEquals('shareOwner', $share->getShareOwner());
+        $this->assertEquals('file', $share->getNodeType());
+        $this->assertEquals(42, $share->getNodeId());
+        $this->assertEquals(19, $share->getPermissions());
+        $this->assertEquals('token', $share->getToken());
+        $this->assertEquals($expirationDate, $share->getExpirationDate());
+    }
+
+    public function testCreateCouldNotFindServer(): void {
+        $share = $this->shareManager->newShare();
+
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+
+        $this->addressHandler->expects($this->any())->method('generateRemoteURL')
+            ->willReturn('http://localhost/');
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturn(['user', 'server.com']);
+
+        $this->notifications->expects($this->once())
+            ->method('sendRemoteShare')
+            ->with(
+                $this->equalTo('token'),
+                $this->equalTo('user@server.com'),
+                $this->equalTo('myFile'),
+                $this->anything(),
+                'shareOwner',
+                'shareOwner@http://localhost',
+                'sharedBy',
+                'sharedBy@http://localhost'
+            )->willReturn(false);
+
+        $this->rootFolder->method('getById')
+            ->with('42')
+            ->willReturn([$node]);
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        try {
+            $share = $this->provider->create($share);
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $stmt = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->executeQuery();
+
+        $data = $stmt->fetchAssociative();
+        $stmt->closeCursor();
+
+        $this->assertFalse($data);
+    }
+
+    public function testCreateException(): void {
+        $share = $this->shareManager->newShare();
+
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+
+        $this->addressHandler->expects($this->any())->method('generateRemoteURL')
+            ->willReturn('http://localhost/');
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturn(['user', 'server.com']);
+
+        $this->notifications->expects($this->once())
+            ->method('sendRemoteShare')
+            ->with(
+                $this->equalTo('token'),
+                $this->equalTo('user@server.com'),
+                $this->equalTo('myFile'),
+                $this->anything(),
+                'shareOwner',
+                'shareOwner@http://localhost',
+                'sharedBy',
+                'sharedBy@http://localhost'
+            )->willThrowException(new \Exception('dummy'));
+
+        $this->rootFolder->method('getById')
+            ->with('42')
+            ->willReturn([$node]);
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        try {
+            $share = $this->provider->create($share);
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('Sharing myFile failed, could not find user@server.com, maybe the server is currently unreachable or uses a self-signed certificate.', $e->getMessage());
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $stmt = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->executeQuery();
+
+        $data = $stmt->fetchAssociative();
+        $stmt->closeCursor();
+
+        $this->assertFalse($data);
+    }
+
+    public function testCreateShareWithSelf(): void {
+        $share = $this->shareManager->newShare();
+
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->addressHandler->expects($this->any())->method('compareAddresses')
+            ->willReturn(true);
+
+        $shareWith = 'sharedBy@localhost';
+
+        $share->setSharedWith($shareWith)
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setNode($node);
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        try {
+            $share = $this->provider->create($share);
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('Not allowed to create a federated share to the same account', $e->getMessage());
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $stmt = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->executeQuery();
+
+        $data = $stmt->fetchAssociative();
+        $stmt->closeCursor();
+
+        $this->assertFalse($data);
+    }
+
+    public function testCreateAlreadyShared(): void {
+        $share = $this->shareManager->newShare();
+
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturn(['user', 'server.com']);
+
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+
+        $this->addressHandler->expects($this->any())->method('generateRemoteURL')
+            ->willReturn('http://localhost/');
+
+        $this->notifications->expects($this->once())
+            ->method('sendRemoteShare')
+            ->with(
+                $this->equalTo('token'),
+                $this->equalTo('user@server.com'),
+                $this->equalTo('myFile'),
+                $this->anything(),
+                'shareOwner',
+                'shareOwner@http://localhost',
+                'sharedBy',
+                'sharedBy@http://localhost'
+            )->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $this->provider->create($share);
+
+        try {
+            $this->provider->create($share);
+        } catch (\Exception $e) {
+            $this->assertEquals('Sharing myFile failed, because this item is already shared with the account user@server.com', $e->getMessage());
+        }
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdate')]
+    public function testUpdate(string $owner, string $sharedBy, ?\DateTime $expirationDate): void {
+        $this->provider = $this->getMockBuilder(FederatedShareProvider::class)
+            ->setConstructorArgs(
+                [
+                    $this->connection,
+                    $this->addressHandler,
+                    $this->notifications,
+                    $this->tokenHandler,
+                    $this->l,
+                    $this->rootFolder,
+                    $this->config,
+                    $this->userManager,
+                    $this->cloudIdManager,
+                    $this->gsConfig,
+                    $this->cloudFederationProviderManager,
+                    $this->logger,
+                ]
+            )
+            ->onlyMethods(['sendPermissionUpdate'])
+            ->getMock();
+
+        $share = $this->shareManager->newShare();
+
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturn(['user', 'server.com']);
+
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy($sharedBy)
+            ->setShareOwner($owner)
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setExpirationDate(new \DateTime('2019-02-01T01:02:03'))
+            ->setNode($node);
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->addressHandler->expects($this->any())->method('generateRemoteURL')
+            ->willReturn('http://localhost/');
+
+        $this->notifications->expects($this->once())
+            ->method('sendRemoteShare')
+            ->with(
+                $this->equalTo('token'),
+                $this->equalTo('user@server.com'),
+                $this->equalTo('myFile'),
+                $this->anything(),
+                $owner,
+                $owner . '@http://localhost',
+                $sharedBy,
+                $sharedBy . '@http://localhost'
+            )->willReturn(true);
+
+        if ($owner === $sharedBy) {
+            $this->provider->expects($this->never())->method('sendPermissionUpdate');
+        } else {
+            $this->provider->expects($this->once())->method('sendPermissionUpdate');
+        }
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->provider->create($share);
+
+        $share->setPermissions(1);
+        $share->setExpirationDate($expirationDate);
+        $this->provider->update($share);
+
+        $share = $this->provider->getShareById($share->getId());
+
+        $this->assertEquals(1, $share->getPermissions());
+        $this->assertEquals($expirationDate, $share->getExpirationDate());
+    }
+
+    public static function dataTestUpdate(): array {
+        return [
+            ['sharedBy', 'shareOwner', new \DateTime('2020-03-01T01:02:03')],
+            ['shareOwner', 'shareOwner', null],
+        ];
+    }
+
+    public function testGetSharedBy(): void {
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->addressHandler->expects($this->never())->method('splitUserRemote');
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->notifications
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->shareManager->newShare();
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user2@server.com')
+            ->setSharedBy('sharedBy2')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share2);
+
+        $shares = $this->provider->getSharesBy('sharedBy', IShare::TYPE_REMOTE, null, false, -1, 0);
+
+        $this->assertCount(1, $shares);
+        $this->assertEquals('user@server.com', $shares[0]->getSharedWith());
+        $this->assertEquals('sharedBy', $shares[0]->getSharedBy());
+    }
+
+    public function testGetSharedByWithNode(): void {
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->notifications
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->shareManager->newShare();
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share);
+
+        $node2 = $this->getMockBuilder(File::class)->getMock();
+        $node2->method('getId')->willReturn(43);
+        $node2->method('getName')->willReturn('myOtherFile');
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node2);
+        $this->provider->create($share2);
+
+        $shares = $this->provider->getSharesBy('sharedBy', IShare::TYPE_REMOTE, $node2, false, -1, 0);
+
+        $this->assertCount(1, $shares);
+        $this->assertEquals(43, $shares[0]->getNodeId());
+    }
+
+    public function testGetSharedByWithReshares(): void {
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->notifications
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->shareManager->newShare();
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('shareOwner')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user2@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share2);
+
+        $shares = $this->provider->getSharesBy('shareOwner', IShare::TYPE_REMOTE, null, true, -1, 0);
+
+        $this->assertCount(2, $shares);
+    }
+
+    public function testGetSharedByWithLimit(): void {
+        $node = $this->createMock(File::class);
+        $node->method('getId')->willReturn(42);
+        $node->method('getName')->willReturn('myFile');
+
+        $this->addressHandler->expects($this->any())->method('splitUserRemote')
+            ->willReturnCallback(function ($uid) {
+                if ($uid === 'user@server.com') {
+                    return ['user', 'server.com'];
+                }
+                return ['user2', 'server.com'];
+            });
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->notifications
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->rootFolder->expects($this->never())->method($this->anything());
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share = $this->shareManager->newShare();
+        $share->setSharedWith('user@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user2@server.com')
+            ->setSharedBy('sharedBy')
+            ->setShareOwner('shareOwner')
+            ->setPermissions(19)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($node);
+        $this->provider->create($share2);
+
+        $shares = $this->provider->getSharesBy('shareOwner', IShare::TYPE_REMOTE, null, true, 1, 1);
+
+        $this->assertCount(1, $shares);
+        $this->assertEquals('user2@server.com', $shares[0]->getSharedWith());
+    }
+
+    public static function dataDeleteUser(): array {
+        return [
+            ['a', 'b', 'c', 'a', true],
+            ['a', 'b', 'c', 'b', false],
+            // The recipient is non local.
+            ['a', 'b', 'c', 'c', false],
+            ['a', 'b', 'c', 'd', false],
+        ];
+    }
+
+    /**
+     *
+     * @param string $owner The owner of the share (uid)
+     * @param string $initiator The initiator of the share (uid)
+     * @param string $recipient The recipient of the share (uid/gid/pass)
+     * @param string $deletedUser The user that is deleted
+     * @param bool $rowDeleted Is the row deleted in this setup
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataDeleteUser')]
+    public function testDeleteUser(string $owner, string $initiator, string $recipient, string $deletedUser, bool $rowDeleted): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE))
+            ->setValue('uid_owner', $qb->createNamedParameter($owner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($initiator))
+            ->setValue('share_with', $qb->createNamedParameter($recipient))
+            ->setValue('item_type', $qb->createNamedParameter('file'))
+            ->setValue('item_source', $qb->createNamedParameter(42))
+            ->setValue('file_source', $qb->createNamedParameter(42))
+            ->executeStatement();
+
+        $id = $qb->getLastInsertId();
+
+        $this->provider->userDeleted($deletedUser, IShare::TYPE_REMOTE);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($id))
+            );
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetchAllAssociative();
+        $cursor->closeCursor();
+
+        $this->assertCount($rowDeleted ? 0 : 1, $data);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsOutgoingServer2serverShareEnabled')]
+    public function testIsOutgoingServer2serverShareEnabled(bool $internalOnly, string $isEnabled, bool $expected): void {
+        $this->gsConfig->expects($this->once())->method('onlyInternalFederation')
+            ->willReturn($internalOnly);
+        $this->config->expects($this->any())->method('getAppValue')
+            ->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes')
+            ->willReturn($isEnabled);
+
+        $this->assertSame($expected,
+            $this->provider->isOutgoingServer2serverShareEnabled()
+        );
+    }
+
+    public static function dataTestIsOutgoingServer2serverShareEnabled(): array {
+        return [
+            [false, 'yes', true],
+            [false, 'no', false],
+            [true, 'yes', false],
+            [true, 'no', false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsIncomingServer2serverShareEnabled')]
+    public function testIsIncomingServer2serverShareEnabled(bool $onlyInternal, string $isEnabled, bool $expected): void {
+        $this->gsConfig->expects($this->once())->method('onlyInternalFederation')
+            ->willReturn($onlyInternal);
+        $this->config->expects($this->any())->method('getAppValue')
+            ->with('files_sharing', 'incoming_server2server_share_enabled', 'yes')
+            ->willReturn($isEnabled);
+
+        $this->assertSame($expected,
+            $this->provider->isIncomingServer2serverShareEnabled()
+        );
+    }
+
+    public static function dataTestIsIncomingServer2serverShareEnabled(): array {
+        return [
+            [false, 'yes', true],
+            [false, 'no', false],
+            [true, 'yes', false],
+            [true, 'no', false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsLookupServerQueriesEnabled')]
+    public function testIsLookupServerQueriesEnabled(bool $gsEnabled, string $isEnabled, bool $expected): void {
+        $this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled')
+            ->willReturn($gsEnabled);
+        $this->config->expects($this->any())->method('getAppValue')
+            ->with('files_sharing', 'lookupServerEnabled', 'no')
+            ->willReturn($isEnabled);
+
+        $this->assertSame($expected,
+            $this->provider->isLookupServerQueriesEnabled()
+        );
+    }
+
+
+    public static function dataTestIsLookupServerQueriesEnabled(): array {
+        return [
+            [true, 'yes', true],
+            [true, 'no', true],
+            // TODO: reenable if we use the lookup server for non-global scale
+            // [false, 'yes', true],
+            // [false, 'no', false],
+            [false, 'no', false],
+            [false, 'yes', false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsLookupServerUploadEnabled')]
+    public function testIsLookupServerUploadEnabled(bool $gsEnabled, string $isEnabled, bool $expected): void {
+        $this->gsConfig->expects($this->once())->method('isGlobalScaleEnabled')
+            ->willReturn($gsEnabled);
+        $this->config->expects($this->any())->method('getAppValue')
+            ->with('files_sharing', 'lookupServerUploadEnabled', 'no')
+            ->willReturn($isEnabled);
+
+        $this->assertSame($expected,
+            $this->provider->isLookupServerUploadEnabled()
+        );
+    }
+
+    public static function dataTestIsLookupServerUploadEnabled(): array {
+        return [
+            [true, 'yes', false],
+            [true, 'no', false],
+            // TODO: reenable if we use the lookup server again
+            // [false, 'yes', true],
+            // [false, 'no', false],
+            [false, 'yes', false],
+            [false, 'no', false],
+        ];
+    }
+
+    public function testGetSharesInFolder(): void {
+        $userManager = Server::get(IUserManager::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $u1 = $userManager->createUser('testFed', md5((string)time()));
+        $u2 = $userManager->createUser('testFed2', md5((string)time()));
+
+        $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
+        $file1 = $folder1->newFile('bar1');
+        $file2 = $folder1->newFile('bar2');
+
+        $this->tokenHandler->method('generateToken')->willReturn('token');
+        $this->notifications
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $share1 = $this->shareManager->newShare();
+        $share1->setSharedWith('user@server.com')
+            ->setSharedBy($u1->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($file1);
+        $this->provider->create($share1);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('user@server.com')
+            ->setSharedBy($u2->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($file2);
+        $this->provider->create($share2);
+
+        $result = $this->provider->getSharesInFolder($u1->getUID(), $folder1, false);
+        $this->assertCount(1, $result);
+        $this->assertCount(1, $result[$file1->getId()]);
+
+        $result = $this->provider->getSharesInFolder($u1->getUID(), $folder1, true);
+        $this->assertCount(2, $result);
+        $this->assertCount(1, $result[$file1->getId()]);
+        $this->assertCount(1, $result[$file2->getId()]);
+
+        $u1->delete();
+        $u2->delete();
+    }
+
+    public function testGetAccessList(): void {
+        $userManager = Server::get(IUserManager::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $u1 = $userManager->createUser('testFed', md5((string)time()));
+
+        $folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
+        $file1 = $folder1->newFile('bar1');
+
+        $this->tokenHandler->expects($this->exactly(2))
+            ->method('generateToken')
+            ->willReturnOnConsecutiveCalls('token1', 'token2');
+        $this->notifications->expects($this->atLeastOnce())
+            ->method('sendRemoteShare')
+            ->willReturn(true);
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturn([]);
+
+        $result = $this->provider->getAccessList([$file1], true);
+        $this->assertEquals(['remote' => []], $result);
+
+        $result = $this->provider->getAccessList([$file1], false);
+        $this->assertEquals(['remote' => false], $result);
+
+        $this->addressHandler->method('generateRemoteURL')
+            ->willReturn('remoteurl.com');
+
+        $share1 = $this->shareManager->newShare();
+        $share1->setSharedWith('user@server.com')
+            ->setSharedBy($u1->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($file1);
+        $this->provider->create($share1);
+
+        $share2 = $this->shareManager->newShare();
+        $share2->setSharedWith('foobar@localhost')
+            ->setSharedBy($u1->getUID())
+            ->setShareOwner($u1->getUID())
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setShareType(IShare::TYPE_REMOTE)
+            ->setNode($file1);
+        $this->provider->create($share2);
+
+        $result = $this->provider->getAccessList([$file1], true);
+        $this->assertEquals(['remote' => [
+            'user@server.com' => [
+                'token' => 'token1',
+                'node_id' => $file1->getId(),
+            ],
+            'foobar@localhost' => [
+                'token' => 'token2',
+                'node_id' => $file1->getId(),
+            ],
+        ]], $result);
+
+        $result = $this->provider->getAccessList([$file1], false);
+        $this->assertEquals(['remote' => true], $result);
+
+        $u1->delete();
+    }
 }

apps/federatedfilesharing/lib/FederatedShareProvider.php

Indentation +1041 added lines, -1041 removed lines

@@ -35,1055 +35,1055 @@
  * @package OCA\FederatedFileSharing
  */
 class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAllSharesInFolder {
-	public const SHARE_TYPE_REMOTE = 6;
-
-	/** @var string */
-	private $externalShareTable = 'share_external';
-
-	/** @var array list of supported share types */
-	private $supportedShareType = [IShare::TYPE_REMOTE_GROUP, IShare::TYPE_REMOTE, IShare::TYPE_CIRCLE];
-
-	/**
-	 * DefaultShareProvider constructor.
-	 */
-	public function __construct(
-		private IDBConnection $dbConnection,
-		private AddressHandler $addressHandler,
-		private Notifications $notifications,
-		private TokenHandler $tokenHandler,
-		private IL10N $l,
-		private IRootFolder $rootFolder,
-		private IConfig $config,
-		private IUserManager $userManager,
-		private ICloudIdManager $cloudIdManager,
-		private \OCP\GlobalScale\IConfig $gsConfig,
-		private ICloudFederationProviderManager $cloudFederationProviderManager,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocFederatedSharing';
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(IShare $share) {
-		$shareWith = $share->getSharedWith();
-		$itemSource = $share->getNodeId();
-		$itemType = $share->getNodeType();
-		$permissions = $share->getPermissions();
-		$sharedBy = $share->getSharedBy();
-		$shareType = $share->getShareType();
-		$expirationDate = $share->getExpirationDate();
-
-		if ($shareType === IShare::TYPE_REMOTE_GROUP
-			&& !$this->isOutgoingServer2serverGroupShareEnabled()
-		) {
-			$message = 'It is not allowed to send federated group shares from this server.';
-			$message_t = $this->l->t('It is not allowed to send federated group shares from this server.');
-			$this->logger->debug($message, ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		/*
+    public const SHARE_TYPE_REMOTE = 6;
+
+    /** @var string */
+    private $externalShareTable = 'share_external';
+
+    /** @var array list of supported share types */
+    private $supportedShareType = [IShare::TYPE_REMOTE_GROUP, IShare::TYPE_REMOTE, IShare::TYPE_CIRCLE];
+
+    /**
+     * DefaultShareProvider constructor.
+     */
+    public function __construct(
+        private IDBConnection $dbConnection,
+        private AddressHandler $addressHandler,
+        private Notifications $notifications,
+        private TokenHandler $tokenHandler,
+        private IL10N $l,
+        private IRootFolder $rootFolder,
+        private IConfig $config,
+        private IUserManager $userManager,
+        private ICloudIdManager $cloudIdManager,
+        private \OCP\GlobalScale\IConfig $gsConfig,
+        private ICloudFederationProviderManager $cloudFederationProviderManager,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocFederatedSharing';
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(IShare $share) {
+        $shareWith = $share->getSharedWith();
+        $itemSource = $share->getNodeId();
+        $itemType = $share->getNodeType();
+        $permissions = $share->getPermissions();
+        $sharedBy = $share->getSharedBy();
+        $shareType = $share->getShareType();
+        $expirationDate = $share->getExpirationDate();
+
+        if ($shareType === IShare::TYPE_REMOTE_GROUP
+            && !$this->isOutgoingServer2serverGroupShareEnabled()
+        ) {
+            $message = 'It is not allowed to send federated group shares from this server.';
+            $message_t = $this->l->t('It is not allowed to send federated group shares from this server.');
+            $this->logger->debug($message, ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        /*
 		 * Check if file is not already shared with the remote user
 		 */
-		$alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE, $share->getNode(), 1, 0);
-		$alreadySharedGroup = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE_GROUP, $share->getNode(), 1, 0);
-		if (!empty($alreadyShared) || !empty($alreadySharedGroup)) {
-			$message = 'Sharing %1$s failed, because this item is already shared with %2$s';
-			$message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]);
-			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-
-		// don't allow federated shares if source and target server are the same
-		$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
-		$currentServer = $this->addressHandler->generateRemoteURL();
-		$currentUser = $sharedBy;
-		if ($this->addressHandler->compareAddresses($cloudId->getUser(), $cloudId->getRemote(), $currentUser, $currentServer)) {
-			$message = 'Not allowed to create a federated share to the same account.';
-			$message_t = $this->l->t('Not allowed to create a federated share to the same account');
-			$this->logger->debug($message, ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		// Federated shares always have read permissions
-		if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
-			$message = 'Federated shares require read permissions';
-			$message_t = $this->l->t('Federated shares require read permissions');
-			$this->logger->debug($message, ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		$share->setSharedWith($cloudId->getId());
-
-		try {
-			$remoteShare = $this->getShareFromExternalShareTable($share);
-		} catch (ShareNotFound $e) {
-			$remoteShare = null;
-		}
-
-		if ($remoteShare) {
-			try {
-				$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
-				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType, $expirationDate);
-				$share->setId($shareId);
-				[$token, $remoteId] = $this->askOwnerToReShare($shareWith, $share, $shareId);
-				// remote share was create successfully if we get a valid token as return
-				$send = is_string($token) && $token !== '';
-			} catch (\Exception $e) {
-				// fall back to old re-share behavior if the remote server
-				// doesn't support flat re-shares (was introduced with Nextcloud 9.1)
-				$this->removeShareFromTable($share);
-				$shareId = $this->createFederatedShare($share);
-			}
-			if ($send) {
-				$this->updateSuccessfulReshare($shareId, $token);
-				$this->storeRemoteId($shareId, $remoteId);
-			} else {
-				$this->removeShareFromTable($share);
-				$message_t = $this->l->t('File is already shared with %s', [$shareWith]);
-				throw new \Exception($message_t);
-			}
-		} else {
-			$shareId = $this->createFederatedShare($share);
-		}
-
-		$data = $this->getRawShare($shareId);
-		return $this->createShareObject($data);
-	}
-
-	/**
-	 * create federated share and inform the recipient
-	 *
-	 * @param IShare $share
-	 * @return int
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	protected function createFederatedShare(IShare $share) {
-		$token = $this->tokenHandler->generateToken();
-		$shareId = $this->addShareToDB(
-			$share->getNodeId(),
-			$share->getNodeType(),
-			$share->getSharedWith(),
-			$share->getSharedBy(),
-			$share->getShareOwner(),
-			$share->getPermissions(),
-			$token,
-			$share->getShareType(),
-			$share->getExpirationDate()
-		);
-
-		$failure = false;
-
-		try {
-			$sharedByFederatedId = $share->getSharedBy();
-			if ($this->userManager->userExists($sharedByFederatedId)) {
-				$cloudId = $this->cloudIdManager->getCloudId($sharedByFederatedId, $this->addressHandler->generateRemoteURL());
-				$sharedByFederatedId = $cloudId->getId();
-			}
-			$ownerCloudId = $this->cloudIdManager->getCloudId($share->getShareOwner(), $this->addressHandler->generateRemoteURL());
-			$send = $this->notifications->sendRemoteShare(
-				$token,
-				$share->getSharedWith(),
-				$share->getNode()->getName(),
-				$shareId,
-				$share->getShareOwner(),
-				$ownerCloudId->getId(),
-				$share->getSharedBy(),
-				$sharedByFederatedId,
-				$share->getShareType()
-			);
-
-			if ($send === false) {
-				$failure = true;
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('Failed to notify remote server of federated share, removing share.', [
-				'app' => 'federatedfilesharing',
-				'exception' => $e,
-			]);
-			$failure = true;
-		}
-
-		if ($failure) {
-			$this->removeShareFromTableById($shareId);
-			$message_t = $this->l->t('Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate.',
-				[$share->getNode()->getName(), $share->getSharedWith()]);
-			throw new \Exception($message_t);
-		}
-
-		return $shareId;
-	}
-
-	/**
-	 * @param string $shareWith
-	 * @param IShare $share
-	 * @param string $shareId internal share Id
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function askOwnerToReShare($shareWith, IShare $share, $shareId) {
-		$remoteShare = $this->getShareFromExternalShareTable($share);
-		$token = $remoteShare['share_token'];
-		$remoteId = $remoteShare['remote_id'];
-		$remote = $remoteShare['remote'];
-
-		[$token, $remoteId] = $this->notifications->requestReShare(
-			$token,
-			$remoteId,
-			$shareId,
-			$remote,
-			$shareWith,
-			$share->getPermissions(),
-			$share->getNode()->getName(),
-			$share->getShareType(),
-		);
-
-		return [$token, $remoteId];
-	}
-
-	/**
-	 * get federated share from the share_external table but exclude mounted link shares
-	 *
-	 * @param IShare $share
-	 * @return array
-	 * @throws ShareNotFound
-	 */
-	protected function getShareFromExternalShareTable(IShare $share) {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('*')->from($this->externalShareTable)
-			->where($query->expr()->eq('user', $query->createNamedParameter($share->getShareOwner())))
-			->andWhere($query->expr()->eq('mountpoint', $query->createNamedParameter($share->getTarget())));
-		$qResult = $query->executeQuery();
-		$result = $qResult->fetchAllAssociative();
-		$qResult->closeCursor();
-
-		if (isset($result[0]) && (int)$result[0]['remote_id'] > 0) {
-			return $result[0];
-		}
-
-		throw new ShareNotFound('share not found in share_external table');
-	}
-
-	/**
-	 * add share to the database and return the ID
-	 *
-	 * @param int $itemSource
-	 * @param string $itemType
-	 * @param string $shareWith
-	 * @param string $sharedBy
-	 * @param string $uidOwner
-	 * @param int $permissions
-	 * @param string $token
-	 * @param int $shareType
-	 * @param \DateTime $expirationDate
-	 * @return int
-	 */
-	private function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $shareType, $expirationDate) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter($shareType))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('stime', $qb->createNamedParameter(time()));
-
-		/*
+        $alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE, $share->getNode(), 1, 0);
+        $alreadySharedGroup = $this->getSharedWith($shareWith, IShare::TYPE_REMOTE_GROUP, $share->getNode(), 1, 0);
+        if (!empty($alreadyShared) || !empty($alreadySharedGroup)) {
+            $message = 'Sharing %1$s failed, because this item is already shared with %2$s';
+            $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]);
+            $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+
+        // don't allow federated shares if source and target server are the same
+        $cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
+        $currentServer = $this->addressHandler->generateRemoteURL();
+        $currentUser = $sharedBy;
+        if ($this->addressHandler->compareAddresses($cloudId->getUser(), $cloudId->getRemote(), $currentUser, $currentServer)) {
+            $message = 'Not allowed to create a federated share to the same account.';
+            $message_t = $this->l->t('Not allowed to create a federated share to the same account');
+            $this->logger->debug($message, ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        // Federated shares always have read permissions
+        if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
+            $message = 'Federated shares require read permissions';
+            $message_t = $this->l->t('Federated shares require read permissions');
+            $this->logger->debug($message, ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        $share->setSharedWith($cloudId->getId());
+
+        try {
+            $remoteShare = $this->getShareFromExternalShareTable($share);
+        } catch (ShareNotFound $e) {
+            $remoteShare = null;
+        }
+
+        if ($remoteShare) {
+            try {
+                $ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
+                $shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType, $expirationDate);
+                $share->setId($shareId);
+                [$token, $remoteId] = $this->askOwnerToReShare($shareWith, $share, $shareId);
+                // remote share was create successfully if we get a valid token as return
+                $send = is_string($token) && $token !== '';
+            } catch (\Exception $e) {
+                // fall back to old re-share behavior if the remote server
+                // doesn't support flat re-shares (was introduced with Nextcloud 9.1)
+                $this->removeShareFromTable($share);
+                $shareId = $this->createFederatedShare($share);
+            }
+            if ($send) {
+                $this->updateSuccessfulReshare($shareId, $token);
+                $this->storeRemoteId($shareId, $remoteId);
+            } else {
+                $this->removeShareFromTable($share);
+                $message_t = $this->l->t('File is already shared with %s', [$shareWith]);
+                throw new \Exception($message_t);
+            }
+        } else {
+            $shareId = $this->createFederatedShare($share);
+        }
+
+        $data = $this->getRawShare($shareId);
+        return $this->createShareObject($data);
+    }
+
+    /**
+     * create federated share and inform the recipient
+     *
+     * @param IShare $share
+     * @return int
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    protected function createFederatedShare(IShare $share) {
+        $token = $this->tokenHandler->generateToken();
+        $shareId = $this->addShareToDB(
+            $share->getNodeId(),
+            $share->getNodeType(),
+            $share->getSharedWith(),
+            $share->getSharedBy(),
+            $share->getShareOwner(),
+            $share->getPermissions(),
+            $token,
+            $share->getShareType(),
+            $share->getExpirationDate()
+        );
+
+        $failure = false;
+
+        try {
+            $sharedByFederatedId = $share->getSharedBy();
+            if ($this->userManager->userExists($sharedByFederatedId)) {
+                $cloudId = $this->cloudIdManager->getCloudId($sharedByFederatedId, $this->addressHandler->generateRemoteURL());
+                $sharedByFederatedId = $cloudId->getId();
+            }
+            $ownerCloudId = $this->cloudIdManager->getCloudId($share->getShareOwner(), $this->addressHandler->generateRemoteURL());
+            $send = $this->notifications->sendRemoteShare(
+                $token,
+                $share->getSharedWith(),
+                $share->getNode()->getName(),
+                $shareId,
+                $share->getShareOwner(),
+                $ownerCloudId->getId(),
+                $share->getSharedBy(),
+                $sharedByFederatedId,
+                $share->getShareType()
+            );
+
+            if ($send === false) {
+                $failure = true;
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('Failed to notify remote server of federated share, removing share.', [
+                'app' => 'federatedfilesharing',
+                'exception' => $e,
+            ]);
+            $failure = true;
+        }
+
+        if ($failure) {
+            $this->removeShareFromTableById($shareId);
+            $message_t = $this->l->t('Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate.',
+                [$share->getNode()->getName(), $share->getSharedWith()]);
+            throw new \Exception($message_t);
+        }
+
+        return $shareId;
+    }
+
+    /**
+     * @param string $shareWith
+     * @param IShare $share
+     * @param string $shareId internal share Id
+     * @return array
+     * @throws \Exception
+     */
+    protected function askOwnerToReShare($shareWith, IShare $share, $shareId) {
+        $remoteShare = $this->getShareFromExternalShareTable($share);
+        $token = $remoteShare['share_token'];
+        $remoteId = $remoteShare['remote_id'];
+        $remote = $remoteShare['remote'];
+
+        [$token, $remoteId] = $this->notifications->requestReShare(
+            $token,
+            $remoteId,
+            $shareId,
+            $remote,
+            $shareWith,
+            $share->getPermissions(),
+            $share->getNode()->getName(),
+            $share->getShareType(),
+        );
+
+        return [$token, $remoteId];
+    }
+
+    /**
+     * get federated share from the share_external table but exclude mounted link shares
+     *
+     * @param IShare $share
+     * @return array
+     * @throws ShareNotFound
+     */
+    protected function getShareFromExternalShareTable(IShare $share) {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('*')->from($this->externalShareTable)
+            ->where($query->expr()->eq('user', $query->createNamedParameter($share->getShareOwner())))
+            ->andWhere($query->expr()->eq('mountpoint', $query->createNamedParameter($share->getTarget())));
+        $qResult = $query->executeQuery();
+        $result = $qResult->fetchAllAssociative();
+        $qResult->closeCursor();
+
+        if (isset($result[0]) && (int)$result[0]['remote_id'] > 0) {
+            return $result[0];
+        }
+
+        throw new ShareNotFound('share not found in share_external table');
+    }
+
+    /**
+     * add share to the database and return the ID
+     *
+     * @param int $itemSource
+     * @param string $itemType
+     * @param string $shareWith
+     * @param string $sharedBy
+     * @param string $uidOwner
+     * @param int $permissions
+     * @param string $token
+     * @param int $shareType
+     * @param \DateTime $expirationDate
+     * @return int
+     */
+    private function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $shareType, $expirationDate) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter($shareType))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('stime', $qb->createNamedParameter(time()));
+
+        /*
 		 * Added to fix https://github.com/owncloud/core/issues/22215
 		 * Can be removed once we get rid of ajax/share.php
 		 */
-		$qb->setValue('file_target', $qb->createNamedParameter(''));
-
-		$qb->executeStatement();
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 */
-	public function update(IShare $share) {
-		/*
+        $qb->setValue('file_target', $qb->createNamedParameter(''));
+
+        $qb->executeStatement();
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     */
+    public function update(IShare $share) {
+        /*
 		 * We allow updating the permissions of federated shares
 		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
-			->executeStatement();
-
-		// send the updated permission to the owner/initiator, if they are not the same
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$this->sendPermissionUpdate($share);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * send the updated permission to the owner/initiator, if they are not the same
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFound
-	 * @throws HintException
-	 */
-	protected function sendPermissionUpdate(IShare $share) {
-		$remoteId = $this->getRemoteId($share);
-		// if the local user is the owner we send the permission change to the initiator
-		if ($this->userManager->userExists($share->getShareOwner())) {
-			[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
-		} else { // ... if not we send the permission change to the owner
-			[, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
-		}
-		$this->notifications->sendPermissionChange($remote, $remoteId, $share->getToken(), $share->getPermissions());
-	}
-
-
-	/**
-	 * update successful reShare with the correct token
-	 *
-	 * @param int $shareId
-	 * @param string $token
-	 */
-	protected function updateSuccessfulReShare($shareId, $token) {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->update('share')
-			->where($query->expr()->eq('id', $query->createNamedParameter($shareId)))
-			->set('token', $query->createNamedParameter($token))
-			->executeStatement();
-	}
-
-	/**
-	 * store remote ID in federated reShare table
-	 *
-	 * @param $shareId
-	 * @param $remoteId
-	 */
-	public function storeRemoteId(int $shareId, string $remoteId): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->insert('federated_reshares')
-			->values(
-				[
-					'share_id' => $query->createNamedParameter($shareId),
-					'remote_id' => $query->createNamedParameter($remoteId),
-				]
-			);
-		$query->executeStatement();
-	}
-
-	/**
-	 * get share ID on remote server for federated re-shares
-	 *
-	 * @param IShare $share
-	 * @return string
-	 * @throws ShareNotFound
-	 */
-	public function getRemoteId(IShare $share): string {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('remote_id')->from('federated_reshares')
-			->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
-		$result = $query->executeQuery();
-		$data = $result->fetchAssociative();
-		$result->closeCursor();
-
-		if (!is_array($data) || !isset($data['remote_id'])) {
-			throw new ShareNotFound();
-		}
-
-		return (string)$data['remote_id'];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(IShare $share, $recipient) {
-		/*
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->update('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+            ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+            ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+            ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
+            ->executeStatement();
+
+        // send the updated permission to the owner/initiator, if they are not the same
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $this->sendPermissionUpdate($share);
+        }
+
+        return $share;
+    }
+
+    /**
+     * send the updated permission to the owner/initiator, if they are not the same
+     *
+     * @param IShare $share
+     * @throws ShareNotFound
+     * @throws HintException
+     */
+    protected function sendPermissionUpdate(IShare $share) {
+        $remoteId = $this->getRemoteId($share);
+        // if the local user is the owner we send the permission change to the initiator
+        if ($this->userManager->userExists($share->getShareOwner())) {
+            [, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
+        } else { // ... if not we send the permission change to the owner
+            [, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
+        }
+        $this->notifications->sendPermissionChange($remote, $remoteId, $share->getToken(), $share->getPermissions());
+    }
+
+
+    /**
+     * update successful reShare with the correct token
+     *
+     * @param int $shareId
+     * @param string $token
+     */
+    protected function updateSuccessfulReShare($shareId, $token) {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->update('share')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($shareId)))
+            ->set('token', $query->createNamedParameter($token))
+            ->executeStatement();
+    }
+
+    /**
+     * store remote ID in federated reShare table
+     *
+     * @param $shareId
+     * @param $remoteId
+     */
+    public function storeRemoteId(int $shareId, string $remoteId): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->insert('federated_reshares')
+            ->values(
+                [
+                    'share_id' => $query->createNamedParameter($shareId),
+                    'remote_id' => $query->createNamedParameter($remoteId),
+                ]
+            );
+        $query->executeStatement();
+    }
+
+    /**
+     * get share ID on remote server for federated re-shares
+     *
+     * @param IShare $share
+     * @return string
+     * @throws ShareNotFound
+     */
+    public function getRemoteId(IShare $share): string {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('remote_id')->from('federated_reshares')
+            ->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
+        $result = $query->executeQuery();
+        $data = $result->fetchAssociative();
+        $result->closeCursor();
+
+        if (!is_array($data) || !isset($data['remote_id'])) {
+            throw new ShareNotFound();
+        }
+
+        return (string)$data['remote_id'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(IShare $share, $recipient) {
+        /*
 		 * This function does nothing yet as it is just for outgoing
 		 * federated shares.
 		 */
-		return $share;
-	}
-
-	public function getChildren(IShare $parent): array {
-		$children = [];
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
-			->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetchAssociative()) {
-			$children[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Delete a share (owner unShares the file)
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFound
-	 * @throws HintException
-	 */
-	public function delete(IShare $share) {
-		[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedWith());
-
-		// if the local user is the owner we can send the unShare request directly...
-		if ($this->userManager->userExists($share->getShareOwner())) {
-			$this->notifications->sendRemoteUnShare($remote, $share->getId(), $share->getToken());
-			$this->revokeShare($share, true);
-		} else { // ... if not we need to correct ID for the unShare request
-			$remoteId = $this->getRemoteId($share);
-			$this->notifications->sendRemoteUnShare($remote, $remoteId, $share->getToken());
-			$this->revokeShare($share, false);
-		}
-
-		// only remove the share when all messages are send to not lose information
-		// about the share to early
-		$this->removeShareFromTable($share);
-	}
-
-	/**
-	 * in case of a re-share we need to send the other use (initiator or owner)
-	 * a message that the file was unshared
-	 *
-	 * @param IShare $share
-	 * @param bool $isOwner the user can either be the owner or the user who re-sahred it
-	 * @throws ShareNotFound
-	 * @throws HintException
-	 */
-	protected function revokeShare($share, $isOwner) {
-		if ($this->userManager->userExists($share->getShareOwner()) && $this->userManager->userExists($share->getSharedBy())) {
-			// If both the owner and the initiator of the share are local users we don't have to notify anybody else
-			return;
-		}
-
-		// also send a unShare request to the initiator, if this is a different user than the owner
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			if ($isOwner) {
-				[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
-			} else {
-				[, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
-			}
-			$remoteId = $this->getRemoteId($share);
-			$this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
-		}
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param IShare $share
-	 */
-	public function removeShareFromTable(IShare $share) {
-		$this->removeShareFromTableById($share->getId());
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param string $shareId
-	 */
-	private function removeShareFromTableById($shareId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)))
-			->andWhere($qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)));
-		$qb->executeStatement();
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('federated_reshares')
-			->where($qb->expr()->eq('share_id', $qb->createNamedParameter($shareId)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		// nothing to do here. Technically deleteFromSelf in the context of federated
-		// shares is a umount of an external storage. This is handled here
-		// apps/files_sharing/lib/external/manager.php
-		// TODO move this code over to this app
-	}
-
-	public function restore(IShare $share, string $recipient): IShare {
-		throw new GenericShareException('not implemented');
-	}
-
-
-	public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
-		if (!$shallow) {
-			throw new \Exception('non-shallow getSharesInFolder is no longer supported');
-		}
-		return $this->getSharesInFolderInternal($userId, $node, $reshares);
-	}
-
-	public function getAllSharesInFolder(Folder $node): array {
-		return $this->getSharesInFolderInternal(null, $node, null);
-	}
-
-	/**
-	 * @return array<int, list<IShare>>
-	 */
-	private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE))
-			);
-
-		if ($userId !== null) {
-			/**
-			 * Reshares for this user are shares where they are the owner.
-			 */
-			if ($reshares !== true) {
-				$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->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetchAssociative()) {
-			$shares[$data['fileid']][] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			//Special case for old shares created via the web UI
-			$or1 = $qb->expr()->andX(
-				$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-				$qb->expr()->isNull('uid_initiator')
-			);
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
-					$or1
-				)
-			);
-		} else {
-			$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->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetchAssociative()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetchAssociative();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound('Can not find share with ID: ' . $id);
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param Node $path
-	 * @return IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		// get federated user shares
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
-			->executeQuery();
-
-		$shares = [];
-		while ($data = $cursor->fetchAssociative()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var IShare[] $shares */
-		$shares = [];
-
-		//Get shares directly with this user
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		// Order by id
-		$qb->orderBy('id');
-
-		// Set limit and offset
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-		$qb->setFirstResult($offset);
-
-		$qb->where($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
-		$qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
-
-		// Filter by node if provided
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		$cursor = $qb->executeQuery();
-
-		while ($data = $cursor->fetchAssociative()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->executeQuery();
-
-		$data = $cursor->fetchAssociative();
-
-		if ($data === false) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * get database row of a give share
-	 *
-	 * @param $id
-	 * @return array
-	 * @throws ShareNotFound
-	 */
-	private function getRawShare($id) {
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetchAssociative();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param array $data
-	 * @return IShare
-	 * @throws InvalidShare
-	 * @throws ShareNotFound
-	 */
-	private function createShareObject($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'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
-			->setToken($data['token']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-		$share->setSharedWith($data['share_with']);
-
-		if ($data['uid_initiator'] !== null) {
-			$share->setShareOwner($data['uid_owner']);
-			$share->setSharedBy($data['uid_initiator']);
-		} else {
-			//OLD SHARE
-			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
-
-			$owner = $path->getOwner();
-			$share->setShareOwner($owner->getUID());
-		}
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		$share->setProviderId($this->identifier());
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			$share->setExpirationDate($expiration);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get the node with file $id for $user
-	 *
-	 * @param string $userId
-	 * @param int $id
-	 * @return Node
-	 * @throws InvalidShare
-	 */
-	private function getNode($userId, $id) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (NotFoundException $e) {
-			throw new InvalidShare();
-		}
-
-		$node = $userFolder->getFirstNodeById($id);
-
-		if (!$node) {
-			throw new InvalidShare();
-		}
-
-		return $node;
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		//TODO: probably a good idea to send unshare info to remote servers
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE)))
-			->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-			->executeStatement();
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share_external')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	public function groupDeleted($gid) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('id')
-			->from('share_external')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			// This is not a typo, the group ID is really stored in the 'user' column
-			->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($gid)));
-		$cursor = $qb->executeQuery();
-		$parentShareIds = $cursor->fetchFirstColumn();
-		$cursor->closeCursor();
-		if ($parentShareIds === []) {
-			return;
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$parentShareIdsParam = $qb->createNamedParameter($parentShareIds, IQueryBuilder::PARAM_INT_ARRAY);
-		$qb->delete('share_external')
-			->where($qb->expr()->in('id', $parentShareIdsParam))
-			->orWhere($qb->expr()->in('parent', $parentShareIdsParam))
-			->executeStatement();
-	}
-
-	public function userDeletedFromGroup($uid, $gid) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('id')
-			->from('share_external')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			// This is not a typo, the group ID is really stored in the 'user' column
-			->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($gid)));
-		$cursor = $qb->executeQuery();
-		$parentShareIds = $cursor->fetchFirstColumn();
-		$cursor->closeCursor();
-		if ($parentShareIds === []) {
-			return;
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$parentShareIdsParam = $qb->createNamedParameter($parentShareIds, IQueryBuilder::PARAM_INT_ARRAY);
-		$qb->delete('share_external')
-			->where($qb->expr()->in('parent', $parentShareIdsParam))
-			->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * Check if users from other Nextcloud instances are allowed to mount public links share by this instance
-	 */
-	public function isOutgoingServer2serverShareEnabled(): bool {
-		if ($this->gsConfig->onlyInternalFederation()) {
-			return false;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
-		return $result === 'yes';
-	}
-
-	/**
-	 * Check if users are allowed to mount public links from other Nextclouds
-	 */
-	public function isIncomingServer2serverShareEnabled(): bool {
-		if ($this->gsConfig->onlyInternalFederation()) {
-			return false;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes');
-		return $result === 'yes';
-	}
-
-
-	/**
-	 * Check if users from other Nextcloud instances are allowed to send federated group shares
-	 */
-	public function isOutgoingServer2serverGroupShareEnabled(): bool {
-		if ($this->gsConfig->onlyInternalFederation()) {
-			return false;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no');
-		return $result === 'yes';
-	}
-
-	/**
-	 * Check if users are allowed to receive federated group shares
-	 */
-	public function isIncomingServer2serverGroupShareEnabled(): bool {
-		if ($this->gsConfig->onlyInternalFederation()) {
-			return false;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'incoming_server2server_group_share_enabled', 'no');
-		return $result === 'yes';
-	}
-
-	/**
-	 * Check if federated group sharing is supported, therefore the OCM API need to be enabled
-	 */
-	public function isFederatedGroupSharingSupported(): bool {
-		return $this->cloudFederationProviderManager->isReady();
-	}
-
-	/**
-	 * Check if querying sharees on the lookup server is enabled
-	 */
-	public function isLookupServerQueriesEnabled(): bool {
-		// in a global scale setup we should always query the lookup server
-		if ($this->gsConfig->isGlobalScaleEnabled()) {
-			return true;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
-		// TODO: Reenable if lookup server is used again
-		// return $result;
-		return false;
-	}
-
-
-	/**
-	 * Check if it is allowed to publish user specific data to the lookup server
-	 */
-	public function isLookupServerUploadEnabled(): bool {
-		// in a global scale setup the admin is responsible to keep the lookup server up-to-date
-		if ($this->gsConfig->isGlobalScaleEnabled()) {
-			return false;
-		}
-		$result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') === 'yes';
-		// TODO: Reenable if lookup server is used again
-		// return $result;
-		return false;
-	}
-
-	/**
-	 * Check if auto accepting incoming shares from trusted servers is enabled
-	 */
-	public function isFederatedTrustedShareAutoAccept(): bool {
-		$result = $this->config->getAppValue('files_sharing', 'federatedTrustedShareAutoAccept', 'yes');
-		return $result === 'yes';
-	}
-
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('share_with', 'token', 'file_source')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE)))
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-		$cursor = $qb->executeQuery();
-
-		if ($currentAccess === false) {
-			$remote = $cursor->fetchAssociative() !== false;
-			$cursor->closeCursor();
-
-			return ['remote' => $remote];
-		}
-
-		$remote = [];
-		while ($row = $cursor->fetchAssociative()) {
-			$remote[$row['share_with']] = [
-				'node_id' => $row['file_source'],
-				'token' => $row['token'],
-			];
-		}
-		$cursor->closeCursor();
-
-		return ['remote' => $remote];
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_REMOTE_GROUP, IShare::TYPE_REMOTE], IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetchAssociative()) {
-			try {
-				$share = $this->createShareObject($data);
-			} catch (InvalidShare $e) {
-				continue;
-			} catch (ShareNotFound $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
+        return $share;
+    }
+
+    public function getChildren(IShare $parent): array {
+        $children = [];
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetchAssociative()) {
+            $children[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Delete a share (owner unShares the file)
+     *
+     * @param IShare $share
+     * @throws ShareNotFound
+     * @throws HintException
+     */
+    public function delete(IShare $share) {
+        [, $remote] = $this->addressHandler->splitUserRemote($share->getSharedWith());
+
+        // if the local user is the owner we can send the unShare request directly...
+        if ($this->userManager->userExists($share->getShareOwner())) {
+            $this->notifications->sendRemoteUnShare($remote, $share->getId(), $share->getToken());
+            $this->revokeShare($share, true);
+        } else { // ... if not we need to correct ID for the unShare request
+            $remoteId = $this->getRemoteId($share);
+            $this->notifications->sendRemoteUnShare($remote, $remoteId, $share->getToken());
+            $this->revokeShare($share, false);
+        }
+
+        // only remove the share when all messages are send to not lose information
+        // about the share to early
+        $this->removeShareFromTable($share);
+    }
+
+    /**
+     * in case of a re-share we need to send the other use (initiator or owner)
+     * a message that the file was unshared
+     *
+     * @param IShare $share
+     * @param bool $isOwner the user can either be the owner or the user who re-sahred it
+     * @throws ShareNotFound
+     * @throws HintException
+     */
+    protected function revokeShare($share, $isOwner) {
+        if ($this->userManager->userExists($share->getShareOwner()) && $this->userManager->userExists($share->getSharedBy())) {
+            // If both the owner and the initiator of the share are local users we don't have to notify anybody else
+            return;
+        }
+
+        // also send a unShare request to the initiator, if this is a different user than the owner
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            if ($isOwner) {
+                [, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
+            } else {
+                [, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
+            }
+            $remoteId = $this->getRemoteId($share);
+            $this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
+        }
+    }
+
+    /**
+     * remove share from table
+     *
+     * @param IShare $share
+     */
+    public function removeShareFromTable(IShare $share) {
+        $this->removeShareFromTableById($share->getId());
+    }
+
+    /**
+     * remove share from table
+     *
+     * @param string $shareId
+     */
+    private function removeShareFromTableById($shareId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)))
+            ->andWhere($qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)));
+        $qb->executeStatement();
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('federated_reshares')
+            ->where($qb->expr()->eq('share_id', $qb->createNamedParameter($shareId)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        // nothing to do here. Technically deleteFromSelf in the context of federated
+        // shares is a umount of an external storage. This is handled here
+        // apps/files_sharing/lib/external/manager.php
+        // TODO move this code over to this app
+    }
+
+    public function restore(IShare $share, string $recipient): IShare {
+        throw new GenericShareException('not implemented');
+    }
+
+
+    public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
+        if (!$shallow) {
+            throw new \Exception('non-shallow getSharesInFolder is no longer supported');
+        }
+        return $this->getSharesInFolderInternal($userId, $node, $reshares);
+    }
+
+    public function getAllSharesInFolder(Folder $node): array {
+        return $this->getSharesInFolderInternal(null, $node, null);
+    }
+
+    /**
+     * @return array<int, list<IShare>>
+     */
+    private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE))
+            );
+
+        if ($userId !== null) {
+            /**
+             * Reshares for this user are shares where they are the owner.
+             */
+            if ($reshares !== true) {
+                $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->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetchAssociative()) {
+            $shares[$data['fileid']][] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            //Special case for old shares created via the web UI
+            $or1 = $qb->expr()->andX(
+                $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                $qb->expr()->isNull('uid_initiator')
+            );
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
+                    $or1
+                )
+            );
+        } else {
+            $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->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetchAssociative()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetchAssociative();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound('Can not find share with ID: ' . $id);
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param Node $path
+     * @return IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        // get federated user shares
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->executeQuery();
+
+        $shares = [];
+        while ($data = $cursor->fetchAssociative()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var IShare[] $shares */
+        $shares = [];
+
+        //Get shares directly with this user
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        // Order by id
+        $qb->orderBy('id');
+
+        // Set limit and offset
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+        $qb->setFirstResult($offset);
+
+        $qb->where($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
+        $qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
+
+        // Filter by node if provided
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        $cursor = $qb->executeQuery();
+
+        while ($data = $cursor->fetchAssociative()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->executeQuery();
+
+        $data = $cursor->fetchAssociative();
+
+        if ($data === false) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        return $share;
+    }
+
+    /**
+     * get database row of a give share
+     *
+     * @param $id
+     * @return array
+     * @throws ShareNotFound
+     */
+    private function getRawShare($id) {
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetchAssociative();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param array $data
+     * @return IShare
+     * @throws InvalidShare
+     * @throws ShareNotFound
+     */
+    private function createShareObject($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'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setStatus((int)$data['accepted'])
+            ->setToken($data['token']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+        $share->setSharedWith($data['share_with']);
+
+        if ($data['uid_initiator'] !== null) {
+            $share->setShareOwner($data['uid_owner']);
+            $share->setSharedBy($data['uid_initiator']);
+        } else {
+            //OLD SHARE
+            $share->setSharedBy($data['uid_owner']);
+            $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+
+            $owner = $path->getOwner();
+            $share->setShareOwner($owner->getUID());
+        }
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        $share->setProviderId($this->identifier());
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            $share->setExpirationDate($expiration);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get the node with file $id for $user
+     *
+     * @param string $userId
+     * @param int $id
+     * @return Node
+     * @throws InvalidShare
+     */
+    private function getNode($userId, $id) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($userId);
+        } catch (NotFoundException $e) {
+            throw new InvalidShare();
+        }
+
+        $node = $userFolder->getFirstNodeById($id);
+
+        if (!$node) {
+            throw new InvalidShare();
+        }
+
+        return $node;
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        //TODO: probably a good idea to send unshare info to remote servers
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE)))
+            ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share_external')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    public function groupDeleted($gid) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('id')
+            ->from('share_external')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            // This is not a typo, the group ID is really stored in the 'user' column
+            ->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($gid)));
+        $cursor = $qb->executeQuery();
+        $parentShareIds = $cursor->fetchFirstColumn();
+        $cursor->closeCursor();
+        if ($parentShareIds === []) {
+            return;
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $parentShareIdsParam = $qb->createNamedParameter($parentShareIds, IQueryBuilder::PARAM_INT_ARRAY);
+        $qb->delete('share_external')
+            ->where($qb->expr()->in('id', $parentShareIdsParam))
+            ->orWhere($qb->expr()->in('parent', $parentShareIdsParam))
+            ->executeStatement();
+    }
+
+    public function userDeletedFromGroup($uid, $gid) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('id')
+            ->from('share_external')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            // This is not a typo, the group ID is really stored in the 'user' column
+            ->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($gid)));
+        $cursor = $qb->executeQuery();
+        $parentShareIds = $cursor->fetchFirstColumn();
+        $cursor->closeCursor();
+        if ($parentShareIds === []) {
+            return;
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $parentShareIdsParam = $qb->createNamedParameter($parentShareIds, IQueryBuilder::PARAM_INT_ARRAY);
+        $qb->delete('share_external')
+            ->where($qb->expr()->in('parent', $parentShareIdsParam))
+            ->andWhere($qb->expr()->eq('user', $qb->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * Check if users from other Nextcloud instances are allowed to mount public links share by this instance
+     */
+    public function isOutgoingServer2serverShareEnabled(): bool {
+        if ($this->gsConfig->onlyInternalFederation()) {
+            return false;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
+        return $result === 'yes';
+    }
+
+    /**
+     * Check if users are allowed to mount public links from other Nextclouds
+     */
+    public function isIncomingServer2serverShareEnabled(): bool {
+        if ($this->gsConfig->onlyInternalFederation()) {
+            return false;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes');
+        return $result === 'yes';
+    }
+
+
+    /**
+     * Check if users from other Nextcloud instances are allowed to send federated group shares
+     */
+    public function isOutgoingServer2serverGroupShareEnabled(): bool {
+        if ($this->gsConfig->onlyInternalFederation()) {
+            return false;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no');
+        return $result === 'yes';
+    }
+
+    /**
+     * Check if users are allowed to receive federated group shares
+     */
+    public function isIncomingServer2serverGroupShareEnabled(): bool {
+        if ($this->gsConfig->onlyInternalFederation()) {
+            return false;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'incoming_server2server_group_share_enabled', 'no');
+        return $result === 'yes';
+    }
+
+    /**
+     * Check if federated group sharing is supported, therefore the OCM API need to be enabled
+     */
+    public function isFederatedGroupSharingSupported(): bool {
+        return $this->cloudFederationProviderManager->isReady();
+    }
+
+    /**
+     * Check if querying sharees on the lookup server is enabled
+     */
+    public function isLookupServerQueriesEnabled(): bool {
+        // in a global scale setup we should always query the lookup server
+        if ($this->gsConfig->isGlobalScaleEnabled()) {
+            return true;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
+        // TODO: Reenable if lookup server is used again
+        // return $result;
+        return false;
+    }
+
+
+    /**
+     * Check if it is allowed to publish user specific data to the lookup server
+     */
+    public function isLookupServerUploadEnabled(): bool {
+        // in a global scale setup the admin is responsible to keep the lookup server up-to-date
+        if ($this->gsConfig->isGlobalScaleEnabled()) {
+            return false;
+        }
+        $result = $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') === 'yes';
+        // TODO: Reenable if lookup server is used again
+        // return $result;
+        return false;
+    }
+
+    /**
+     * Check if auto accepting incoming shares from trusted servers is enabled
+     */
+    public function isFederatedTrustedShareAutoAccept(): bool {
+        $result = $this->config->getAppValue('files_sharing', 'federatedTrustedShareAutoAccept', 'yes');
+        return $result === 'yes';
+    }
+
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('share_with', 'token', 'file_source')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE)))
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+        $cursor = $qb->executeQuery();
+
+        if ($currentAccess === false) {
+            $remote = $cursor->fetchAssociative() !== false;
+            $cursor->closeCursor();
+
+            return ['remote' => $remote];
+        }
+
+        $remote = [];
+        while ($row = $cursor->fetchAssociative()) {
+            $remote[$row['share_with']] = [
+                'node_id' => $row['file_source'],
+                'token' => $row['token'],
+            ];
+        }
+        $cursor->closeCursor();
+
+        return ['remote' => $remote];
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_REMOTE_GROUP, IShare::TYPE_REMOTE], IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetchAssociative()) {
+            try {
+                $share = $this->createShareObject($data);
+            } catch (InvalidShare $e) {
+                continue;
+            } catch (ShareNotFound $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -140,7 +140,7 @@ 
 		if ($remoteShare) {
 			try {
 				$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
-				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType, $expirationDate);
+				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_'.time(), $shareType, $expirationDate);
 				$share->setId($shareId);
 				[$token, $remoteId] = $this->askOwnerToReShare($shareWith, $share, $shareId);
 				// remote share was create successfully if we get a valid token as return
@@ -274,7 +274,7 @@ 
 		$result = $qResult->fetchAllAssociative();
 		$qResult->closeCursor();
 
-		if (isset($result[0]) && (int)$result[0]['remote_id'] > 0) {
+		if (isset($result[0]) && (int) $result[0]['remote_id'] > 0) {
 			return $result[0];
 		}
 
@@ -408,7 +408,7 @@ 
 	public function getRemoteId(IShare $share): string {
 		$query = $this->dbConnection->getQueryBuilder();
 		$query->select('remote_id')->from('federated_reshares')
-			->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
+			->where($query->expr()->eq('share_id', $query->createNamedParameter((int) $share->getId())));
 		$result = $query->executeQuery();
 		$data = $result->fetchAssociative();
 		$result->closeCursor();
@@ -417,7 +417,7 @@ 
 			throw new ShareNotFound();
 		}
 
-		return (string)$data['remote_id'];
+		return (string) $data['remote_id'];
 	}
 
 	/**
@@ -671,7 +671,7 @@ 
 		$cursor->closeCursor();
 
 		if ($data === false) {
-			throw new ShareNotFound('Can not find share with ID: ' . $id);
+			throw new ShareNotFound('Can not find share with ID: '.$id);
 		}
 
 		try {
@@ -814,16 +814,16 @@ 
 	 */
 	private function createShareObject($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
+			->setMailSend((bool) $data['mail_send'])
+			->setStatus((int) $data['accepted'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with']);
 
@@ -833,13 +833,13 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
 		}
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());