nextcloud / server

apps/files_sharing/lib/Migration/Version22000Date20210216084241.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version22000Date20210216084241 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?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();
 
-		$table = $schema->getTable('share_external');
-		if ($table->hasIndex('sh_external_user')) {
-			$table->dropIndex('sh_external_user');
-		}
+        $table = $schema->getTable('share_external');
+        if ($table->hasIndex('sh_external_user')) {
+            $table->dropIndex('sh_external_user');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Files/Cache/HomePropagator.php

Indentation +21 added lines, -21 removed lines

@@ -25,28 +25,28 @@
 use OCP\IDBConnection;
 
 class HomePropagator extends Propagator {
-	private $ignoredBaseFolders;
+    private $ignoredBaseFolders;
 
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 */
-	public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
-		parent::__construct($storage, $connection);
-		$this->ignoredBaseFolders = ['files_encryption'];
-	}
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     */
+    public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
+        parent::__construct($storage, $connection);
+        $this->ignoredBaseFolders = ['files_encryption'];
+    }
 
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference number of bytes the file has grown
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		[$baseFolder] = explode('/', $internalPath, 2);
-		if (in_array($baseFolder, $this->ignoredBaseFolders)) {
-			return [];
-		} else {
-			parent::propagateChange($internalPath, $time, $sizeDifference);
-		}
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference number of bytes the file has grown
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        [$baseFolder] = explode('/', $internalPath, 2);
+        if (in_array($baseFolder, $this->ignoredBaseFolders)) {
+            return [];
+        } else {
+            parent::propagateChange($internalPath, $time, $sizeDifference);
+        }
+    }
 }

lib/private/Files/Cache/Wrapper/JailPropagator.php

Indentation +14 added lines, -14 removed lines

@@ -28,19 +28,19 @@
 use OC\Files\Storage\Wrapper\Jail;
 
 class JailPropagator extends Propagator {
-	/**
-	 * @var Jail
-	 */
-	protected $storage;
+    /**
+     * @var Jail
+     */
+    protected $storage;
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage, $sourceInternalPath] = $this->storage->resolvePath($internalPath);
-		$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        /** @var \OC\Files\Storage\Storage $storage */
+        [$storage, $sourceInternalPath] = $this->storage->resolvePath($internalPath);
+        $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
+    }
 }

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
 			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
 			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
