Skip to content
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

Prevent html injection using user tag #452

Merged
merged 2 commits into from
May 20, 2024
Merged

Prevent html injection using user tag #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a4938e
Prevent html injection using user tag
Mitchdev Apr 11, 2024
0ea3282
use encodeUrl
Mitchdev Apr 20, 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
17 changes: 17 additions & 0 deletions assets/chat/js/encodeUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// stolen from angular.js
// https://github.com/angular/angular.js/blob/v1.3.14/src/ngSanitize/sanitize.js#L435
function encodeUrl(value) {
return value
.replace(/&/g, '&')
.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, (v) => {
const hi = v.charCodeAt(0);
const low = v.charCodeAt(1);
return `&#${(hi - 0xd800) * 0x400 + (low - 0xdc00) + 0x10000};`;
})
.replace(/([^#-~| |!])/g, (v) => `&#${v.charCodeAt(0)};`)
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
}

export default encodeUrl;
20 changes: 3 additions & 17 deletions assets/chat/js/formatters/UrlFormatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
import $ from 'jquery';
import { linkregex } from '../regex';
import { HashLinkConverter } from '../hashlinkconverter';
import encodeUrl from '../encodeUrl';

export default class UrlFormatter {
constructor() {
this.hashLinkConverter = new HashLinkConverter();
this.elem = $('<div></div>');
}

// stolen from angular.js
// https://github.com/angular/angular.js/blob/v1.3.14/src/ngSanitize/sanitize.js#L435
encodeUrl(value) {
return value
.replace(/&/g, '&amp;')
.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, (v) => {
const hi = v.charCodeAt(0);
const low = v.charCodeAt(1);
return `&#${(hi - 0xd800) * 0x400 + (low - 0xdc00) + 0x10000};`;
})
.replace(/([^#-~| |!])/g, (v) => `&#${v.charCodeAt(0)};`)
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}

format(chat, str) {
if (!str) return undefined;
const self = this;
Expand All @@ -35,7 +21,7 @@ export default class UrlFormatter {
const decodedUrl = self.elem.html(url).text();
const m = decodedUrl.match(linkregex);
if (m) {
const normalizedUrl = self.encodeUrl(this.normalizeUrl(m[0]));
const normalizedUrl = encodeUrl(this.normalizeUrl(m[0]));

let embedHashLink = '';
try {
Expand All @@ -53,7 +39,7 @@ export default class UrlFormatter {
urlText = `${urlText.slice(0, 40)}...${urlText.slice(-40)}`;
}

const extra = self.encodeUrl(decodedUrl.substring(m[0].length));
const extra = encodeUrl(decodedUrl.substring(m[0].length));
const href = `${scheme ? '' : 'http://'}${normalizedUrl}`;

const embedTarget = chat.isBigscreenEmbed() ? '_top' : '_blank';
Expand Down
7 changes: 4 additions & 3 deletions assets/chat/js/messages/ChatUserMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import encodeUrl from '../encodeUrl';
import ChatMessage from './ChatMessage';
import MessageTypes from './MessageTypes';

Expand Down Expand Up @@ -61,9 +62,9 @@ export default class ChatUserMessage extends ChatMessage {
else if (this.slashme || this.continued) ctrl = '';

const colorFlair = usernameColorFlair(chat.flairs, this.user);
const user = `${this.buildFeatures(this.user, chat)} <a title="${
this.title
}" class="${['user', colorFlair?.name].filter(Boolean).join(' ')}">${
const user = `${this.buildFeatures(this.user, chat)} <a title="${encodeUrl(
this.title,
)}" class="${['user', colorFlair?.name].filter(Boolean).join(' ')}">${
this.user.displayName
}</a>`;
return this.wrap(
Expand Down