@windstream/react-shared-components 0.2.23 → 0.2.25

package/src/contentful/blocks/find-kinetic/index.tsx

@@ -16,6 +16,7 @@ export const FindKinetic: React.FC<FindKineticProps> = ({
   title,
   color = "dark",
   maxWidth = true,
+  addTrailingSlash = false,
 }) => {
   const bgColorClasses: Record<ThemeKey, string> = {
     blue: "bg-[#07B2E2]",
@@ -25,12 +26,22 @@ export const FindKinetic: React.FC<FindKineticProps> = ({
     white: "bg-white",
     navy: "bg-[#00002D]",
   };
-  const normalizedLocalPathPrefix = localPathPrefix
-    ? `/${localPathPrefix.replace(/^\/+|\/+$/g, "")}`
+  // Trim leading/trailing slashes without a regex to avoid ReDoS on long
+  // runs of "/" (CodeQL: polynomial regular expression on uncontrolled data).
+  const trimSlashes = (value: string) => {
+    let start = 0;
+    let end = value.length;
+    while (start < end && value.charCodeAt(start) === 47 /* "/" */) start += 1;
+    while (end > start && value.charCodeAt(end - 1) === 47 /* "/" */) end -= 1;
+    return value.slice(start, end);
+  };
+  const cleanedLocalPathPrefix = trimSlashes(localPathPrefix ?? "");
+  const normalizedLocalPathPrefix = cleanedLocalPathPrefix
+    ? `/${cleanedLocalPathPrefix}`
     : "";
 
   const getLocationHref = (code: string) =>
-    `${normalizedLocalPathPrefix}/${code.toLowerCase()}`;
+    `${normalizedLocalPathPrefix}/${code.toLowerCase()}${addTrailingSlash ? "/" : ""}`;
 
   return (
     <div
@@ -120,16 +131,21 @@ export const FindKinetic: React.FC<FindKineticProps> = ({
                           key={`item-list-3-${index}`}
                           className={`${image ? "" : "w-[172px]"}`}
                         >
-                          <Link href={getLocationHref(item.code)} className="label1">
+                          <Link
+                            href={getLocationHref(item.code)}
+                            className="label1"
+                          >
                             {item.name}
                           </Link>
                         </li>
-                      ) : <li key={`empty-3-${index}`} aria-hidden="true" />
+                      ) : (
+                        <li key={`empty-3-${index}`} aria-hidden="true" />
+                      )
                     );
                   })()}
                 </ul>
                 {!image && (
-                  <ul className="hidden xl:grid xl:grid-cols-4 gap-x-20 gap-y-5">
+                  <ul className="hidden gap-x-20 gap-y-5 xl:grid xl:grid-cols-4">
                     {(() => {
                       const sortedList = [...list].sort((a, b) =>
                         a.name.localeCompare(b.name)
@@ -145,12 +161,20 @@ export const FindKinetic: React.FC<FindKineticProps> = ({
                       }
                       return rearranged.map((item, index: number) =>
                         item ? (
-                          <li key={`item-list-4-${index}`} className="w-[172px]">
-                            <Link href={getLocationHref(item.code)} className="label1">
+                          <li
+                            key={`item-list-4-${index}`}
+                            className="w-[172px]"
+                          >
+                            <Link
+                              href={getLocationHref(item.code)}
+                              className="label1"
+                            >
                               {item.name}
                             </Link>
                           </li>
-                        ) : <li key={`empty-4-${index}`} aria-hidden="true" />
+                        ) : (
+                          <li key={`empty-4-${index}`} aria-hidden="true" />
+                        )
                       );
                     })()}
                   </ul>

package/src/contentful/blocks/find-kinetic/types.ts

@@ -10,6 +10,7 @@ export type FindKineticProps = {
   maxWidth?: boolean;
   color?: "dark" | "light";
   columns?: 2 | 3 | 4;
+  addTrailingSlash?: boolean;
 };
 
 export type ThemeKey =