fix(caldav): Do not load IMipPlugin before user auth and session is c… by SebastianKrupinski · Pull Request #45098 · nextcloud/server

SebastianKrupinski · 2024-04-29T18:32:43Z

Resolves: [Bug]: From Name is not setting properly in Calendar invitations created from Thunderbird #45081

Summary

Do not load IMipPlugin before user is authenticated and user session is initilized

…reated Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>


 // calendar plugins
 if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+ $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));



 // calendar plugins
 if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+ $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig()));


 \OC::$server->getCommentsManager(),
 $userSession
 ));
+ if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {


 \OC::$server->getCommentsManager(),
 $userSession
 ));
+ if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {


Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

- $senderName = $senderName->getValue() ?? null;
+ // 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()))) {


tcitworld · 2024-04-30T15:21:27Z

+ $senderName = $iTipMessage->senderName;
+ }
+ else {
+ $senderName = $this->userSession->getUser()->getDisplayName();


Might be an opportunity to trim $senderName afterwards for all cases.

tcitworld · 2024-04-30T15:25:03Z

+ $senderName = $iTipMessage->senderName;
+ }
+ else {
+ $senderName = $this->userSession->getUser()->getDisplayName();


Even though this should be safe when registered through dav server, it might not be when used through apps/dav/appinfo/v1/caldav.php (very legacy stuff, but still). I'd add a check to see if getUser() isn't null (and psalm would be happy).

SebastianKrupinski · 2024-04-30T19:25:58Z

@tcitworld thank you for the input. I will apply your recommendations.

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

tcitworld · 2024-05-02T07:00:06Z

OCA\DAV\Tests\unit\CalDAV\Schedule\IMipPluginTest needs to be changed with the new constructor.

…serManager Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

tcitworld

Lint fix, otherwise ✅

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

+ // 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()))) {
+ $senderName = trim($iTipMessage->senderName->getValue());


+ } elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
+ $senderName = trim($iTipMessage->senderName);
+ } elseif ($this->userSession->getUser() !== null) {
+ $senderName = trim($this->userSession->getUser()->getDisplayName());


welcome · 2024-05-04T13:36:39Z

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

susnux · 2024-09-02T15:56:29Z

@SebastianKrupinski could we backport this to stable29 ?

SebastianKrupinski · 2024-09-02T16:10:46Z

@SebastianKrupinski could we backport this to stable29 ?

I have no issue back porting it... Let me just ask if there is any reason we shoudn't

ChristophWurst · 2024-09-02T16:44:08Z

Go

SebastianKrupinski · 2024-09-02T16:52:44Z

/backport to stable29

SebastianKrupinski · 2024-09-02T16:52:52Z

/backport to stable28

SebastianKrupinski · 2024-09-05T20:16:12Z

Backport for 29 #47790

Backport for 28 #47791

fix(caldav): Do not load IMipPlugin before user auth and session is c…
9859a44
…reated Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

SebastianKrupinski requested review from ChristophWurst and miaulalala April 29, 2024 18:33

github-advanced-securityAI found potential problems Apr 29, 2024
View reviewed changes

fix(caldav): Use userSession instead of userId
f44b73e
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

SebastianKrupinski requested a review from tcitworld as a code owner April 30, 2024 14:30

github-advanced-securityAI found potential problems Apr 30, 2024
View reviewed changes

tcitworld reviewed Apr 30, 2024
View reviewed changes

fix(caldav): Test if user object is not null and trim senderName
d25039e
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

github-advanced-securityAI found potential problems May 1, 2024
View reviewed changes

Comment threadapps/dav/lib/CalDAV/Schedule/IMipPlugin.php Fixed
Comment threadapps/dav/lib/CalDAV/Schedule/IMipPlugin.php Fixed

fix(caldav): Fixed phpUnit to use userSession instead of userId and u…
2088b49
…serManager Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

SebastianKrupinski requested a review from tcitworld May 3, 2024 10:19

tcitworld approved these changes May 3, 2024
View reviewed changes

ChristophWurst approved these changes May 3, 2024
View reviewed changes

fix(caldav): Fixed formatting to comply with php-cs
51d338b
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

github-advanced-securityAI found potential problems May 3, 2024
View reviewed changes

SebastianKrupinski merged commit c17fcc4 into masterMay 4, 2024

SebastianKrupinski deleted the fix/issue-45081 branch May 4, 2024 13:36

SebastianKrupinski added this to the Nextcloud 30 milestone Jul 23, 2024

blizzz mentioned this pull request Jul 24, 2024
30.0.0 beta 1 #46713
Merged

SebastianKrupinski mentioned this pull request Sep 2, 2024
attempt to add a meaningful user name to the from field of a calendar… #47684
Closed
5 tasks

backportbotBot added the backport-request label Sep 2, 2024

nextcloud deleted a comment from backportbotBotSep 2, 2024

Uh oh!

Uh oh!

Conversation

SebastianKrupinski commented Apr 29, 2024

Summary

Uh oh!

Check notice

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Check notice

Uh oh!

tcitworldApr 30, 2024

Choose a reason for hiding this comment

Uh oh!

tcitworldApr 30, 2024

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski commented Apr 30, 2024

Uh oh!

Uh oh!

Uh oh!

tcitworld commented May 2, 2024

Uh oh!

tcitworld left a comment

Choose a reason for hiding this comment

Uh oh!

Check notice

Check notice

welcomeBot commented May 4, 2024

Uh oh!

susnux commented Sep 2, 2024

Uh oh!

SebastianKrupinski commented Sep 2, 2024

Uh oh!

ChristophWurst commented Sep 2, 2024

Uh oh!

SebastianKrupinski commented Sep 2, 2024

Uh oh!

SebastianKrupinski commented Sep 2, 2024

Uh oh!

SebastianKrupinski commented Sep 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants