Fixed infinite loop in client-side reCAPTCHA verification mechanism

FlorianLeChat · Feb 2, 2025 · 331ec91 · 331ec91
1 parent c0c46f3
commit 331ec91
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/assets/scripts/analytics.ts b/assets/scripts/analytics.ts
@@ -49,7 +49,7 @@ export function setupRecaptcha()
 	{
 		if ( typeof window.grecaptcha !== "undefined" )
 		{
-			fetch( "", { method: "POST" } );
+			window.proxyFetch( "", { method: "POST" } );
 			clearInterval( timer );
 		}
 	}, 1000 );

diff --git a/assets/scripts/functions.ts b/assets/scripts/functions.ts
@@ -164,7 +164,7 @@ setInterval( () =>
 export async function sendRemoteAction( token: string, route: string, action: string, value = "" )
 {
 	// On réalise d'abord la requête AJAX.
-	const response = await fetch( route, {
+	const response = await window.proxyFetch( route, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/global.ts b/assets/scripts/global.ts
@@ -9,6 +9,9 @@ import { addQueuedNotification } from "./functions";
 // Déclaration du contexte global du navigateur.
 declare global {
 	interface Window {
+		// Méthode fetch avec prise en charge de reCAPTCHA.
+		proxyFetch: typeof fetch;
+
 		// Déclaration des traductions injectées par Twig.
 		edit_port: string;
 		edit_remove: string;
@@ -114,9 +117,7 @@ $( "footer" ).on( "click", "a[href = \"#\"]", ( event ) =>
 //
 if ( process.env.RECAPTCHA_ENABLED === "true" )
 {
-	const oldFetch = window.fetch;
-
-	window.fetch = async ( url, options ) =>
+	window.proxyFetch = async ( url, options ) =>
 	{
 		// On vérifie d'abord si la requête est une requête issue
 		//  d'un formulaire quelconque.
@@ -153,7 +154,7 @@ if ( process.env.RECAPTCHA_ENABLED === "true" )
 		}
 
 		// On retourne enfin la requête originale.
-		return oldFetch( url, options );
+		return fetch( url, options );
 	};
 
 	$( "form[method = POST]" ).on( "submit", ( event ) =>
@@ -240,7 +241,7 @@ contact.on( "submit", "form", async ( event ) =>
 	contact.find( "[type = reset]" ).prop( "disabled", true );
 
 	// On réalise alors la requête AJAX.
-	const response = await fetch( contact.data( "route" ), {
+	const response = await window.proxyFetch( contact.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/pages/actions.ts b/assets/scripts/pages/actions.ts
@@ -86,7 +86,7 @@ commands.on( "click", "[data-action = add]", async ( event ) =>
 	element.prop( "disabled", true );
 
 	// On réalise ensuite la requête AJAX.
-	const response = await fetch( element.data( "route" ), {
+	const response = await window.proxyFetch( element.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -133,7 +133,7 @@ commands.on( "click", "[data-action = remove]", async ( event ) =>
 
 		// On réalise ensuite la requête AJAX.
 		const target = $( event.target );
-		const response = await fetch( target.data( "route" ), {
+		const response = await window.proxyFetch( target.data( "route" ), {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/pages/configuration.ts b/assets/scripts/pages/configuration.ts
@@ -21,7 +21,7 @@ $( "form" ).on( "submit", async ( event ) =>
 	storage.find( "[type = submit]" ).prop( "disabled", true );
 
 	// On réalise ensuite la requête AJAX.
-	const response = await fetch( storage.data( "route" ), {
+	const response = await window.proxyFetch( storage.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -93,7 +93,7 @@ $( "[data-type]" ).on( "click", async ( event ) =>
 	// On réalise ensuite la requête AJAX.
 	const target = $( event.target );
 	const element = target.is( "i" ) ? target.parent() : target;
-	const response = await fetch( parameters.data( "route" ), {
+	const response = await window.proxyFetch( parameters.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/pages/console.ts b/assets/scripts/pages/console.ts
@@ -57,7 +57,7 @@ let timer: NodeJS.Timeout | undefined;
 async function retrieveRemoteLogs()
 {
 	// On réalise d'abord la requête AJAX.
-	const response = await fetch( terminal.data( "route" ) );
+	const response = await window.proxyFetch( terminal.data( "route" ) );
 
 	// On vérifie ensuite si la requête a été effectuée avec succès.
 	if ( response.ok )

diff --git a/assets/scripts/pages/dashboard.ts b/assets/scripts/pages/dashboard.ts
@@ -139,7 +139,7 @@ let timer: NodeJS.Timeout | undefined;
 async function retrieveRemoteData()
 {
 	// On réalise d'abord la requête AJAX.
-	const response = await fetch( servers.data( "route" ) );
+	const response = await window.proxyFetch( servers.data( "route" ) );
 
 	// On vérifie ensuite si la requête a été effectuée avec succès.
 	if ( response.ok )

diff --git a/assets/scripts/pages/index.ts b/assets/scripts/pages/index.ts
@@ -70,7 +70,7 @@ register.on( "submit", "form", async ( event ) =>
 		// Dans le cas contraire, on réalise alors une requête AJAX
 		//  pour envoyer les informations au serveur.
 		const parent = register.parent();
-		const response = await fetch( parent.data( "route" ), {
+		const response = await window.proxyFetch( parent.data( "route" ), {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded"
@@ -187,7 +187,7 @@ login.on( "click", "[type = submit]", async ( event ) =>
 	login.find( "[type = reset]" ).prop( "disabled", true );
 
 	// On réalise ensuite la requête AJAX.
-	const response = await fetch( login.data( "route" ), {
+	const response = await window.proxyFetch( login.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -291,7 +291,7 @@ links.last().on( "click", async ( event ) =>
 
 	// On réalise ensuite la requête AJAX.
 	const parent = $( event.target ).parent();
-	const response = await fetch( parent.data( "route" ), {
+	const response = await window.proxyFetch( parent.data( "route" ), {
 		method: "PUT",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/pages/tasks.ts b/assets/scripts/pages/tasks.ts
@@ -21,7 +21,7 @@ $( "form" ).on( "submit", async ( event ) =>
 	tasks.find( "[type = submit]" ).prop( "disabled", true );
 
 	// On réalise ensuite la requête AJAX.
-	const response = await fetch( tasks.data( "add-route" ), {
+	const response = await window.proxyFetch( tasks.data( "add-route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -71,7 +71,7 @@ $( "tbody tr:not([class = finished])" ).on( "click", async ( event ) =>
 	{
 		// On réalise ensuite la requête AJAX.
 		const target = $( event.target ).parent();
-		const response = await fetch( tasks.data( "remove-route" ), {
+		const response = await window.proxyFetch( tasks.data( "remove-route" ), {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded"

diff --git a/assets/scripts/pages/user.ts b/assets/scripts/pages/user.ts
@@ -39,7 +39,7 @@ account.on( "click", "[data-action]", async ( event ) =>
 	account.find( "[type = submit]" ).prop( "disabled", true );
 
 	// On réalise alors la requête AJAX.
-	const response = await fetch( target.data( "route" ), {
+	const response = await window.proxyFetch( target.data( "route" ), {
 		method: action === "update" ? "PUT" : "DELETE",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -92,7 +92,7 @@ actions.on( "click", "[type = submit]", async ( event ) =>
 
 	// On réalise ensuite la requête AJAX.
 	const target = $( event.target );
-	const response = await fetch( target.data( "route" ), {
+	const response = await window.proxyFetch( target.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"
@@ -151,7 +151,7 @@ submit.on( "click", async ( event ) =>
 	// On réalise ensuite la requête AJAX.
 	const target = $( event.target );
 	const form = target.parent();
-	const response = await fetch( register.data( "route" ), {
+	const response = await window.proxyFetch( register.data( "route" ), {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded"