Merge branch 'master' into fix/cookie-value-support-contain-=

btea · Nov 6, 2024 · b545943 · b545943
2 parents b3406fa + f5e1722
commit b545943
Show file tree

Hide file tree

Showing 41 changed files with 817 additions and 201 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version   | Supported          |
+| --------- | ------------------ |
+| > 15.10.0 | :white_check_mark: |
+| < 15.10.0 | :x:                |
+
+## Reporting a Vulnerability
+
+Use the [Github Vulnaribilty Reporter](https://github.com/capricorn86/happy-dom/security) tool to report your findings.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/global-registrator/src/GlobalRegistrator.ts b/packages/global-registrator/src/GlobalRegistrator.ts
@@ -28,7 +28,7 @@ export default class GlobalRegistrator {
 			throw new Error('Failed to register. Happy DOM has already been globally registered.');
 		}
 
-		const window = new GlobalWindow({ ...options, console: global.console });
+		const window = new GlobalWindow({ ...options, console: globalThis.console });
 
 		this.registered = {};
 
@@ -38,7 +38,7 @@ export default class GlobalRegistrator {
 		for (const key of Object.keys(propertyDescriptors)) {
 			if (!IGNORE_LIST.includes(key)) {
 				const windowPropertyDescriptor = propertyDescriptors[key];
-				const globalPropertyDescriptor = Object.getOwnPropertyDescriptor(global, key);
+				const globalPropertyDescriptor = Object.getOwnPropertyDescriptor(globalThis, key);
 
 				if (
 					globalPropertyDescriptor?.value === undefined ||
@@ -48,11 +48,11 @@ export default class GlobalRegistrator {
 
 					// If the property is the window object, replace it with the global object
 					if (windowPropertyDescriptor.value === window) {
-						window[key] = global;
-						windowPropertyDescriptor.value = global;
+						window[key] = globalThis;
+						windowPropertyDescriptor.value = globalThis;
 					}
 
-					Object.defineProperty(global, key, {
+					Object.defineProperty(globalThis, key, {
 						...windowPropertyDescriptor,
 						configurable: true
 					});
@@ -69,18 +69,18 @@ export default class GlobalRegistrator {
 
 			// If the property is the window object, replace it with the global object
 			if (propertyDescriptor.value === window) {
-				window[key] = global;
-				propertyDescriptor.value = global;
+				window[key] = globalThis;
+				propertyDescriptor.value = globalThis;
 			}
 
-			Object.defineProperty(global, key, {
+			Object.defineProperty(globalThis, key, {
 				...propertyDescriptor,
 				configurable: true
 			});
 		}
 
 		// Set owner window on document to global
-		global.document[PropertySymbol.defaultView] = global;
+		globalThis.document[PropertySymbol.defaultView] = globalThis;
 	}
 
 	/**
@@ -93,13 +93,13 @@ export default class GlobalRegistrator {
 			);
 		}
 
-		const happyDOM = global.happyDOM;
+		const happyDOM = globalThis.happyDOM;
 
 		for (const key of Object.keys(this.registered)) {
 			if (this.registered[key] !== null) {
-				Object.defineProperty(global, key, this.registered[key]);
+				Object.defineProperty(globalThis, key, this.registered[key]);
 			} else {
-				delete global[key];
+				delete globalThis[key];
 			}
 		}
 

diff --git a/packages/happy-dom/src/browser/BrowserSettingsFactory.ts b/packages/happy-dom/src/browser/BrowserSettingsFactory.ts
@@ -29,6 +29,10 @@ export default class BrowserSettingsFactory {
 				...DefaultBrowserSettings.timer,
 				...settings?.timer
 			},
+			fetch: {
+				...DefaultBrowserSettings.fetch,
+				...settings?.fetch
+			},
 			device: {
 				...DefaultBrowserSettings.device,
 				...settings?.device

diff --git a/packages/happy-dom/src/browser/DefaultBrowserSettings.ts b/packages/happy-dom/src/browser/DefaultBrowserSettings.ts
@@ -18,6 +18,9 @@ export default <IBrowserSettings>{
 		maxIntervalIterations: -1,
 		preventTimerLoops: false
 	},
+	fetch: {
+		disableSameOriginPolicy: false
+	},
 	navigation: {
 		disableMainFrameNavigation: false,
 		disableChildFrameNavigation: false,

diff --git a/packages/happy-dom/src/browser/types/IBrowserSettings.ts b/packages/happy-dom/src/browser/types/IBrowserSettings.ts
@@ -20,14 +20,28 @@ export default interface IBrowserSettings {
 	/** Handle disabled resource loading as success */
 	handleDisabledFileLoadingAsSuccess: boolean;
 
-	/** Settings for timers */
+	/**
+	 * Settings for timers
+	 */
 	timer: {
 		maxTimeout: number;
 		maxIntervalTime: number;
 		maxIntervalIterations: number;
 		preventTimerLoops: boolean;
 	};
 
+	/**
+	 * Settings for fetch
+	 */
+	fetch: {
+		/**
+		 * Disables same-origin policy (CORS)
+		 *
+		 * @see https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy
+		 */
+		disableSameOriginPolicy: boolean;
+	};
+
 	/**
 	 * Disables error capturing.
 	 *

diff --git a/packages/happy-dom/src/browser/types/IOptionalBrowserSettings.ts b/packages/happy-dom/src/browser/types/IOptionalBrowserSettings.ts
@@ -24,6 +24,18 @@ export default interface IOptionalBrowserSettings {
 		maxIntervalIterations?: number;
 	};
 
+	/**
+	 * Settings for fetch
+	 */
+	fetch?: {
+		/**
+		 * Disables same-origin policy (CORS)
+		 *
+		 * @see https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy
+		 */
+		disableSameOriginPolicy?: boolean;
+	};
+
 	/**
 	 * Disables error capturing.
 	 *

diff --git a/packages/happy-dom/src/clipboard/ClipboardItem.ts b/packages/happy-dom/src/clipboard/ClipboardItem.ts
@@ -43,12 +43,15 @@ export default class ClipboardItem {
 	 * @param type Type.
 	 * @returns Data.
 	 */
-	public async getType(type: string): Promise<Blob | string> {
+	public async getType(type: string): Promise<Blob> {
 		if (!this.#data[type]) {
 			throw new DOMException(
 				`Failed to execute 'getType' on 'ClipboardItem': The type '${type}' was not found`
 			);
 		}
-		return this.#data[type];
+		if (this.#data[type] instanceof Blob) {
+			return this.#data[type];
+		}
+		return new Blob([await this.#data[type]], { type });
 	}
 }