Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable13] fixes dav share issue with owner #12460

Merged
merged 2 commits into from
Nov 15, 2018
Merged

[stable13] fixes dav share issue with owner #12460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b5726
fixes dav share issue with owner
georgehrke Nov 14, 2018
2a31d84
fix caldav tests
georgehrke Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions apps/dav/lib/CalDAV/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ public function getACL() {
];
}

if (!$this->isShared()) {
return $acl;
}

if ($this->getOwner() !== parent::getOwner()) {
$acl[] = [
'privilege' => '{DAV:}read',
Expand Down Expand Up @@ -168,14 +172,9 @@ public function getACL() {
}

$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);

if (!$this->isShared()) {
return $acl;
}

$allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/public'];
return array_filter($acl, function($rule) use ($allowedPrincipals) {
return in_array($rule['principal'], $allowedPrincipals);
return \in_array($rule['principal'], $allowedPrincipals, true);
});
}

Expand Down
21 changes: 13 additions & 8 deletions apps/dav/lib/CardDAV/AddressBook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,17 @@ public function getACL() {
'privilege' => '{DAV:}read',
'principal' => $this->getOwner(),
'protected' => true,
]];
$acl[] = [
],[
'privilege' => '{DAV:}write',
'principal' => $this->getOwner(),
'protected' => true,
];
]
];

if (!$this->isShared()) {
return $acl;
}

if ($this->getOwner() !== parent::getOwner()) {
$acl[] = [
'privilege' => '{DAV:}read',
Expand All @@ -133,11 +138,11 @@ public function getACL() {
];
}

if ($this->isShared()) {
return $acl;
}

return $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
$acl = $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
$allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/system'];
return array_filter($acl, function($rule) use ($allowedPrincipals) {
return \in_array($rule['principal'], $allowedPrincipals, true);
});
}

public function getChildACL() {
Expand Down
10 changes: 5 additions & 5 deletions apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<description>Shared calendar exists</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$calendarhome1:/shared/</ruri>
<ruri>$calendarhome2:/shared_shared_by_user01/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Expand Down Expand Up @@ -193,7 +193,7 @@
<description>Sharee creates event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/calendars/read-write/5.ics</filepath>
Expand Down Expand Up @@ -235,7 +235,7 @@
<description>Sharee sees changed event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$calendarhome1:/shared/1.ics</ruri>
<ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
Expand Down Expand Up @@ -263,7 +263,7 @@
<description>Sharee sees new event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$calendarhome1:/shared/2.ics</ruri>
<ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
Expand All @@ -277,7 +277,7 @@
<description>Sharee changes event</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome1:/shared/2.ics</ruri>
<ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/sharing/calendars/read-write/8.ics</filepath>
Expand Down
26 changes: 13 additions & 13 deletions apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<description>POST invitation</description>
<request>
<method>POST</method>
<ruri>$addressbookpath1:</ruri>
<ruri>$addressbookhome1:/addressbook/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/1.xml</filepath>
Expand All @@ -31,7 +31,7 @@
<description>Shared addressbook exists</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$addressbookpath1:/</ruri>
<ruri>$addressbookhome2:/addressbook_shared_by_user01/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Expand Down Expand Up @@ -62,7 +62,7 @@
</test>

<test name='4a'>
<description>Shared calendar exists Depth:1</description>
<description>Shared addressbook exists Depth:1</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$addressbookhome2:/</ruri>
Expand Down Expand Up @@ -100,7 +100,7 @@
</test>

<test name='5'>
<description>Original calendar unchanged</description>
<description>Original addressbook unchanged</description>
<request>
<method>PROPFIND</method>
<ruri>$addressbookpath1:</ruri>
Expand All @@ -126,7 +126,7 @@
<description>Sharee creates contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$addressbookpath1:/1.vcf</ruri>
<ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/6.vcf</filepath>
Expand Down Expand Up @@ -171,7 +171,7 @@
<description>Sharee sees changed contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$addressbookpath1:/1.vcf</ruri>
<ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
Expand All @@ -183,7 +183,7 @@
</test>

<test name='10'>
<description>Sharer creates event</description>
<description>Sharer creates contact</description>
<request>
<method>PUT</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
Expand All @@ -197,10 +197,10 @@
</request>
</test>
<test name='11'>
<description>Sharee sees new event</description>
<description>Sharee sees new contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GET</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
<ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
Expand All @@ -211,10 +211,10 @@
</request>
</test>
<test name='12'>
<description>Sharee changes event</description>
<description>Sharee changes contact</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
<ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/read-write/9.vcf</filepath>
Expand All @@ -225,7 +225,7 @@
</request>
</test>
<test name='13'>
<description>Sharer sees changed event</description>
<description>Sharer sees changed contact</description>
<request>
<method>GET</method>
<ruri>$addressbookpath1:/2.vcf</ruri>
Expand Down Expand Up @@ -281,7 +281,7 @@
</verify> </request>
</test>
<test name='16'>
<description>Shared calendar no longer exists Depth:1</description>
<description>Shared addressbook no longer exists Depth:1</description>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPFIND</method>
<ruri>$addressbookhome2:</ruri>
Expand Down