Fix passing HTTP or HTTPS protocol to Bitbucket DataCenter provider

(#4184, #4107)

Author: sergeibbb

src/git/parsers/remoteParser.ts

@@ -52,15 +52,15 @@ export function parseGitRemotes(
 				scheme,
 				domain,
 				path,
-				remoteProviderMatcher(url, domain, path),
+				remoteProviderMatcher(url, domain, path, scheme),
 				[{ url: url, type: type as GitRemoteType }],
 			);
 			remotes.set(name, remote);
 		} else {
 			remote.urls.push({ url: url, type: type as GitRemoteType });
 			if (remote.provider != null && type !== 'push') continue;
 
-			const provider = remoteProviderMatcher(url, domain, path);
+			const provider = remoteProviderMatcher(url, domain, path, scheme);
 			if (provider == null) continue;
 
 			remote = new GitRemote(container, repoPath, name, scheme, domain, path, provider, remote.urls);

src/git/remotes/remoteProviders.ts

@@ -20,7 +20,7 @@ import type { RemoteProvider } from './remoteProvider';
 export type RemoteProviders = {
 	custom: boolean;
 	matcher: string | RegExp;
-	creator: (container: Container, domain: string, path: string) => RemoteProvider;
+	creator: (container: Container, domain: string, path: string, scheme?: string) => RemoteProvider;
 }[];
 
 const builtInProviders: RemoteProviders = [
@@ -80,16 +80,26 @@ const builtInProviders: RemoteProviders = [
 
 const cloudProviderCreatorsMap: Record<
 	CloudSelfHostedIntegrationId,
-	(container: Container, domain: string, path: string) => RemoteProvider
+	(container: Container, domain: string, path: string, scheme: string | undefined) => RemoteProvider
 > = {
 	[SelfHostedIntegrationId.CloudGitHubEnterprise]: (container: Container, domain: string, path: string) =>
 		new GitHubRemote(container, domain, path),
 	[SelfHostedIntegrationId.CloudGitLabSelfHosted]: (container: Container, domain: string, path: string) =>
 		new GitLabRemote(container, domain, path),
-	[SelfHostedIntegrationId.BitbucketServer]: (container: Container, domain: string, path: string) =>
-		new BitbucketServerRemote(container, domain, path),
+	[SelfHostedIntegrationId.BitbucketServer]: (
+		container: Container,
+		domain: string,
+		path: string,
+		scheme: string | undefined,
+	) => new BitbucketServerRemote(container, domain, path, cleanProtocol(scheme)),
 };
 
+const dirtyProtocolPattern = /(\w+)\W*/;
+function cleanProtocol(scheme: string | undefined): string | undefined {
+	const match = scheme?.match(dirtyProtocolPattern);
+	return match?.[1] ?? undefined;
+}
+
 export function loadRemoteProviders(
 	cfg: RemotesConfig[] | null | undefined,
 	configuredIntegrations?: ConfiguredIntegrationDescriptor[],
@@ -181,16 +191,16 @@ function getCustomProviderCreator(cfg: RemotesConfig) {
 export async function getRemoteProviderMatcher(
 	container: Container,
 	providers?: RemoteProviders,
-): Promise<(url: string, domain: string, path: string) => RemoteProvider | undefined> {
+): Promise<(url: string, domain: string, path: string, sheme: string | undefined) => RemoteProvider | undefined> {
 	if (providers == null) {
 		providers = loadRemoteProviders(
 			configuration.get('remotes', null),
 			await container.integrations.getConfigured(),
 		);
 	}
 
-	return (url: string, domain: string, path: string) =>
-		createBestRemoteProvider(container, providers, url, domain, path);
+	return (url: string, domain: string, path: string, scheme) =>
+		createBestRemoteProvider(container, providers, url, domain, path, scheme);
 }
 
 function createBestRemoteProvider(
@@ -199,22 +209,27 @@ function createBestRemoteProvider(
 	url: string,
 	domain: string,
 	path: string,
+	scheme: string | undefined,
 ): RemoteProvider | undefined {
 	try {
 		const key = domain.toLowerCase();
 		for (const { custom, matcher, creator } of providers) {
 			if (typeof matcher === 'string') {
-				if (matcher === key) return creator(container, domain, path);
+				if (matcher === key) {
+					return creator(container, domain, path, scheme);
+				}
 
 				continue;
 			}
 
-			if (matcher.test(key)) return creator(container, domain, path);
+			if (matcher.test(key)) {
+				return creator(container, domain, path, scheme);
+			}
 			if (!custom) continue;
 
 			const match = matcher.exec(url);
 			if (match != null) {
-				return creator(container, match[1], match[2]);
+				return creator(container, match[1], match[2], scheme);
 			}
 		}
 

src/plus/drafts/draftsService.ts

@@ -725,7 +725,7 @@ export class DraftService implements Disposable {
 			name = data.provider.repoName;
 		} else if (data.remote?.url != null && data.remote?.domain != null && data.remote?.path != null) {
 			const matcher = await getRemoteProviderMatcher(this.container);
-			const provider = matcher(data.remote.url, data.remote.domain, data.remote.path);
+			const provider = matcher(data.remote.url, data.remote.domain, data.remote.path, undefined);
 			name = provider?.repoName ?? data.remote.path;
 		} else {
 			name =

src/plus/integrations/providers/github/sub-providers/remotes.ts

@@ -19,6 +19,7 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase {
 		const [, owner, repo] = uri.path.split('/', 3);
 
 		const url = `https://github.com/${owner}/${repo}.git`;
+		const protocol = 'https';
 		const domain = 'github.com';
 		const path = `${owner}/${repo}`;
 
@@ -27,10 +28,10 @@ export class RemotesGitSubProvider extends RemotesGitProviderBase {
 				this.container,
 				repoPath,
 				'origin',
-				'https',
+				protocol,
 				domain,
 				path,
-				(await getRemoteProviderMatcher(this.container, providers))(url, domain, path),
+				(await getRemoteProviderMatcher(this.container, providers))(url, domain, path, protocol),
 				[
 					{ type: 'fetch', url: url },
 					{ type: 'push', url: url },