+				'label' => $remoteGroup." ($serverUrl)",
 				'guid' => $remoteGroup,
 				'name' => $remoteGroup,
 				'value' => [

Indentation +49 added lines, -49 removed lines

@@ -14,59 +14,59 @@
 use OCP\Share\IShare;
 
 class RemoteGroupPlugin implements ISearchPlugin {
-	private bool $enabled = false;
+    private bool $enabled = false;
 
-	public function __construct(
-		ICloudFederationProviderManager $cloudFederationProviderManager,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		try {
-			$fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
-			$supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
-			if (in_array('group', $supportedShareTypes)) {
-				$this->enabled = true;
-			}
-		} catch (\Exception $e) {
-			// do nothing, just don't enable federated group shares
-		}
-	}
+    public function __construct(
+        ICloudFederationProviderManager $cloudFederationProviderManager,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        try {
+            $fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
+            $supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
+            if (in_array('group', $supportedShareTypes)) {
+                $this->enabled = true;
+            }
+        } catch (\Exception $e) {
+            // do nothing, just don't enable federated group shares
+        }
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remote_groups');
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remote_groups');
 
-		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
-			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
-				'guid' => $remoteGroup,
-				'name' => $remoteGroup,
-				'value' => [
-					'shareType' => IShare::TYPE_REMOTE_GROUP,
-					'shareWith' => $search,
-					'server' => $serverUrl,
-				],
-			];
-		}
+        if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            [$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
+            $result['exact'][] = [
+                'label' => $remoteGroup . " ($serverUrl)",
+                'guid' => $remoteGroup,
+                'name' => $remoteGroup,
+                'value' => [
+                    'shareType' => IShare::TYPE_REMOTE_GROUP,
+                    'shareWith' => $search,
+                    'server' => $serverUrl,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split group and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitGroupRemote($address): array {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split group and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitGroupRemote($address): array {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

apps/dav/lib/CardDAV/Plugin.php

Indentation +39 added lines, -39 removed lines

@@ -31,46 +31,46 @@
 use Sabre\DAV\Server;
 
 class Plugin extends \Sabre\CardDAV\Plugin {
-	public function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-		parent::initialize($server);
-	}
+    public function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+        parent::initialize($server);
+    }
 
-	/**
-	 * Returns the addressbook home for a given principal
-	 *
-	 * @param string $principal
-	 * @return string|null
-	 */
-	protected function getAddressbookHomeForPrincipal($principal) {
-		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
-		}
-	}
+    /**
+     * Returns the addressbook home for a given principal
+     *
+     * @param string $principal
+     * @return string|null
+     */
+    protected function getAddressbookHomeForPrincipal($principal) {
+        if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+        }
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$ns = '{http://owncloud.org/ns}';
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $ns = '{http://owncloud.org/ns}';
 
-		if ($node instanceof AddressBook) {
-			$propFind->handle($ns . 'groups', function () use ($node) {
-				return new Groups($node->getContactsGroups());
-			});
-		}
-	}
+        if ($node instanceof AddressBook) {
+            $propFind->handle($ns . 'groups', function () use ($node) {
+                return new Groups($node->getContactsGroups());
+            });
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -45,15 +45,15 @@ 
 	protected function getAddressbookHomeForPrincipal($principal) {
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/users/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/groups/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/system/'.$principalId;
 		}
 	}
 
@@ -68,7 +68,7 @@ 
 		$ns = '{http://owncloud.org/ns}';
 
 		if ($node instanceof AddressBook) {
-			$propFind->handle($ns . 'groups', function () use ($node) {
+			$propFind->handle($ns.'groups', function() use ($node) {
 				return new Groups($node->getContactsGroups());
 			});
 		}

apps/dav/lib/Traits/PrincipalProxyTrait.php

Indentation +186 added lines, -186 removed lines

@@ -36,190 +36,190 @@
  */
 trait PrincipalProxyTrait {
 
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$members = [];
-
-		if ($this->isProxyPrincipal($principal)) {
-			$realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
-			$principalArray = $this->getPrincipalByPath($realPrincipal);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
-			foreach ($proxies as $proxy) {
-				if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-					$members[] = $proxy->getProxyId();
-				}
-
-				if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-					$members[] = $proxy->getProxyId();
-				}
-			}
-		}
-
-		return $members;
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		[$prefix, $name] = \Sabre\Uri\split($principal);
-
-		if ($prefix !== $this->principalPrefix) {
-			return [];
-		}
-
-		$principalArray = $this->getPrincipalByPath($principal);
-		if (!$principalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$groups = [];
-		$proxies = $this->proxyMapper->getProxiesFor($principal);
-		foreach ($proxies as $proxy) {
-			if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
-			}
-
-			if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
-			}
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		[$principalUri, $target] = \Sabre\Uri\split($principal);
-
-		if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
-			throw new Exception('Setting members of the group is not supported yet');
-		}
-
-		$masterPrincipalArray = $this->getPrincipalByPath($principalUri);
-		if (!$masterPrincipalArray) {
-			throw new Exception('Principal not found');
-		}
-
-		$permission = ProxyMapper::PERMISSION_READ;
-		if ($target === 'calendar-proxy-write') {
-			$permission |= ProxyMapper::PERMISSION_WRITE;
-		}
-
-		[$prefix, $owner] = \Sabre\Uri\split($principalUri);
-		$proxies = $this->proxyMapper->getProxiesOf($principalUri);
-
-		foreach ($members as $member) {
-			[$prefix, $name] = \Sabre\Uri\split($member);
-
-			if ($prefix !== $this->principalPrefix) {
-				throw new Exception('Invalid member group prefix: ' . $prefix);
-			}
-
-			$principalArray = $this->getPrincipalByPath($member);
-			if (!$principalArray) {
-				throw new Exception('Principal not found');
-			}
-
-			$found = false;
-			foreach ($proxies as $proxy) {
-				if ($proxy->getProxyId() === $member) {
-					$found = true;
-					$proxy->setPermissions($proxy->getPermissions() | $permission);
-					$this->proxyMapper->update($proxy);
-
-					$proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
-						return $p->getId() !== $proxy->getId();
-					});
-					break;
-				}
-			}
-
-			if ($found === false) {
-				$proxy = new Proxy();
-				$proxy->setOwnerId($principalUri);
-				$proxy->setProxyId($member);
-				$proxy->setPermissions($permission);
-				$this->proxyMapper->insert($proxy);
-			}
-		}
-
-		// Delete all remaining proxies
-		foreach ($proxies as $proxy) {
-			// Write and Read Proxies have individual requests,
-			// so only delete proxies of this permission
-			if ($proxy->getPermissions() === $permission) {
-				$this->proxyMapper->delete($proxy);
-			}
-		}
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isProxyPrincipal(string $principalUri):bool {
-		[$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
-		[$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
-
-		if (!isset($prefix) || !isset($userId)) {
-			return false;
-		}
-		if ($prefix !== $this->principalPrefix) {
-			return false;
-		}
-
-		return $proxy === 'calendar-proxy-read'
-			|| $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isReadProxyPrincipal(string $principalUri):bool {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-read';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return bool
-	 */
-	private function isWriteProxyPrincipal(string $principalUri):bool {
-		[, $proxy] = \Sabre\Uri\split($principalUri);
-		return $proxy === 'calendar-proxy-write';
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @return string
-	 */
-	private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
-		[$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
-		return $realPrincipalUri;
-	}
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $members = [];
+
+        if ($this->isProxyPrincipal($principal)) {
+            $realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal);
+            $principalArray = $this->getPrincipalByPath($realPrincipal);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']);
+            foreach ($proxies as $proxy) {
+                if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                    $members[] = $proxy->getProxyId();
+                }
+
+                if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                    $members[] = $proxy->getProxyId();
+                }
+            }
+        }
+
+        return $members;
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        [$prefix, $name] = \Sabre\Uri\split($principal);
+
+        if ($prefix !== $this->principalPrefix) {
+            return [];
+        }
+
+        $principalArray = $this->getPrincipalByPath($principal);
+        if (!$principalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $groups = [];
+        $proxies = $this->proxyMapper->getProxiesFor($principal);
+        foreach ($proxies as $proxy) {
+            if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
+            }
+
+            if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
+                $groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
+            }
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        [$principalUri, $target] = \Sabre\Uri\split($principal);
+
+        if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
+            throw new Exception('Setting members of the group is not supported yet');
+        }
+
+        $masterPrincipalArray = $this->getPrincipalByPath($principalUri);
+        if (!$masterPrincipalArray) {
+            throw new Exception('Principal not found');
+        }
+
+        $permission = ProxyMapper::PERMISSION_READ;
+        if ($target === 'calendar-proxy-write') {
+            $permission |= ProxyMapper::PERMISSION_WRITE;
+        }
+
+        [$prefix, $owner] = \Sabre\Uri\split($principalUri);
+        $proxies = $this->proxyMapper->getProxiesOf($principalUri);
+
+        foreach ($members as $member) {
+            [$prefix, $name] = \Sabre\Uri\split($member);
+
+            if ($prefix !== $this->principalPrefix) {
+                throw new Exception('Invalid member group prefix: ' . $prefix);
+            }
+
+            $principalArray = $this->getPrincipalByPath($member);
+            if (!$principalArray) {
+                throw new Exception('Principal not found');
+            }
+
+            $found = false;
+            foreach ($proxies as $proxy) {
+                if ($proxy->getProxyId() === $member) {
+                    $found = true;
+                    $proxy->setPermissions($proxy->getPermissions() | $permission);
+                    $this->proxyMapper->update($proxy);
+
+                    $proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
+                        return $p->getId() !== $proxy->getId();
+                    });
+                    break;
+                }
+            }
+
+            if ($found === false) {
+                $proxy = new Proxy();
+                $proxy->setOwnerId($principalUri);
+                $proxy->setProxyId($member);
+                $proxy->setPermissions($permission);
+                $this->proxyMapper->insert($proxy);
+            }
+        }
+
+        // Delete all remaining proxies
+        foreach ($proxies as $proxy) {
+            // Write and Read Proxies have individual requests,
+            // so only delete proxies of this permission
+            if ($proxy->getPermissions() === $permission) {
+                $this->proxyMapper->delete($proxy);
+            }
+        }
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isProxyPrincipal(string $principalUri):bool {
+        [$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
+        [$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
+
+        if (!isset($prefix) || !isset($userId)) {
+            return false;
+        }
+        if ($prefix !== $this->principalPrefix) {
+            return false;
+        }
+
+        return $proxy === 'calendar-proxy-read'
+            || $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isReadProxyPrincipal(string $principalUri):bool {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-read';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return bool
+     */
+    private function isWriteProxyPrincipal(string $principalUri):bool {
+        [, $proxy] = \Sabre\Uri\split($principalUri);
+        return $proxy === 'calendar-proxy-write';
+    }
+
+    /**
+     * @param string $principalUri
+     * @return string
+     */
+    private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
+        [$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
+        return $realPrincipalUri;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -92,11 +92,11 @@ 
 		$proxies = $this->proxyMapper->getProxiesFor($principal);
 		foreach ($proxies as $proxy) {
 			if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-read';
+				$groups[] = $proxy->getOwnerId().'/calendar-proxy-read';
 			}
 
 			if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) {
-				$groups[] = $proxy->getOwnerId() . '/calendar-proxy-write';
+				$groups[] = $proxy->getOwnerId().'/calendar-proxy-write';
 			}
 		}
 
@@ -136,7 +136,7 @@ 
 			[$prefix, $name] = \Sabre\Uri\split($member);
 
 			if ($prefix !== $this->principalPrefix) {
-				throw new Exception('Invalid member group prefix: ' . $prefix);
+				throw new Exception('Invalid member group prefix: '.$prefix);
 			}
 
 			$principalArray = $this->getPrincipalByPath($member);
@@ -151,7 +151,7 @@ 
 					$proxy->setPermissions($proxy->getPermissions() | $permission);
 					$this->proxyMapper->update($proxy);
 
-					$proxies = array_filter($proxies, function (Proxy $p) use ($proxy) {
+					$proxies = array_filter($proxies, function(Proxy $p) use ($proxy) {
 						return $p->getId() !== $proxy->getId();
 					});
 					break;

apps/dav/lib/CalDAV/Plugin.php

Indentation +25 added lines, -25 removed lines

@@ -26,30 +26,30 @@
 namespace OCA\DAV\CalDAV;
 
 class Plugin extends \Sabre\CalDAV\Plugin {
-	public const SYSTEM_CALENDAR_ROOT = 'system-calendars';
+    public const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
-	/**
-	 * Returns the path to a principal's calendar home.
-	 *
-	 * The return url must not end with a slash.
-	 * This function should return null in case a principal did not have
-	 * a calendar home.
-	 *
-	 * @param string $principalUrl
-	 * @return string|null
-	 */
-	public function getCalendarHomeForPrincipal($principalUrl) {
-		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
-		}
-		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
-			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
-		}
-	}
+    /**
+     * Returns the path to a principal's calendar home.
+     *
+     * The return url must not end with a slash.
+     * This function should return null in case a principal did not have
+     * a calendar home.
+     *
+     * @param string $principalUrl
+     * @return string|null
+     */
+    public function getCalendarHomeForPrincipal($principalUrl) {
+        if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::CALENDAR_ROOT . '/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+        }
+        if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
+            [, $principalId] = \Sabre\Uri\split($principalUrl);
+            return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,15 +41,15 @@
 	public function getCalendarHomeForPrincipal($principalUrl) {
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
+			return self::CALENDAR_ROOT.'/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-resources/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
 			[, $principalId] = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-rooms/'.$principalId;
 		}
 	}
 }

apps/dav/lib/CalDAV/Search/SearchPlugin.php

Spacing +4 added lines, -4 removed lines

@@ -82,7 +82,7 @@ 
 
 		$server->on('report', [$this, 'report']);
 
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+		$server->xml->elementMap['{'.self::NS_Nextcloud.'}calendar-search'] =
 			CalendarSearchReport::class;
 	}
 
@@ -96,7 +96,7 @@ 
 	 */
 	public function report($reportName, $report, $path) {
 		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
+			case '{'.self::NS_Nextcloud.'}calendar-search':
 				$this->server->transactionType = 'report-nc-calendar-search';
 				$this->calendarSearch($report);
 				return false;
@@ -118,7 +118,7 @@ 
 
 		$reports = [];
 		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+			$reports[] = '{'.self::NS_Nextcloud.'}calendar-search';
 		}
 
 		return $reports;
@@ -147,7 +147,7 @@ 
 
 			foreach ($nodePaths as $path) {
 				[$properties] = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
+					$this->server->getRequestUri().'/'.$path,
 					$report->properties);
 				$result[] = $properties;
 			}

Indentation +130 added lines, -130 removed lines

@@ -12,134 +12,134 @@
 use Sabre\DAV\ServerPlugin;
 
 class SearchPlugin extends ServerPlugin {
-	public const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['nc-calendar-search'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'nc-calendar-search';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$server->on('report', [$this, 'report']);
-
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
-			CalendarSearchReport::class;
-	}
-
-	/**
-	 * This functions handles REPORT requests specific to CalDAV
-	 *
-	 * @param string $reportName
-	 * @param mixed $report
-	 * @param mixed $path
-	 * @return bool
-	 */
-	public function report($reportName, $report, $path) {
-		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
-				$this->server->transactionType = 'report-nc-calendar-search';
-				$this->calendarSearch($report);
-				return false;
-		}
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 * Note that you still need to subscribe to the 'report' event to actually
-	 * implement them
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-
-		$reports = [];
-		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
-		}
-
-		return $reports;
-	}
-
-	/**
-	 * This function handles the calendar-query REPORT
-	 *
-	 * This report is used by clients to request calendar objects based on
-	 * complex conditions.
-	 *
-	 * @param CalendarSearchReport $report
-	 * @return void
-	 */
-	private function calendarSearch($report) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		$depth = $this->server->getHTTPDepth(2);
-
-		// The default result is an empty array
-		$result = [];
-
-		// If we're dealing with the calendar home, the calendar home itself is
-		// responsible for the calendar-query
-		if ($node instanceof CalendarHome && $depth === 2) {
-			$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
-
-			foreach ($nodePaths as $path) {
-				[$properties] = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
-					$report->properties);
-				$result[] = $properties;
-			}
-		}
-
-		$prefer = $this->server->getHTTPPrefer();
-
-		$this->server->httpResponse->setStatus(Http::STATUS_MULTI_STATUS);
-		$this->server->httpResponse->setHeader('Content-Type',
-			'application/xml; charset=utf-8');
-		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-		$this->server->httpResponse->setBody(
-			$this->server->generateMultiStatus($result,
-				$prefer['return'] === 'minimal'));
-	}
+    public const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['nc-calendar-search'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'nc-calendar-search';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $server->on('report', [$this, 'report']);
+
+        $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+            CalendarSearchReport::class;
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param mixed $report
+     * @param mixed $path
+     * @return bool
+     */
+    public function report($reportName, $report, $path) {
+        switch ($reportName) {
+            case '{' . self::NS_Nextcloud . '}calendar-search':
+                $this->server->transactionType = 'report-nc-calendar-search';
+                $this->calendarSearch($report);
+                return false;
+        }
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = [];
+        if ($node instanceof CalendarHome) {
+            $reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+        }
+
+        return $reports;
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param CalendarSearchReport $report
+     * @return void
+     */
+    private function calendarSearch($report) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        $depth = $this->server->getHTTPDepth(2);
+
+        // The default result is an empty array
+        $result = [];
+
+        // If we're dealing with the calendar home, the calendar home itself is
+        // responsible for the calendar-query
+        if ($node instanceof CalendarHome && $depth === 2) {
+            $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
+
+            foreach ($nodePaths as $path) {
+                [$properties] = $this->server->getPropertiesForPath(
+                    $this->server->getRequestUri() . '/' . $path,
+                    $report->properties);
+                $result[] = $properties;
+            }
+        }
+
+        $prefer = $this->server->getHTTPPrefer();
+
+        $this->server->httpResponse->setStatus(Http::STATUS_MULTI_STATUS);
+        $this->server->httpResponse->setHeader('Content-Type',
+            'application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+        $this->server->httpResponse->setBody(
+            $this->server->generateMultiStatus($result,
+                $prefer['return'] === 'minimal'));
+    }
 }

apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		try {
 			$this->activityManager->publish($activity);
 		} catch (BadMethodCallException $e) {
-			$this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
+			$this->logger->warning('Could not publish activity: '.$e->getMessage(), [
 				'exception' => $e
 			]);
 		}

Indentation +25 added lines, -25 removed lines

@@ -21,32 +21,32 @@
  * @template-implements IEventListener<\OC\Authentication\Events\AppPasswordCreatedEvent>
  */
 class AppPasswordCreatedActivityListener implements IEventListener {
-	public function __construct(
-		private IActivityManager $activityManager,
-		private IUserSession $userSession,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IActivityManager $activityManager,
+        private IUserSession $userSession,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof AppPasswordCreatedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof AppPasswordCreatedEvent)) {
+            return;
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('settings')
-			->setType('security')
-			->setAffectedUser($event->getToken()->getUID())
-			->setAuthor($this->userSession->getUser() ? $this->userSession->getUser()->getUID() : '')
-			->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $event->getToken()->getName()])
-			->setObject('app_token', $event->getToken()->getId());
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('settings')
+            ->setType('security')
+            ->setAffectedUser($event->getToken()->getUID())
+            ->setAuthor($this->userSession->getUser() ? $this->userSession->getUser()->getUID() : '')
+            ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $event->getToken()->getName()])
+            ->setObject('app_token', $event->getToken()->getId());
 
-		try {
-			$this->activityManager->publish($activity);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
-				'exception' => $e
-			]);
-		}
-	}
+        try {
+            $this->activityManager->publish($activity);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
+                'exception' => $e
+            ]);
+        }
+    }
 }