fix: [#1741] Add end boundary to FormData

packages/happy-dom/src/fetch/multipart/MultipartFormDataParser.ts

@@ -120,6 +120,9 @@ export default class MultipartFormDataParser {
 			}
 		}
 
+		// add end boundary
+		chunks.push(Buffer.from(`--${boundary}--\r\n`));
+
 		const buffer = Buffer.concat(chunks);
 
 		return {

packages/happy-dom/src/fetch/multipart/MultipartReader.ts

@@ -1,9 +1,8 @@
-import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
 import File from '../../file/File.js';
 import FormData from '../../form-data/FormData.js';
 import BrowserWindow from '../../window/BrowserWindow.js';
 
-enum MultiparParserStateEnum {
+enum MultipartParserStateEnum {
 	boundary = 0,
 	headerStart = 2,
 	header = 3,
@@ -25,7 +24,7 @@ export default class MultipartReader {
 	private formData: FormData;
 	private boundary: Uint8Array;
 	private boundaryIndex = 0;
-	private state = MultiparParserStateEnum.boundary;
+	private state = MultipartParserStateEnum.boundary;
 	private data: {
 		contentDisposition: { [key: string]: string } | null;
 		value: number[];
@@ -37,7 +36,6 @@ export default class MultipartReader {
 		contentType: null,
 		header: ''
 	};
-	private window: BrowserWindow;
 
 	/**
 	 * Constructor.
@@ -48,7 +46,6 @@ export default class MultipartReader {
 	 */
 	constructor(window: BrowserWindow, boundary: string) {
 		const boundaryHeader = `--${boundary}`;
-		this.window = window;
 		this.boundary = new Uint8Array(boundaryHeader.length);
 		this.formData = new window.FormData();
 
@@ -71,64 +68,66 @@ export default class MultipartReader {
 			nextChar = data[i + 1];
 
 			switch (this.state) {
-				case MultiparParserStateEnum.boundary:
+				case MultipartParserStateEnum.boundary:
 					if (char === this.boundary[this.boundaryIndex]) {
 						this.boundaryIndex++;
 					} else {
 						this.boundaryIndex = 0;
 					}
 
 					if (this.boundaryIndex === this.boundary.length) {
-						this.state = MultiparParserStateEnum.headerStart;
+						this.state = MultipartParserStateEnum.headerStart;
 						this.boundaryIndex = 0;
 					}
 
 					break;
 
-				case MultiparParserStateEnum.headerStart:
+				case MultipartParserStateEnum.headerStart:
 					if (nextChar !== CHARACTER_CODE.cr && nextChar !== CHARACTER_CODE.lf) {
 						this.data.header = '';
 						this.state =
 							data[i - 2] === CHARACTER_CODE.lf
-								? MultiparParserStateEnum.data
-								: MultiparParserStateEnum.header;
+								? MultipartParserStateEnum.data
+								: MultipartParserStateEnum.header;
 					}
 
 					break;
 
-				case MultiparParserStateEnum.header:
+				case MultipartParserStateEnum.header:
 					if (char === CHARACTER_CODE.cr) {
 						if (this.data.header) {
 							const headerParts = this.data.header.split(':');
-							const headerName = headerParts[0].toLowerCase();
-							const headerValue = headerParts[1].trim();
-
-							switch (headerName) {
-								case 'content-disposition':
-									this.data.contentDisposition = this.getContentDisposition(headerValue);
-									break;
-								case 'content-type':
-									this.data.contentType = headerValue;
-									break;
+							if (headerParts.length > 1) {
+								const headerName = headerParts[0].toLowerCase();
+								const headerValue = headerParts[1].trim();
+
+								switch (headerName) {
+									case 'content-disposition':
+										this.data.contentDisposition = this.getContentDisposition(headerValue);
+										break;
+									case 'content-type':
+										this.data.contentType = headerValue;
+										break;
+								}
 							}
 						}
 
-						this.state = MultiparParserStateEnum.headerStart;
+						this.state = MultipartParserStateEnum.headerStart;
 					} else {
 						this.data.header += String.fromCharCode(char);
 					}
 
 					break;
 
-				case MultiparParserStateEnum.data:
+				case MultipartParserStateEnum.data:
 					if (char === this.boundary[this.boundaryIndex]) {
 						this.boundaryIndex++;
 					} else {
 						this.boundaryIndex = 0;
 					}
 
 					if (this.boundaryIndex === this.boundary.length) {
-						this.state = MultiparParserStateEnum.headerStart;
+						this.state = MultipartParserStateEnum.headerStart;
 
 						if (this.data.value.length) {
 							this.appendFormData(
@@ -159,20 +158,16 @@ export default class MultipartReader {
 	 * @returns Form data.
 	 */
 	public end(): FormData {
-		if (this.state !== MultiparParserStateEnum.data) {
-			throw new this.window.DOMException(
-				`Unexpected end of multipart stream. Expected state to be "${MultiparParserStateEnum.data}" but got "${this.state}".`,
-				DOMExceptionNameEnum.invalidStateError
+		// If we are missing an end boundary, but we have data, we should append it.
+		if (this.data.contentDisposition && this.data.value.length) {
+			this.appendFormData(
+				this.data.contentDisposition.name,
+				Buffer.from(this.data.value.slice(0, -2)),
+				this.data.contentDisposition.filename,
+				this.data.contentType
 			);
 		}
 
-		this.appendFormData(
-			this.data.contentDisposition.name,
-			Buffer.from(this.data.value.slice(0, -2)),
-			this.data.contentDisposition.filename,
-			this.data.contentType
-		);
-
 		return this.formData;
 	}
 

packages/happy-dom/test/fetch/Fetch.test.ts

@@ -3339,7 +3339,7 @@ describe('Fetch', () => {
 						'Accept-Encoding': 'gzip, deflate, br',
 						'Content-Type':
 							'multipart/form-data; boundary=----HappyDOMFormDataBoundary0.ssssssssst',
-						'Content-Length': '198'
+						'Content-Length': '244'
 					},
 					agent: false,
 					rejectUnauthorized: true,
@@ -3349,7 +3349,7 @@ describe('Fetch', () => {
 			});
 			expect(destroyCount).toBe(1);
 			expect(writtenBodyData).toBe(
-				'------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n'
+				'------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n------HappyDOMFormDataBoundary0.ssssssssst--\r\n'
 			);
 			expect(response.status).toBe(200);
 		});
@@ -3627,7 +3627,7 @@ describe('Fetch', () => {
 										'content-length',
 										String(responseText.length),
 										'cache-control',
-										'max-age=0.001',
+										'max-age=0.0001',
 										'last-modified',
 										'Mon, 11 Dec 2023 01:00:00 GMT'
 									];
@@ -3672,7 +3672,7 @@ describe('Fetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT'
 			});
 
@@ -3786,7 +3786,7 @@ describe('Fetch', () => {
 										'content-length',
 										String(responseText1.length),
 										'cache-control',
-										'max-age=0.001',
+										'max-age=0.0001',
 										'last-modified',
 										'Mon, 11 Dec 2023 01:00:00 GMT'
 									];
@@ -3839,7 +3839,7 @@ describe('Fetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText1.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT'
 			});
 
@@ -3954,7 +3954,7 @@ describe('Fetch', () => {
 										'content-length',
 										String(responseText.length),
 										'cache-control',
-										'max-age=0.001',
+										'max-age=0.0001',
 										'last-modified',
 										'Mon, 11 Dec 2023 01:00:00 GMT',
 										'etag',
@@ -4004,7 +4004,7 @@ describe('Fetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT',
 				etag: etag1
 			});
@@ -4018,7 +4018,7 @@ describe('Fetch', () => {
 			expect(headers2).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'Last-Modified': 'Mon, 11 Dec 2023 02:00:00 GMT',
 				ETag: etag2
 			});
@@ -4124,7 +4124,7 @@ describe('Fetch', () => {
 										'content-length',
 										String(responseText1.length),
 										'cache-control',
-										'max-age=0.001',
+										'max-age=0.0001',
 										'last-modified',
 										'Mon, 11 Dec 2023 01:00:00 GMT',
 										'etag',
@@ -4171,7 +4171,7 @@ describe('Fetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText1.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT',
 				etag: etag1
 			});

packages/happy-dom/test/fetch/SyncFetch.test.ts

@@ -2590,7 +2590,7 @@ describe('SyncFetch', () => {
 			browserFrame.url = 'https://localhost:8080/';
 
 			const body =
-				'------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n';
+				'------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.ssssssssst\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n------HappyDOMFormDataBoundary0.ssssssssst--\r\n';
 			const formData = new window.FormData();
 			let requestArgs: string | null = null;
 
@@ -2803,7 +2803,7 @@ describe('SyncFetch', () => {
 								'content-length',
 								String(responseText.length),
 								'cache-control',
-								'max-age=0.001',
+								'max-age=0.0001',
 								'last-modified',
 								'Mon, 11 Dec 2023 01:00:00 GMT'
 							],
@@ -2849,7 +2849,7 @@ describe('SyncFetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT'
 			});
 
@@ -2940,7 +2940,7 @@ describe('SyncFetch', () => {
 								'content-length',
 								String(responseText1.length),
 								'cache-control',
-								'max-age=0.001',
+								'max-age=0.0001',
 								'last-modified',
 								'Mon, 11 Dec 2023 01:00:00 GMT'
 							],
@@ -2994,7 +2994,7 @@ describe('SyncFetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText1.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT'
 			});
 
@@ -3085,7 +3085,7 @@ describe('SyncFetch', () => {
 								'content-length',
 								String(responseText.length),
 								'cache-control',
-								'max-age=0.001',
+								'max-age=0.0001',
 								'last-modified',
 								'Mon, 11 Dec 2023 01:00:00 GMT',
 								'etag',
@@ -3141,7 +3141,7 @@ describe('SyncFetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT',
 				etag: etag1
 			});
@@ -3155,7 +3155,7 @@ describe('SyncFetch', () => {
 			expect(headers2).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'Last-Modified': 'Mon, 11 Dec 2023 02:00:00 GMT',
 				ETag: etag2
 			});
@@ -3238,7 +3238,7 @@ describe('SyncFetch', () => {
 								'content-length',
 								String(responseText1.length),
 								'cache-control',
-								'max-age=0.001',
+								'max-age=0.0001',
 								'last-modified',
 								'Mon, 11 Dec 2023 01:00:00 GMT',
 								'etag',
@@ -3286,7 +3286,7 @@ describe('SyncFetch', () => {
 			expect(headers1).toEqual({
 				'content-type': 'text/html',
 				'content-length': String(responseText1.length),
-				'cache-control': `max-age=0.001`,
+				'cache-control': `max-age=0.0001`,
 				'last-modified': 'Mon, 11 Dec 2023 01:00:00 GMT',
 				etag: etag1
 			});

packages/integration-test/test/tests/Fetch.test.js

@@ -78,7 +78,7 @@ describe('Fetch', () => {
 				'----HappyDOMFormDataBoundary0.noRandom'
 			)
 		).toBe(
-			'header:\nmultipart/form-data; boundary=----HappyDOMFormDataBoundary0.noRandom\n\nbody:\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n'
+			'header:\nmultipart/form-data; boundary=----HappyDOMFormDataBoundary0.noRandom\n\nbody:\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n------HappyDOMFormDataBoundary0.noRandom--\r\n'
 		);
 	});
 });

packages/jest-environment/test/javascript/JavaScript.test.ts

@@ -84,7 +84,7 @@ describe('JavaScript', () => {
 				'----HappyDOMFormDataBoundary0.noRandom'
 			)
 		).toBe(
-			'header:\nmultipart/form-data; boundary=----HappyDOMFormDataBoundary0.noRandom\n\nbody:\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n'
+			'header:\nmultipart/form-data; boundary=----HappyDOMFormDataBoundary0.noRandom\n\nbody:\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1\r\n------HappyDOMFormDataBoundary0.noRandom\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2\r\n------HappyDOMFormDataBoundary0.noRandom--\r\n'
 		);
 	});