mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Check charset types in linkPreviewFetch.ts

Browse source
This commit is contained in:
Fedor Indutny 2021-04-02 11:37:54 -07:00 • committed by Josh Perez
parent bb412d61c2
commit 2796dfab23
1 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ts/linkPreviews/linkPreviewFetch.ts
View file

@ -180,6 +180,38 @@ const parseContentLength = (headerValue: string | null): number => {
return Number.isNaN(result) ? Infinity : result; return Number.isNaN(result) ? Infinity : result;
}; };
type ValidCharset =
| 'ascii'
| 'utf8'
| 'utf-8'
| 'utf16le'
| 'ucs2'
| 'ucs-2'
| 'base64'
| 'latin1'
| 'binary'
| 'hex';
const VALID_CHARSETS = new Set([
'ascii',
'utf8',
'utf-8',
'utf16le',
'ucs2',
'ucs-2',
'base64',
'latin1',
'binary',
'hex',
]);
const checkCharset = (charSet: string | null): charSet is ValidCharset => {
if (!charSet) {
return false;
}
return VALID_CHARSETS.has(charSet);
};
const emptyHtmlDocument = (): HTMLDocument => const emptyHtmlDocument = (): HTMLDocument =>
new DOMParser().parseFromString('', 'text/html'); new DOMParser().parseFromString('', 'text/html');
@ -269,6 +301,9 @@ const getHtmlDocument = async (
// This check exists to satisfy TypeScript; chunk should always be a Buffer. // This check exists to satisfy TypeScript; chunk should always be a Buffer.
if (typeof chunk === 'string') { if (typeof chunk === 'string') {
if (!checkCharset(httpCharset)) {
throw new Error(`Invalid charset: ${httpCharset}`);
}
chunk = Buffer.from(chunk, httpCharset || 'utf8'); chunk = Buffer.from(chunk, httpCharset || 'utf8');
} }