Skip to content

fix(xmpp) unescape HTML entities in JSON messages #2624

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
saghul merged 1 commit into from
Jan 27, 2025
Merged

fix(xmpp) unescape HTML entities in JSON messages #2624

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
5 changes: 4 additions & 1 deletion modules/xmpp/xmpp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { safeJsonParse } from '@jitsi/js-utils/json';
import { getLogger } from '@jitsi/logger';
import $ from 'jquery';
import { unescape } from 'lodash-es';
import { $msg, Strophe } from 'strophe.js';
import 'strophejs-plugin-disco';

Expand Down Expand Up @@ -1019,7 +1020,9 @@ export default class XMPP extends Listenable {
}

try {
const json = safeJsonParse(jsonString);
// Note: we use `unescape` to also convert HTML entities to UTF-8 since
// Jigasi seems to encode them like that in some circumstances.
const json = safeJsonParse(unescape(jsonString));

// Handle non-exception-throwing cases:
// Neither JSON.parse(false) or JSON.parse(1234) throw errors,
Expand Down
Loading