fix parsing of custom buildpack urls (#3713)

porter-dev · Oct 3, 2023 · 07c65ab · 07c65ab
1 parent a5e3736
commit 07c65ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...ard/src/main/home/app-dashboard/build-settings/buildpacks/AddCustomBuildpackComponent.tsx b/...ard/src/main/home/app-dashboard/build-settings/buildpacks/AddCustomBuildpackComponent.tsx
@@ -8,9 +8,12 @@ function isValidBuildpack(url: string): boolean {
   if (url.startsWith(urnPrefix)) {
     return true;
   }
-
-  const pattern = /^(https?:\/\/)?([\w.-]+)\.([a-z]{2,})(:\d{2,5})?([\/\w.-]*)*\/?$/i;
-  return pattern.test(url);
+  try {
+    new URL(url);
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 
 const AddCustomBuildpackComponent: React.FC<{

diff --git a/...c/main/home/app-dashboard/validate-apply/build-settings/buildpacks/AddCustomBuildpack.tsx b/...c/main/home/app-dashboard/validate-apply/build-settings/buildpacks/AddCustomBuildpack.tsx
@@ -8,9 +8,12 @@ function isValidBuildpack(url: string): boolean {
   if (url.startsWith(urnPrefix)) {
     return true;
   }
-
-  const pattern = /^(https?:\/\/)?([\w.-]+)\.([a-z]{2,})(:\d{2,5})?([\/\w.-]*)*\/?$/i;
-  return pattern.test(url);
+  try {
+    new URL(url);
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 
 const AddCustomBuildpack: React.FC<{
@@ -53,7 +56,7 @@ const AddCustomBuildpack: React.FC<{
         </EventInformation>
       </ContentContainer>
       <ActionContainer>
-        <ActionButton onClick={() => handleAddCustomBuildpack()}>
+        <ActionButton onClick={() => handleAddCustomBuildpack()} type="button">
           <span className="material-icons-outlined">add</span>
         </ActionButton>
       </ActionContainer>