address review comments

Author: ciyer

client/src/features/legacy/ProjectGitLabWarnBanner.tsx

@@ -27,10 +27,7 @@ import { useGetProjectsByProjectIdSessionLaunchersQuery } from "~/features/sessi
 import { useGetUserQueryState } from "~/features/usersV2/api/users.api";
 import { Links } from "~/utils/constants/Docs";
 
-import {
-  DEFAULT_INTERNAL_GITLAB_HOSTS,
-  doesProjectReferenceRenkulabGitLab,
-} from "./legacy.utils";
+import { doesProjectReferenceRenkulabGitLab } from "./legacy.utils";
 
 function ProjectEditorWarnBanner() {
   return (
@@ -82,13 +79,7 @@ export default function ProjectGitLabWarnBanner({
   } = useGetProjectsByProjectIdSessionLaunchersQuery({ projectId: project.id });
   if (currentUser == null) return null;
   if (isLoadingLaunchers || launchersError || launchers == null) return null;
-  if (
-    !doesProjectReferenceRenkulabGitLab(
-      project.repositories,
-      launchers,
-      DEFAULT_INTERNAL_GITLAB_HOSTS
-    )
-  )
+  if (!doesProjectReferenceRenkulabGitLab(project.repositories, launchers))
     return null;
   return (
     <PermissionsGuard

client/src/features/legacy/RepositoryGitLabWarnBadge.tsx

@@ -21,10 +21,7 @@ import useProjectPermissions from "~/features/ProjectPageV2/utils/useProjectPerm
 import type { Project } from "~/features/projectsV2/api/projectV2.api";
 
 import InternalGitLabReferenceWarnBadge from "./InternalGitLabWarnBadge";
-import {
-  DEFAULT_INTERNAL_GITLAB_HOSTS,
-  doesProjectReferenceRenkulabGitLab,
-} from "./legacy.utils";
+import { doesProjectReferenceRenkulabGitLab } from "./legacy.utils";
 
 interface RepositoryGitLabWarnBadgeProps {
   project: Project;
@@ -50,13 +47,7 @@ function RepositoryGitLabWarnBadgeForProject({
 export default function RepositoryGitLabWarnBadge({
   project,
 }: RepositoryGitLabWarnBadgeProps) {
-  if (
-    !doesProjectReferenceRenkulabGitLab(
-      project.repositories,
-      [],
-      DEFAULT_INTERNAL_GITLAB_HOSTS
-    )
-  )
+  if (!doesProjectReferenceRenkulabGitLab(project.repositories, []))
     return null;
 
   return <RepositoryGitLabWarnBadgeForProject project={project} />;

client/src/features/legacy/SessionEnvironmentGitLabWarnBadge.tsx

@@ -21,10 +21,7 @@ import useProjectPermissions from "~/features/ProjectPageV2/utils/useProjectPerm
 import { SessionLauncher } from "~/features/sessionsV2/api/sessionLaunchersV2.api";
 
 import InternalGitLabReferenceWarnBadge from "./InternalGitLabWarnBadge";
-import {
-  DEFAULT_INTERNAL_GITLAB_HOSTS,
-  doesProjectReferenceRenkulabGitLab,
-} from "./legacy.utils";
+import { doesProjectReferenceRenkulabGitLab } from "./legacy.utils";
 
 type SessionEnvironmentGitLabWarningBadgeForLauncherProps = {
   launcher: SessionLauncher;
@@ -54,14 +51,7 @@ export default function SessionEnvironmentGitLabWarningBadge({
   launcher,
 }: SessionEnvironmentGitLabWarningBadgeProps) {
   if (!launcher) return null;
-  if (
-    !doesProjectReferenceRenkulabGitLab(
-      undefined,
-      [launcher],
-      DEFAULT_INTERNAL_GITLAB_HOSTS
-    )
-  )
-    return null;
+  if (!doesProjectReferenceRenkulabGitLab(undefined, [launcher])) return null;
   return (
     <SessionEnvironmentGitLabWarningBadgeForLauncher launcher={launcher} />
   );

client/src/features/legacy/legacy.utils.test.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+
+import { doesUrlHostMatchHost } from "./legacy.utils";
+
+describe("doesUrlHostMatchHost", () => {
+  it("should return true for matching hosts", () => {
+    expect(
+      doesUrlHostMatchHost("https://gitlab.renkulab.io", "gitlab.renkulab.io")
+    ).toBe(true);
+    expect(
+      doesUrlHostMatchHost(
+        "registry.renkulab.io/ns/project:abc7ba5e",
+        "registry.renkulab.io"
+      )
+    ).toBe(true);
+  });
+
+  it("should return false for non-matching hosts", () => {
+    expect(
+      doesUrlHostMatchHost("https://gitlab.renkulab.io", "gitlab.example.com")
+    ).toBe(false);
+    expect(
+      doesUrlHostMatchHost(
+        "registry.renkulab.io/ns/project:abc7ba5e",
+        "registry.example.io"
+      )
+    ).toBe(false);
+  });
+
+  it("should return false for invalid URLs", () => {
+    expect(doesUrlHostMatchHost("invalid-url", "gitlab.renkulab.io")).toBe(
+      false
+    );
+  });
+});

client/src/features/legacy/legacy.utils.ts

@@ -19,38 +19,46 @@
 import type { Project } from "~/features/projectsV2/api/projectV2.api";
 import type { SessionLaunchersList } from "~/features/sessionsV2/api/sessionLaunchersV2.api";
 
-interface InternalGitLabHosts {
-  repository: string;
-  images: string;
-}
-
-export const DEFAULT_INTERNAL_GITLAB_HOSTS: InternalGitLabHosts = {
+const DEFAULT_INTERNAL_GITLAB_HOSTS = {
   repository: "gitlab.renkulab.io",
   images: "registry.renkulab.io",
 };
 
+// exported for testing
+export function doesUrlHostMatchHost(url: string, host: string) {
+  const urlString = /^https?:\/\//.test(url) ? url : "http://" + url;
+  try {
+    const parsedUrl = new URL(urlString);
+    return parsedUrl.host === host;
+  } catch (e) {
+    return false;
+  }
+}
+
 export function doesProjectReferenceRenkulabGitLab(
   allRepositories: Project["repositories"],
-  allLaunchers: SessionLaunchersList,
-  hosts: InternalGitLabHosts
+  allLaunchers: SessionLaunchersList
 ) {
   const { repositories, launchers } = projectReferencesToRenkulabGitLab(
     allRepositories,
-    allLaunchers,
-    hosts
+    allLaunchers
   );
   return repositories.length > 0 || launchers.length > 0;
 }
 
 function projectReferencesToRenkulabGitLab(
   allRepositories: Project["repositories"],
-  allLaunchers: SessionLaunchersList,
-  hosts: InternalGitLabHosts
+  allLaunchers: SessionLaunchersList
 ) {
+  const hosts = DEFAULT_INTERNAL_GITLAB_HOSTS;
   const repositories =
-    allRepositories?.filter((repo) => repo.includes(hosts.repository)) ?? [];
+    allRepositories?.filter((repo) =>
+      doesUrlHostMatchHost(repo, hosts.repository)
+    ) ?? [];
   const launchers = allLaunchers.filter((launcher) =>
-    launcher.environment.container_image?.includes(hosts.images)
+    launcher.environment.container_image == null
+      ? false
+      : doesUrlHostMatchHost(launcher.environment.container_image, hosts.images)
   );
   return { repositories, launchers };
 }