@@ -38,41 +38,41 @@ |
||
38 | 38 | * Auto-generated migration step: Please modify to your needs! |
39 | 39 | */ |
40 | 40 | class Version1011Date20190806104428 extends SimpleMigrationStep { |
41 | - /** |
|
42 | - * @param IOutput $output |
|
43 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | - * @param array $options |
|
45 | - * @return null|ISchemaWrapper |
|
46 | - */ |
|
47 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
48 | - /** @var ISchemaWrapper $schema */ |
|
49 | - $schema = $schemaClosure(); |
|
41 | + /** |
|
42 | + * @param IOutput $output |
|
43 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
44 | + * @param array $options |
|
45 | + * @return null|ISchemaWrapper |
|
46 | + */ |
|
47 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
48 | + /** @var ISchemaWrapper $schema */ |
|
49 | + $schema = $schemaClosure(); |
|
50 | 50 | |
51 | - $table = $schema->createTable('dav_cal_proxy'); |
|
52 | - $table->addColumn('id', Types::BIGINT, [ |
|
53 | - 'autoincrement' => true, |
|
54 | - 'notnull' => true, |
|
55 | - 'length' => 11, |
|
56 | - 'unsigned' => true, |
|
57 | - ]); |
|
58 | - $table->addColumn('owner_id', Types::STRING, [ |
|
59 | - 'notnull' => true, |
|
60 | - 'length' => 64, |
|
61 | - ]); |
|
62 | - $table->addColumn('proxy_id', Types::STRING, [ |
|
63 | - 'notnull' => true, |
|
64 | - 'length' => 64, |
|
65 | - ]); |
|
66 | - $table->addColumn('permissions', Types::INTEGER, [ |
|
67 | - 'notnull' => false, |
|
68 | - 'length' => 4, |
|
69 | - 'unsigned' => true, |
|
70 | - ]); |
|
51 | + $table = $schema->createTable('dav_cal_proxy'); |
|
52 | + $table->addColumn('id', Types::BIGINT, [ |
|
53 | + 'autoincrement' => true, |
|
54 | + 'notnull' => true, |
|
55 | + 'length' => 11, |
|
56 | + 'unsigned' => true, |
|
57 | + ]); |
|
58 | + $table->addColumn('owner_id', Types::STRING, [ |
|
59 | + 'notnull' => true, |
|
60 | + 'length' => 64, |
|
61 | + ]); |
|
62 | + $table->addColumn('proxy_id', Types::STRING, [ |
|
63 | + 'notnull' => true, |
|
64 | + 'length' => 64, |
|
65 | + ]); |
|
66 | + $table->addColumn('permissions', Types::INTEGER, [ |
|
67 | + 'notnull' => false, |
|
68 | + 'length' => 4, |
|
69 | + 'unsigned' => true, |
|
70 | + ]); |
|
71 | 71 | |
72 | - $table->setPrimaryKey(['id']); |
|
73 | - $table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx'); |
|
74 | - $table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid'); |
|
72 | + $table->setPrimaryKey(['id']); |
|
73 | + $table->addUniqueIndex(['owner_id', 'proxy_id', 'permissions'], 'dav_cal_proxy_uidx'); |
|
74 | + $table->addIndex(['proxy_id'], 'dav_cal_proxy_ipid'); |
|
75 | 75 | |
76 | - return $schema; |
|
77 | - } |
|
76 | + return $schema; |
|
77 | + } |
|
78 | 78 | } |
@@ -35,21 +35,21 @@ |
||
35 | 35 | * Auto-generated migration step: Please modify to your needs! |
36 | 36 | */ |
37 | 37 | class Version1017Date20210216083742 extends SimpleMigrationStep { |
38 | - /** |
|
39 | - * @param IOutput $output |
|
40 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
41 | - * @param array $options |
|
42 | - * @return null|ISchemaWrapper |
|
43 | - */ |
|
44 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
45 | - /** @var ISchemaWrapper $schema */ |
|
46 | - $schema = $schemaClosure(); |
|
38 | + /** |
|
39 | + * @param IOutput $output |
|
40 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
41 | + * @param array $options |
|
42 | + * @return null|ISchemaWrapper |
|
43 | + */ |
|
44 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
45 | + /** @var ISchemaWrapper $schema */ |
|
46 | + $schema = $schemaClosure(); |
|
47 | 47 | |
48 | - $table = $schema->getTable('dav_cal_proxy'); |
|
49 | - if ($table->hasIndex('dav_cal_proxy_ioid')) { |
|
50 | - $table->dropIndex('dav_cal_proxy_ioid'); |
|
51 | - } |
|
48 | + $table = $schema->getTable('dav_cal_proxy'); |
|
49 | + if ($table->hasIndex('dav_cal_proxy_ioid')) { |
|
50 | + $table->dropIndex('dav_cal_proxy_ioid'); |
|
51 | + } |
|
52 | 52 | |
53 | - return $schema; |
|
54 | - } |
|
53 | + return $schema; |
|
54 | + } |
|
55 | 55 | } |
@@ -35,21 +35,21 @@ |
||
35 | 35 | * Auto-generated migration step: Please modify to your needs! |
36 | 36 | */ |
37 | 37 | class Version22000Date20210216084241 extends SimpleMigrationStep { |
38 | - /** |
|
39 | - * @param IOutput $output |
|
40 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
41 | - * @param array $options |
|
42 | - * @return null|ISchemaWrapper |
|
43 | - */ |
|
44 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
45 | - /** @var ISchemaWrapper $schema */ |
|
46 | - $schema = $schemaClosure(); |
|
38 | + /** |
|
39 | + * @param IOutput $output |
|
40 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
41 | + * @param array $options |
|
42 | + * @return null|ISchemaWrapper |
|
43 | + */ |
|
44 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
45 | + /** @var ISchemaWrapper $schema */ |
|
46 | + $schema = $schemaClosure(); |
|
47 | 47 | |
48 | - $table = $schema->getTable('share_external'); |
|
49 | - if ($table->hasIndex('sh_external_user')) { |
|
50 | - $table->dropIndex('sh_external_user'); |
|
51 | - } |
|
48 | + $table = $schema->getTable('share_external'); |
|
49 | + if ($table->hasIndex('sh_external_user')) { |
|
50 | + $table->dropIndex('sh_external_user'); |
|
51 | + } |
|
52 | 52 | |
53 | - return $schema; |
|
54 | - } |
|
53 | + return $schema; |
|
54 | + } |
|
55 | 55 | } |
@@ -25,28 +25,28 @@ |
||
25 | 25 | use OCP\IDBConnection; |
26 | 26 | |
27 | 27 | class HomePropagator extends Propagator { |
28 | - private $ignoredBaseFolders; |
|
28 | + private $ignoredBaseFolders; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param \OC\Files\Storage\Storage $storage |
|
32 | - */ |
|
33 | - public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { |
|
34 | - parent::__construct($storage, $connection); |
|
35 | - $this->ignoredBaseFolders = ['files_encryption']; |
|
36 | - } |
|
30 | + /** |
|
31 | + * @param \OC\Files\Storage\Storage $storage |
|
32 | + */ |
|
33 | + public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { |
|
34 | + parent::__construct($storage, $connection); |
|
35 | + $this->ignoredBaseFolders = ['files_encryption']; |
|
36 | + } |
|
37 | 37 | |
38 | 38 | |
39 | - /** |
|
40 | - * @param string $internalPath |
|
41 | - * @param int $time |
|
42 | - * @param int $sizeDifference number of bytes the file has grown |
|
43 | - */ |
|
44 | - public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
45 | - [$baseFolder] = explode('/', $internalPath, 2); |
|
46 | - if (in_array($baseFolder, $this->ignoredBaseFolders)) { |
|
47 | - return []; |
|
48 | - } else { |
|
49 | - parent::propagateChange($internalPath, $time, $sizeDifference); |
|
50 | - } |
|
51 | - } |
|
39 | + /** |
|
40 | + * @param string $internalPath |
|
41 | + * @param int $time |
|
42 | + * @param int $sizeDifference number of bytes the file has grown |
|
43 | + */ |
|
44 | + public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
45 | + [$baseFolder] = explode('/', $internalPath, 2); |
|
46 | + if (in_array($baseFolder, $this->ignoredBaseFolders)) { |
|
47 | + return []; |
|
48 | + } else { |
|
49 | + parent::propagateChange($internalPath, $time, $sizeDifference); |
|
50 | + } |
|
51 | + } |
|
52 | 52 | } |
@@ -28,19 +28,19 @@ |
||
28 | 28 | use OC\Files\Storage\Wrapper\Jail; |
29 | 29 | |
30 | 30 | class JailPropagator extends Propagator { |
31 | - /** |
|
32 | - * @var Jail |
|
33 | - */ |
|
34 | - protected $storage; |
|
31 | + /** |
|
32 | + * @var Jail |
|
33 | + */ |
|
34 | + protected $storage; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $internalPath |
|
38 | - * @param int $time |
|
39 | - * @param int $sizeDifference |
|
40 | - */ |
|
41 | - public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
42 | - /** @var \OC\Files\Storage\Storage $storage */ |
|
43 | - [$storage, $sourceInternalPath] = $this->storage->resolvePath($internalPath); |
|
44 | - $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference); |
|
45 | - } |
|
36 | + /** |
|
37 | + * @param string $internalPath |
|
38 | + * @param int $time |
|
39 | + * @param int $sizeDifference |
|
40 | + */ |
|
41 | + public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
42 | + /** @var \OC\Files\Storage\Storage $storage */ |
|
43 | + [$storage, $sourceInternalPath] = $this->storage->resolvePath($internalPath); |
|
44 | + $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference); |
|
45 | + } |
|
46 | 46 | } |
@@ -31,46 +31,46 @@ |
||
31 | 31 | use Sabre\DAV\Server; |
32 | 32 | |
33 | 33 | class Plugin extends \Sabre\CardDAV\Plugin { |
34 | - public function initialize(Server $server) { |
|
35 | - $server->on('propFind', [$this, 'propFind']); |
|
36 | - parent::initialize($server); |
|
37 | - } |
|
34 | + public function initialize(Server $server) { |
|
35 | + $server->on('propFind', [$this, 'propFind']); |
|
36 | + parent::initialize($server); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * Returns the addressbook home for a given principal |
|
41 | - * |
|
42 | - * @param string $principal |
|
43 | - * @return string|null |
|
44 | - */ |
|
45 | - protected function getAddressbookHomeForPrincipal($principal) { |
|
46 | - if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) { |
|
47 | - [, $principalId] = \Sabre\Uri\split($principal); |
|
48 | - return self::ADDRESSBOOK_ROOT . '/users/' . $principalId; |
|
49 | - } |
|
50 | - if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) { |
|
51 | - [, $principalId] = \Sabre\Uri\split($principal); |
|
52 | - return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId; |
|
53 | - } |
|
54 | - if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) { |
|
55 | - [, $principalId] = \Sabre\Uri\split($principal); |
|
56 | - return self::ADDRESSBOOK_ROOT . '/system/' . $principalId; |
|
57 | - } |
|
58 | - } |
|
39 | + /** |
|
40 | + * Returns the addressbook home for a given principal |
|
41 | + * |
|
42 | + * @param string $principal |
|
43 | + * @return string|null |
|
44 | + */ |
|
45 | + protected function getAddressbookHomeForPrincipal($principal) { |
|
46 | + if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) { |
|
47 | + [, $principalId] = \Sabre\Uri\split($principal); |
|
48 | + return self::ADDRESSBOOK_ROOT . '/users/' . $principalId; |
|
49 | + } |
|
50 | + if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) { |
|
51 | + [, $principalId] = \Sabre\Uri\split($principal); |
|
52 | + return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId; |
|
53 | + } |
|
54 | + if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) { |
|
55 | + [, $principalId] = \Sabre\Uri\split($principal); |
|
56 | + return self::ADDRESSBOOK_ROOT . '/system/' . $principalId; |
|
57 | + } |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Adds all CardDAV-specific properties |
|
62 | - * |
|
63 | - * @param PropFind $propFind |
|
64 | - * @param INode $node |
|
65 | - * @return void |
|
66 | - */ |
|
67 | - public function propFind(PropFind $propFind, INode $node) { |
|
68 | - $ns = '{http://owncloud.org/ns}'; |
|
60 | + /** |
|
61 | + * Adds all CardDAV-specific properties |
|
62 | + * |
|
63 | + * @param PropFind $propFind |
|
64 | + * @param INode $node |
|
65 | + * @return void |
|
66 | + */ |
|
67 | + public function propFind(PropFind $propFind, INode $node) { |
|
68 | + $ns = '{http://owncloud.org/ns}'; |
|
69 | 69 | |
70 | - if ($node instanceof AddressBook) { |
|
71 | - $propFind->handle($ns . 'groups', function () use ($node) { |
|
72 | - return new Groups($node->getContactsGroups()); |
|
73 | - }); |
|
74 | - } |
|
75 | - } |
|
70 | + if ($node instanceof AddressBook) { |
|
71 | + $propFind->handle($ns . 'groups', function () use ($node) { |
|
72 | + return new Groups($node->getContactsGroups()); |
|
73 | + }); |
|
74 | + } |
|
75 | + } |
|
76 | 76 | } |
@@ -36,190 +36,190 @@ |
||
36 | 36 | */ |
37 | 37 | trait PrincipalProxyTrait { |
38 | 38 | |
39 | - /** |
|
40 | - * Returns the list of members for a group-principal |
|
41 | - * |
|
42 | - * @param string $principal |
|
43 | - * @return string[] |
|
44 | - * @throws Exception |
|
45 | - */ |
|
46 | - public function getGroupMemberSet($principal) { |
|
47 | - $members = []; |
|
48 | - |
|
49 | - if ($this->isProxyPrincipal($principal)) { |
|
50 | - $realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal); |
|
51 | - $principalArray = $this->getPrincipalByPath($realPrincipal); |
|
52 | - if (!$principalArray) { |
|
53 | - throw new Exception('Principal not found'); |
|
54 | - } |
|
55 | - |
|
56 | - $proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']); |
|
57 | - foreach ($proxies as $proxy) { |
|
58 | - if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) { |
|
59 | - $members[] = $proxy->getProxyId(); |
|
60 | - } |
|
61 | - |
|
62 | - if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) { |
|
63 | - $members[] = $proxy->getProxyId(); |
|
64 | - } |
|
65 | - } |
|
66 | - } |
|
67 | - |
|
68 | - return $members; |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * Returns the list of groups a principal is a member of |
|
73 | - * |
|
74 | - * @param string $principal |
|
75 | - * @param bool $needGroups |
|
76 | - * @return array |
|
77 | - * @throws Exception |
|
78 | - */ |
|
79 | - public function getGroupMembership($principal, $needGroups = false) { |
|
80 | - [$prefix, $name] = \Sabre\Uri\split($principal); |
|
81 | - |
|
82 | - if ($prefix !== $this->principalPrefix) { |
|
83 | - return []; |
|
84 | - } |
|
85 | - |
|
86 | - $principalArray = $this->getPrincipalByPath($principal); |
|
87 | - if (!$principalArray) { |
|
88 | - throw new Exception('Principal not found'); |
|
89 | - } |
|
90 | - |
|
91 | - $groups = []; |
|
92 | - $proxies = $this->proxyMapper->getProxiesFor($principal); |
|
93 | - foreach ($proxies as $proxy) { |
|
94 | - if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) { |
|
95 | - $groups[] = $proxy->getOwnerId() . '/calendar-proxy-read'; |
|
96 | - } |
|
97 | - |
|
98 | - if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) { |
|
99 | - $groups[] = $proxy->getOwnerId() . '/calendar-proxy-write'; |
|
100 | - } |
|
101 | - } |
|
102 | - |
|
103 | - return $groups; |
|
104 | - } |
|
105 | - |
|
106 | - /** |
|
107 | - * Updates the list of group members for a group principal. |
|
108 | - * |
|
109 | - * The principals should be passed as a list of uri's. |
|
110 | - * |
|
111 | - * @param string $principal |
|
112 | - * @param string[] $members |
|
113 | - * @throws Exception |
|
114 | - */ |
|
115 | - public function setGroupMemberSet($principal, array $members) { |
|
116 | - [$principalUri, $target] = \Sabre\Uri\split($principal); |
|
117 | - |
|
118 | - if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') { |
|
119 | - throw new Exception('Setting members of the group is not supported yet'); |
|
120 | - } |
|
121 | - |
|
122 | - $masterPrincipalArray = $this->getPrincipalByPath($principalUri); |
|
123 | - if (!$masterPrincipalArray) { |
|
124 | - throw new Exception('Principal not found'); |
|
125 | - } |
|
126 | - |
|
127 | - $permission = ProxyMapper::PERMISSION_READ; |
|
128 | - if ($target === 'calendar-proxy-write') { |
|
129 | - $permission |= ProxyMapper::PERMISSION_WRITE; |
|
130 | - } |
|
131 | - |
|
132 | - [$prefix, $owner] = \Sabre\Uri\split($principalUri); |
|
133 | - $proxies = $this->proxyMapper->getProxiesOf($principalUri); |
|
134 | - |
|
135 | - foreach ($members as $member) { |
|
136 | - [$prefix, $name] = \Sabre\Uri\split($member); |
|
137 | - |
|
138 | - if ($prefix !== $this->principalPrefix) { |
|
139 | - throw new Exception('Invalid member group prefix: ' . $prefix); |
|
140 | - } |
|
141 | - |
|
142 | - $principalArray = $this->getPrincipalByPath($member); |
|
143 | - if (!$principalArray) { |
|
144 | - throw new Exception('Principal not found'); |
|
145 | - } |
|
146 | - |
|
147 | - $found = false; |
|
148 | - foreach ($proxies as $proxy) { |
|
149 | - if ($proxy->getProxyId() === $member) { |
|
150 | - $found = true; |
|
151 | - $proxy->setPermissions($proxy->getPermissions() | $permission); |
|
152 | - $this->proxyMapper->update($proxy); |
|
153 | - |
|
154 | - $proxies = array_filter($proxies, function (Proxy $p) use ($proxy) { |
|
155 | - return $p->getId() !== $proxy->getId(); |
|
156 | - }); |
|
157 | - break; |
|
158 | - } |
|
159 | - } |
|
160 | - |
|
161 | - if ($found === false) { |
|
162 | - $proxy = new Proxy(); |
|
163 | - $proxy->setOwnerId($principalUri); |
|
164 | - $proxy->setProxyId($member); |
|
165 | - $proxy->setPermissions($permission); |
|
166 | - $this->proxyMapper->insert($proxy); |
|
167 | - } |
|
168 | - } |
|
169 | - |
|
170 | - // Delete all remaining proxies |
|
171 | - foreach ($proxies as $proxy) { |
|
172 | - // Write and Read Proxies have individual requests, |
|
173 | - // so only delete proxies of this permission |
|
174 | - if ($proxy->getPermissions() === $permission) { |
|
175 | - $this->proxyMapper->delete($proxy); |
|
176 | - } |
|
177 | - } |
|
178 | - } |
|
179 | - |
|
180 | - /** |
|
181 | - * @param string $principalUri |
|
182 | - * @return bool |
|
183 | - */ |
|
184 | - private function isProxyPrincipal(string $principalUri):bool { |
|
185 | - [$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri); |
|
186 | - [$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri); |
|
187 | - |
|
188 | - if (!isset($prefix) || !isset($userId)) { |
|
189 | - return false; |
|
190 | - } |
|
191 | - if ($prefix !== $this->principalPrefix) { |
|
192 | - return false; |
|
193 | - } |
|
194 | - |
|
195 | - return $proxy === 'calendar-proxy-read' |
|
196 | - || $proxy === 'calendar-proxy-write'; |
|
197 | - } |
|
198 | - |
|
199 | - /** |
|
200 | - * @param string $principalUri |
|
201 | - * @return bool |
|
202 | - */ |
|
203 | - private function isReadProxyPrincipal(string $principalUri):bool { |
|
204 | - [, $proxy] = \Sabre\Uri\split($principalUri); |
|
205 | - return $proxy === 'calendar-proxy-read'; |
|
206 | - } |
|
207 | - |
|
208 | - /** |
|
209 | - * @param string $principalUri |
|
210 | - * @return bool |
|
211 | - */ |
|
212 | - private function isWriteProxyPrincipal(string $principalUri):bool { |
|
213 | - [, $proxy] = \Sabre\Uri\split($principalUri); |
|
214 | - return $proxy === 'calendar-proxy-write'; |
|
215 | - } |
|
216 | - |
|
217 | - /** |
|
218 | - * @param string $principalUri |
|
219 | - * @return string |
|
220 | - */ |
|
221 | - private function getPrincipalUriFromProxyPrincipal(string $principalUri):string { |
|
222 | - [$realPrincipalUri, ] = \Sabre\Uri\split($principalUri); |
|
223 | - return $realPrincipalUri; |
|
224 | - } |
|
39 | + /** |
|
40 | + * Returns the list of members for a group-principal |
|
41 | + * |
|
42 | + * @param string $principal |
|
43 | + * @return string[] |
|
44 | + * @throws Exception |
|
45 | + */ |
|
46 | + public function getGroupMemberSet($principal) { |
|
47 | + $members = []; |
|
48 | + |
|
49 | + if ($this->isProxyPrincipal($principal)) { |
|
50 | + $realPrincipal = $this->getPrincipalUriFromProxyPrincipal($principal); |
|
51 | + $principalArray = $this->getPrincipalByPath($realPrincipal); |
|
52 | + if (!$principalArray) { |
|
53 | + throw new Exception('Principal not found'); |
|
54 | + } |
|
55 | + |
|
56 | + $proxies = $this->proxyMapper->getProxiesOf($principalArray['uri']); |
|
57 | + foreach ($proxies as $proxy) { |
|
58 | + if ($this->isReadProxyPrincipal($principal) && $proxy->getPermissions() === ProxyMapper::PERMISSION_READ) { |
|
59 | + $members[] = $proxy->getProxyId(); |
|
60 | + } |
|
61 | + |
|
62 | + if ($this->isWriteProxyPrincipal($principal) && $proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) { |
|
63 | + $members[] = $proxy->getProxyId(); |
|
64 | + } |
|
65 | + } |
|
66 | + } |
|
67 | + |
|
68 | + return $members; |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * Returns the list of groups a principal is a member of |
|
73 | + * |
|
74 | + * @param string $principal |
|
75 | + * @param bool $needGroups |
|
76 | + * @return array |
|
77 | + * @throws Exception |
|
78 | + */ |
|
79 | + public function getGroupMembership($principal, $needGroups = false) { |
|
80 | + [$prefix, $name] = \Sabre\Uri\split($principal); |
|
81 | + |
|
82 | + if ($prefix !== $this->principalPrefix) { |
|
83 | + return []; |
|
84 | + } |
|
85 | + |
|
86 | + $principalArray = $this->getPrincipalByPath($principal); |
|
87 | + if (!$principalArray) { |
|
88 | + throw new Exception('Principal not found'); |
|
89 | + } |
|
90 | + |
|
91 | + $groups = []; |
|
92 | + $proxies = $this->proxyMapper->getProxiesFor($principal); |
|
93 | + foreach ($proxies as $proxy) { |
|
94 | + if ($proxy->getPermissions() === ProxyMapper::PERMISSION_READ) { |
|
95 | + $groups[] = $proxy->getOwnerId() . '/calendar-proxy-read'; |
|
96 | + } |
|
97 | + |
|
98 | + if ($proxy->getPermissions() === (ProxyMapper::PERMISSION_READ | ProxyMapper::PERMISSION_WRITE)) { |
|
99 | + $groups[] = $proxy->getOwnerId() . '/calendar-proxy-write'; |
|
100 | + } |
|
101 | + } |
|
102 | + |
|
103 | + return $groups; |
|
104 | + } |
|
105 | + |
|
106 | + /** |
|
107 | + * Updates the list of group members for a group principal. |
|
108 | + * |
|
109 | + * The principals should be passed as a list of uri's. |
|
110 | + * |
|
111 | + * @param string $principal |
|
112 | + * @param string[] $members |
|
113 | + * @throws Exception |
|
114 | + */ |
|
115 | + public function setGroupMemberSet($principal, array $members) { |
|
116 | + [$principalUri, $target] = \Sabre\Uri\split($principal); |
|
117 | + |
|
118 | + if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') { |
|
119 | + throw new Exception('Setting members of the group is not supported yet'); |
|
120 | + } |
|
121 | + |
|
122 | + $masterPrincipalArray = $this->getPrincipalByPath($principalUri); |
|
123 | + if (!$masterPrincipalArray) { |
|
124 | + throw new Exception('Principal not found'); |
|
125 | + } |
|
126 | + |
|
127 | + $permission = ProxyMapper::PERMISSION_READ; |
|
128 | + if ($target === 'calendar-proxy-write') { |
|
129 | + $permission |= ProxyMapper::PERMISSION_WRITE; |
|
130 | + } |
|
131 | + |
|
132 | + [$prefix, $owner] = \Sabre\Uri\split($principalUri); |
|
133 | + $proxies = $this->proxyMapper->getProxiesOf($principalUri); |
|
134 | + |
|
135 | + foreach ($members as $member) { |
|
136 | + [$prefix, $name] = \Sabre\Uri\split($member); |
|
137 | + |
|
138 | + if ($prefix !== $this->principalPrefix) { |
|
139 | + throw new Exception('Invalid member group prefix: ' . $prefix); |
|
140 | + } |
|
141 | + |
|
142 | + $principalArray = $this->getPrincipalByPath($member); |
|
143 | + if (!$principalArray) { |
|
144 | + throw new Exception('Principal not found'); |
|
145 | + } |
|
146 | + |
|
147 | + $found = false; |
|
148 | + foreach ($proxies as $proxy) { |
|
149 | + if ($proxy->getProxyId() === $member) { |
|
150 | + $found = true; |
|
151 | + $proxy->setPermissions($proxy->getPermissions() | $permission); |
|
152 | + $this->proxyMapper->update($proxy); |
|
153 | + |
|
154 | + $proxies = array_filter($proxies, function (Proxy $p) use ($proxy) { |
|
155 | + return $p->getId() !== $proxy->getId(); |
|
156 | + }); |
|
157 | + break; |
|
158 | + } |
|
159 | + } |
|
160 | + |
|
161 | + if ($found === false) { |
|
162 | + $proxy = new Proxy(); |
|
163 | + $proxy->setOwnerId($principalUri); |
|
164 | + $proxy->setProxyId($member); |
|
165 | + $proxy->setPermissions($permission); |
|
166 | + $this->proxyMapper->insert($proxy); |
|
167 | + } |
|
168 | + } |
|
169 | + |
|
170 | + // Delete all remaining proxies |
|
171 | + foreach ($proxies as $proxy) { |
|
172 | + // Write and Read Proxies have individual requests, |
|
173 | + // so only delete proxies of this permission |
|
174 | + if ($proxy->getPermissions() === $permission) { |
|
175 | + $this->proxyMapper->delete($proxy); |
|
176 | + } |
|
177 | + } |
|
178 | + } |
|
179 | + |
|
180 | + /** |
|
181 | + * @param string $principalUri |
|
182 | + * @return bool |
|
183 | + */ |
|
184 | + private function isProxyPrincipal(string $principalUri):bool { |
|
185 | + [$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri); |
|
186 | + [$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri); |
|
187 | + |
|
188 | + if (!isset($prefix) || !isset($userId)) { |
|
189 | + return false; |
|
190 | + } |
|
191 | + if ($prefix !== $this->principalPrefix) { |
|
192 | + return false; |
|
193 | + } |
|
194 | + |
|
195 | + return $proxy === 'calendar-proxy-read' |
|
196 | + || $proxy === 'calendar-proxy-write'; |
|
197 | + } |
|
198 | + |
|
199 | + /** |
|
200 | + * @param string $principalUri |
|
201 | + * @return bool |
|
202 | + */ |
|
203 | + private function isReadProxyPrincipal(string $principalUri):bool { |
|
204 | + [, $proxy] = \Sabre\Uri\split($principalUri); |
|
205 | + return $proxy === 'calendar-proxy-read'; |
|
206 | + } |
|
207 | + |
|
208 | + /** |
|
209 | + * @param string $principalUri |
|
210 | + * @return bool |
|
211 | + */ |
|
212 | + private function isWriteProxyPrincipal(string $principalUri):bool { |
|
213 | + [, $proxy] = \Sabre\Uri\split($principalUri); |
|
214 | + return $proxy === 'calendar-proxy-write'; |
|
215 | + } |
|
216 | + |
|
217 | + /** |
|
218 | + * @param string $principalUri |
|
219 | + * @return string |
|
220 | + */ |
|
221 | + private function getPrincipalUriFromProxyPrincipal(string $principalUri):string { |
|
222 | + [$realPrincipalUri, ] = \Sabre\Uri\split($principalUri); |
|
223 | + return $realPrincipalUri; |
|
224 | + } |
|
225 | 225 | } |
@@ -26,30 +26,30 @@ |
||
26 | 26 | namespace OCA\DAV\CalDAV; |
27 | 27 | |
28 | 28 | class Plugin extends \Sabre\CalDAV\Plugin { |
29 | - public const SYSTEM_CALENDAR_ROOT = 'system-calendars'; |
|
29 | + public const SYSTEM_CALENDAR_ROOT = 'system-calendars'; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Returns the path to a principal's calendar home. |
|
33 | - * |
|
34 | - * The return url must not end with a slash. |
|
35 | - * This function should return null in case a principal did not have |
|
36 | - * a calendar home. |
|
37 | - * |
|
38 | - * @param string $principalUrl |
|
39 | - * @return string|null |
|
40 | - */ |
|
41 | - public function getCalendarHomeForPrincipal($principalUrl) { |
|
42 | - if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) { |
|
43 | - [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
44 | - return self::CALENDAR_ROOT . '/' . $principalId; |
|
45 | - } |
|
46 | - if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) { |
|
47 | - [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
48 | - return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId; |
|
49 | - } |
|
50 | - if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) { |
|
51 | - [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
52 | - return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId; |
|
53 | - } |
|
54 | - } |
|
31 | + /** |
|
32 | + * Returns the path to a principal's calendar home. |
|
33 | + * |
|
34 | + * The return url must not end with a slash. |
|
35 | + * This function should return null in case a principal did not have |
|
36 | + * a calendar home. |
|
37 | + * |
|
38 | + * @param string $principalUrl |
|
39 | + * @return string|null |
|
40 | + */ |
|
41 | + public function getCalendarHomeForPrincipal($principalUrl) { |
|
42 | + if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) { |
|
43 | + [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
44 | + return self::CALENDAR_ROOT . '/' . $principalId; |
|
45 | + } |
|
46 | + if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) { |
|
47 | + [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
48 | + return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId; |
|
49 | + } |
|
50 | + if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) { |
|
51 | + [, $principalId] = \Sabre\Uri\split($principalUrl); |
|
52 | + return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId; |
|
53 | + } |
|
54 | + } |
|
55 | 55 | } |
@@ -28,11 +28,11 @@ |
||
28 | 28 | use OCP\WorkflowEngine\IManager; |
29 | 29 | |
30 | 30 | class Personal extends ASettings { |
31 | - public function getScope(): int { |
|
32 | - return IManager::SCOPE_USER; |
|
33 | - } |
|
31 | + public function getScope(): int { |
|
32 | + return IManager::SCOPE_USER; |
|
33 | + } |
|
34 | 34 | |
35 | - public function getSection(): ?string { |
|
36 | - return $this->manager->isUserScopeEnabled() ? 'workflow' : null; |
|
37 | - } |
|
35 | + public function getSection(): ?string { |
|
36 | + return $this->manager->isUserScopeEnabled() ? 'workflow' : null; |
|
37 | + } |
|
38 | 38 | } |