Skip to content

fix(dav): handle HTML in CalDAV invitations - #56925

Merged
kesselb merged 1 commit into
masterfrom
fix/dav/escape-summary-description-location
Dec 10, 2025
Merged

fix(dav): handle HTML in CalDAV invitations#56925
kesselb merged 1 commit into
masterfrom
fix/dav/escape-summary-description-location

Conversation

@ChristophWurst

Copy link
Copy Markdown
Member
  • Resolves: #

Summary

This avoids rendering issues with certain characters.

TODO

  • ...

Checklist

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

/backport to stable32

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

/backport to stable31

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

/backport to stable30

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

/backport to stable29

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

/backport to stable28

@tcitworldtcitworld left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem with that, but shouldn't it be handled directly by addBodyListItem instead?

@ChristophWurst

Copy link
Copy Markdown
MemberAuthor

No problem with that, but shouldn't it be handled directly by addBodyListItem instead?

No because sometimes we want the HTML to render, e.g. for the strike-through formatting of event updates.

Comment threadapps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php Outdated
@kesselb
kesselbforce-pushed the fix/dav/escape-summary-description-location branch from d24a1d9 to 66bbd40CompareDecember 9, 2025 19:18
@kesselb

Copy link
Copy Markdown
Contributor

Error: apps/dav/lib/CalDAV/Schedule/IMipService.php:79:109: LessSpecificReturnType: The inferred return type 'string' for OCA\DAV\CalDAV\Schedule\IMipService::generateDiffString is more specific than the declared return type 'null|string' (see https://psalm.dev/088)

@kesselb

Copy link
Copy Markdown
Contributor

Error: apps/dav/lib/CalDAV/Schedule/IMipService.php:79:109: LessSpecificReturnType: The inferred return type 'string' for OCA\DAV\CalDAV\Schedule\IMipService::generateDiffString is more specific than the declared return type 'null|string' (see https://psalm.dev/088)

I assume Psalm was unable to detect the return type for Sabre\VObject\Property::getValue. Now with the value being wrapped in htmlspecialchars it's always a string. Yet I'm not sure if we can trust sabre's return type annotations 🙈

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 10, 2025
Comment threadapps/dav/lib/CalDAV/Schedule/IMipService.php Outdated
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
ChristophWurstforce-pushed the fix/dav/escape-summary-description-location branch from 766027b to dac8818CompareDecember 10, 2025 11:51
@kesselb
kesselb merged commit ac4e82d into masterDec 10, 2025
184 of 189 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: caldavRelated to CalDAV internalsfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@ChristophWurst@kesselb@nickvergessen@tcitworld@SebastianKrupinski