From 178da6bc3210b82c4a83f33c8b149f623a3375e1 Mon Sep 17 00:00:00 2001
From: Guilherme Barros <gbarros1095@gmail.com>
Date: Sat, 15 Aug 2026 13:31:56 +0200
Subject: [PATCH] fix(shared): match source-control providers by DNS label
 (#6175)

---
 packages/shared/src/sourceControl.test.ts | 29 +++++++++++++++++++++++
 packages/shared/src/sourceControl.ts      | 10 +++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/packages/shared/src/sourceControl.test.ts b/packages/shared/src/sourceControl.test.ts
index bfee883dd9f5707a63cf82656b7f5f94ca2f611e..3842fa84b5a78a6fea312c3a2c0f86349cd6667c 100644
--- a/packages/shared/src/sourceControl.test.ts
+++ b/packages/shared/src/sourceControl.test.ts
@@ -91,4 +91,33 @@ describe("detectSourceControlProviderFromRemoteUrl", () => {
       baseUrl: "https://self-hosted.example.test:8443",
     });
   });
+
+  it("matches self-hosted providers by complete DNS labels", () => {
+    expect(
+      detectSourceControlProviderFromRemoteUrl("https://github.example.com/owner/repo.git")?.kind,
+    ).toBe("github");
+    expect(
+      detectSourceControlProviderFromRemoteUrl("https://gitlab.example.com/group/repo.git")?.kind,
+    ).toBe("gitlab");
+    expect(
+      detectSourceControlProviderFromRemoteUrl("https://bitbucket.example.com/workspace/repo.git")
+        ?.kind,
+    ).toBe("bitbucket");
+  });
+
+  it("does not match provider names embedded in unrelated DNS labels", () => {
+    expect(
+      detectSourceControlProviderFromRemoteUrl("https://notgithub.example.com/owner/repo.git")
+        ?.kind,
+    ).toBe("unknown");
+    expect(
+      detectSourceControlProviderFromRemoteUrl("https://notgitlab.example.com/group/repo.git")
+        ?.kind,
+    ).toBe("unknown");
+    expect(
+      detectSourceControlProviderFromRemoteUrl(
+        "https://notbitbucket.example.com/workspace/repo.git",
+      )?.kind,
+    ).toBe("unknown");
+  });
 });
diff --git a/packages/shared/src/sourceControl.ts b/packages/shared/src/sourceControl.ts
index a29fe968e44d373877b854377f5cd8a1c3466cc6..ad6fa890bf2520d0f0f97034be21d95d42b62b88 100644
--- a/packages/shared/src/sourceControl.ts
+++ b/packages/shared/src/sourceControl.ts
@@ -167,12 +167,16 @@ function toBaseUrl(host: string): string {
   return `https://${host}`;
 }
 
+function hasDnsLabel(host: string, label: string): boolean {
+  return host.split(".").includes(label);
+}
+
 function isGitHubHost(host: string): boolean {
-  return host === "github.com" || host.includes("github");
+  return host === "github.com" || hasDnsLabel(host, "github");
 }
 
 function isGitLabHost(host: string): boolean {
-  return host === "gitlab.com" || host.includes("gitlab");
+  return host === "gitlab.com" || hasDnsLabel(host, "gitlab");
 }
 
 function isAzureDevOpsHost(host: string): boolean {
@@ -188,7 +192,7 @@ function isAzureDevOpsHost(host: string): boolean {
 }
 
 function isBitbucketHost(host: string): boolean {
-  return host === "bitbucket.org" || host.includes("bitbucket");
+  return host === "bitbucket.org" || hasDnsLabel(host, "bitbucket");
 }
 
 export function detectSourceControlProviderFromRemoteUrl(
-- 
2.54.0