Skip to content

fix(caldav): Do not load IMipPlugin before user auth and session is c… #45098

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

Merged
SebastianKrupinski merged 5 commits into from
May 4, 2024
Merged

fix(caldav): Do not load IMipPlugin before user auth and session is c… #45098

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9859a44
fix(caldav): Do not load IMipPlugin before user auth and session is c…
SebastianKrupinski Apr 29, 2024
f44b73e
fix(caldav): Use userSession instead of userId
SebastianKrupinski Apr 30, 2024
d25039e
fix(caldav): Test if user object is not null and trim senderName
SebastianKrupinski May 1, 2024
2088b49
fix(caldav): Fixed phpUnit to use userSession instead of userId and u…
SebastianKrupinski May 2, 2024
51d338b
fix(caldav): Fixed formatting to comply with php-cs
SebastianKrupinski May 3, 2024
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
Prev Previous commit
Next Next commit
fix(caldav): Test if user object is not null and trim senderName 
Signed-off-by: SebastianKrupinski <[email protected]>
  • Loading branch information
@SebastianKrupinski
SebastianKrupinski committed May 1, 2024
commit d25039ec1ad8560d6948cb3650e0f92ab4d17e15
9 changes: 6 additions & 3 deletions apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,16 @@ public function schedule(Message $iTipMessage) {
// Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
// If the iTIP message senderName is null or empty use the user session name as the senderName
if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of trim cannot be null, possibly null value provided
$senderName = $iTipMessage->senderName->getValue();
$senderName = trim($iTipMessage->senderName->getValue());

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of trim cannot be null, possibly null value provided
}
elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
$senderName = $iTipMessage->senderName;
$senderName = trim($iTipMessage->senderName);
}
elseif ($this->userSession->getUser() !== null) {
$senderName = trim($this->userSession->getUser()->getDisplayName());

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getDisplayName on possibly null value
}
else {
$senderName = $this->userSession->getUser()->getDisplayName();
$senderName = '';
}

$sender = substr($iTipMessage->sender, 7);
Expand Down