Skip to content

[stable22] fix(dav): check if principal has email address before accessing it #36388

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

Closed
backportbot-nextcloud wants to merge 1 commit into from
Closed

[stable22] fix(dav): check if principal has email address before accessing it #36388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix(dav): check if principal has email address before accessing it 
Ref nextcloud/calendar#4811

Signed-off-by: Richard Steinmetz <[email protected]>
  • Loading branch information
@st3iny @backportbot-nextcloud
st3iny authored and backportbot-nextcloud[bot] committed Jan 26, 2023
commit 31fe1dafb64529548ecb5d2abfebfd3bedfcbd0e
4 changes: 2 additions & 2 deletions apps/dav/lib/Connector/Sabre/Principal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ public function getCircleMembership($principal):array {
public function getEmailAddressesOfPrincipal(array $principal): array {
$emailAddresses = [];

if (($primaryAddress = $principal['{http://sabredav.org/ns}email-address'])) {
$emailAddresses[] = $primaryAddress;
if (isset($principal['{http://sabredav.org/ns}email-address'])) {
$emailAddresses[] = $principal['{http://sabredav.org/ns}email-address'];
}

if (isset($principal['{DAV:}alternate-URI-set'])) {
Expand Down