fix: [#1565] Validate that object is of type Blob in FileReader.readA…

…sArrayBuffer, FileReader.readAsBinaryString, FileReader.readAsDataURL and FileReader.readAsText (#1575) * fix: [#1565] Strictly check the type of `blob` parameters * chore: [#1565] Uses TypeError from Window, as BrowserExceptionObserver can then detect the origin of the error * chore: [#1565] Fixes linting error --------- Co-authored-by: David Ortner <[email protected]>
capricorn86 · Nov 6, 2024 · 6ff0d8f · 6ff0d8f
1 parent 343bc49
commit 6ff0d8f
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 0 deletions.
diff --git a/packages/happy-dom/src/file/FileReader.ts b/packages/happy-dom/src/file/FileReader.ts
@@ -49,6 +49,11 @@ export default class FileReader extends EventTarget {
 	 * @param blob Blob.
 	 */
 	public readAsArrayBuffer(blob: Blob): void {
+		if (!(blob instanceof Blob)) {
+			throw new this[PropertySymbol.window].TypeError(
+				`Failed to execute 'readAsArrayBuffer' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		}
 		this.#readFile(blob, FileReaderFormatEnum.buffer);
 	}
 
@@ -58,6 +63,11 @@ export default class FileReader extends EventTarget {
 	 * @param blob Blob.
 	 */
 	public readAsBinaryString(blob: Blob): void {
+		if (!(blob instanceof Blob)) {
+			throw new this[PropertySymbol.window].TypeError(
+				`Failed to execute 'readAsBinaryString' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		}
 		this.#readFile(blob, FileReaderFormatEnum.binaryString);
 	}
 
@@ -67,6 +77,11 @@ export default class FileReader extends EventTarget {
 	 * @param blob Blob.
 	 */
 	public readAsDataURL(blob: Blob): void {
+		if (!(blob instanceof Blob)) {
+			throw new this[PropertySymbol.window].TypeError(
+				`Failed to execute 'readAsDataURL' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		}
 		this.#readFile(blob, FileReaderFormatEnum.dataURL);
 	}
 
@@ -77,6 +92,11 @@ export default class FileReader extends EventTarget {
 	 * @param [encoding] Encoding.
 	 */
 	public readAsText(blob: Blob, encoding: string | null = null): void {
+		if (!(blob instanceof Blob)) {
+			throw new this[PropertySymbol.window].TypeError(
+				`Failed to execute 'readAsText' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		}
 		this.#readFile(blob, FileReaderFormatEnum.text, encoding || 'UTF-8');
 	}
 

diff --git a/packages/happy-dom/test/file/FileReader.test.ts b/packages/happy-dom/test/file/FileReader.test.ts
@@ -25,5 +25,82 @@ describe('FileReader', () => {
 			await window.happyDOM?.waitUntilComplete();
 			expect(result).toBe('data:text/plain;charset=utf-8;base64,VEVTVA==');
 		});
+
+		it('Reads Blob as data URL passing invalid parameter.', () => {
+			expect(() => {
+				fileReader.readAsDataURL(<any>'invalid');
+			}).toThrow(
+				`Failed to execute 'readAsDataURL' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		});
+	});
+
+	describe('readAsText()', () => {
+		it('Reads Blob as text.', async () => {
+			const blob = new Blob(['TEST'], {
+				type: 'text/plain;charset=utf-8'
+			});
+			let result: string | null = null;
+			fileReader.addEventListener('load', () => {
+				result = <string>fileReader.result;
+			});
+			fileReader.readAsText(blob);
+			await window.happyDOM?.waitUntilComplete();
+			expect(result).toBe('TEST');
+		});
+
+		it('Reads Blob as text passing invalid parameter.', () => {
+			expect(() => {
+				fileReader.readAsText(<any>'invalid');
+			}).toThrow(
+				`Failed to execute 'readAsText' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		});
+	});
+
+	describe('readAsArrayBuffer()', () => {
+		it('Reads Blob as array buffer.', async () => {
+			const blob = new Blob(['TEST'], {
+				type: 'text/plain;charset=utf-8'
+			});
+			let result: ArrayBuffer | null = null;
+			fileReader.addEventListener('load', () => {
+				result = <ArrayBuffer>fileReader.result;
+			});
+			fileReader.readAsArrayBuffer(blob);
+			await window.happyDOM?.waitUntilComplete();
+			expect(result).toBeInstanceOf(ArrayBuffer);
+		});
+
+		it('Reads Blob as array buffer passing invalid parameter.', () => {
+			expect(() => {
+				fileReader.readAsArrayBuffer(<any>'invalid');
+			}).toThrow(
+				`Failed to execute 'readAsArrayBuffer' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		});
+	});
+
+	describe('readAsBinaryString()', () => {
+		it('Reads Blob as binary string.', async () => {
+			const blob = new Blob(['TEST'], {
+				type: 'text/plain;charset=utf-8'
+			});
+			let result: string | null = null;
+			fileReader.addEventListener('load', () => {
+				result = <string>fileReader.result;
+			});
+			fileReader.readAsBinaryString(blob);
+			await window.happyDOM?.waitUntilComplete();
+			expect(result).toBe('TEST');
+		});
+
+		it('Reads Blob as binary string passing invalid parameter.', () => {
+			expect(() => {
+				fileReader.readAsBinaryString(<any>'invalid');
+			}).toThrow(
+				`Failed to execute 'readAsBinaryString' on 'FileReader': parameter 1 is not of type 'Blob'.`
+			);
+		});
 	});
 });