Skip to content

Merge from Upstream#128

Open
alanpoon wants to merge 1 commit intoProject-Robius-China:mainfrom
alanpoon:feature/merge-upstream-features
Open

Merge from Upstream#128
alanpoon wants to merge 1 commit intoProject-Robius-China:mainfrom
alanpoon:feature/merge-upstream-features

Conversation

@alanpoon
Copy link
Copy Markdown

  1. ImageViewer - Open an image and check the auto-show/hide overlay behavior
  2. Context menu scroll blocking - Open a context menu (right-click on a message or room) and try scrolling
  3. App icons - Check the app icon appears correctly (visible in dock/taskbar)

Fixes an issue where the `formatted_caption()` for files, audio, and video messages was injected into the native HTML renderer (`show_html`) without explicitly verifying that the `format` type was `MessageFormat::Html`. This would allow a malicious actor to craft a payload with a non-HTML format type that contained malicious HTML tags, bypassing client-side sanitizers but executing in the UI.

Now, the `format` is explicitly verified, falling back safely to plaintext via `htmlize::escape_text` if not explicitly declared as HTML.

Co-authored-by: kevinaboos <1139460+kevinaboos@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant