From ff855cf79c762fcf9cca7aa8d656af682c10f7b2 Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 16:04:10 +0530 Subject: [PATCH 1/8] Allow hyphen in url - asset library --- src/util/validation.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/validation.js b/src/util/validation.js index 7f7e7c70..d20132e2 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,8 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www.)?[a-z0-9]+(\.[a-z]{2,}){1,3}(#?\/?(?:[a-zA-Z0-9#]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ - +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?([\w-._~:/?#[\]@!$&'()*+,;=]+)*)?\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library */ From a70e1a503e0c5aeb38f3342ae7f687fe460bc70a Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 16:18:00 +0530 Subject: [PATCH 2/8] git copilot suggestion --- src/util/validation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index d20132e2..c1de86e7 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,8 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?([\w-._~:/?#[\]@!$&'()*+,;=]+)*)?\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?([\w\-._~:/?#[\]@!$&'()*+,;=]+)*)?\/?(\?[a-zA-Z0-9\-_=]+(&[a-zA-Z0-9\-_=]+)*)?$/ + /** * validation schema for add link form in assets library */ From 4d24155cd453c40abd37988c26478655b63327ef Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 16:35:21 +0530 Subject: [PATCH 3/8] Redo the fix with minimal change --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index c1de86e7..4a1f2121 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?([\w\-._~:/?#[\]@!$&'()*+,;=]+)*)?\/?(\?[a-zA-Z0-9\-_=]+(&[a-zA-Z0-9\-_=]+)*)?$/ +const urlRegex = /((https?):\/\/)?(www.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[\w-#]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library From 6a43f6393079509c81e2edbaf24c8ad7e28d43c5 Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 16:42:02 +0530 Subject: [PATCH 4/8] Codeql test --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index 4a1f2121..9d6cb6ac 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[\w-#]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[a-zA-Z0-9#-]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library From 619b5c08fbbcafaa13dcd7c07aab2f5d0f6f929c Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 17:38:35 +0530 Subject: [PATCH 5/8] re-iterate with codeql --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index 9d6cb6ac..9452b690 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[a-zA-Z0-9#-]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[\w-]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library From 1dee45f7f6e02089819f5169efaba4ac47b3d932 Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 17:58:20 +0530 Subject: [PATCH 6/8] Retest performance --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index 9452b690..4bb2c99d 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[\w-]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?[a-zA-Z0-9#-]{1,100})*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library From a0fe205c45a2514f7e1b08432dbe232a4a41cb13 Mon Sep 17 00:00:00 2001 From: Himani Raghav <60837787+himaniraghav3@users.noreply.github.com> Date: Wed, 26 Mar 2025 18:40:12 +0530 Subject: [PATCH 7/8] Potential fix for code scanning alert no. 27: Inefficient regular expression Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index 4bb2c99d..186d45cc 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?[a-zA-Z0-9#-]{1,100})*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?[\w-]{1,100})*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library From 374be0c10b37aec8f94e185001231bc09cc48cc3 Mon Sep 17 00:00:00 2001 From: himaniraghav3 Date: Wed, 26 Mar 2025 19:35:34 +0530 Subject: [PATCH 8/8] revert codeql suggestion --- src/util/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/validation.js b/src/util/validation.js index 186d45cc..9d6cb6ac 100644 --- a/src/util/validation.js +++ b/src/util/validation.js @@ -58,7 +58,7 @@ export const taaSProjectFormValidationSchema = Yup.object({ /** * regex for url validation */ -const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?[\w-]{1,100})*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ +const urlRegex = /((https?):\/\/)?(www\.)?[\w-]+(\.[a-z]{2,}){1,3}(#?\/?(?:[a-zA-Z0-9#-]+))*\/?(\?[a-zA-Z0-9-_]+=[a-zA-Z0-9-%]+&?)?$/ /** * validation schema for add link form in assets library