fix(git): call getNetworkSettings with the origin of the repo (#2295)

Author: merceyz

.pnp.cjs

@@ -0,0 +1,24 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-git": patch
+  "@yarnpkg/plugin-github": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-node-modules"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/cache/@types-git-url-parse-npm-9.0.0-2704df37e9-3f4dbd6d5c.zip

@@ -30,5 +30,24 @@ describe(`Features`, () => {
         await expect(run(`add`, `no-deps`)).resolves.toMatchObject({code: 0, stderr: ``});
       })
     );
+
+    test(
+      `it should work with git URLs`,
+      makeTemporaryEnv({}, async ({path, run, source}) => {
+        await xfs.writeFilePromise(
+          `${path}/.yarnrc.yml`,
+          [
+            `networkSettings:`,
+            `  "github.com":`,
+            `    enableNetwork: false`,
+          ].join(`\n`)
+        );
+
+        await expect(run(`add`, `foo@git@github.com:foo/foo.git`)).rejects.toThrow(
+          / has been blocked because of your configuration settings/
+        );
+      }
+      )
+    );
   });
 });

.yarn/versions/9ce056ce.yml

@@ -14,6 +14,7 @@
     "@yarnpkg/core": "^3.0.0-rc.2"
   },
   "devDependencies": {
+    "@types/git-url-parse": "^9.0.0",
     "@yarnpkg/core": "workspace:*"
   },
   "repository": {

packages/acceptance-tests/pkg-tests-specs/sources/features/enableNetwork.test.js

@@ -1,5 +1,6 @@
 import {Configuration, Locator, execUtils, structUtils, httpUtils} from '@yarnpkg/core';
 import {npath, xfs}                                                from '@yarnpkg/fslib';
+import GitUrlParse                                                 from 'git-url-parse';
 import querystring                                                 from 'querystring';
 import semver                                                      from 'semver';
 import urlLib                                                      from 'url';
@@ -170,7 +171,7 @@ export function normalizeLocator(locator: Locator) {
 export async function lsRemote(repo: string, configuration: Configuration) {
   const normalizedRepoUrl = normalizeRepoUrl(repo, {git: true});
 
-  const networkSettings = httpUtils.getNetworkSettings(normalizedRepoUrl, {configuration});
+  const networkSettings = httpUtils.getNetworkSettings(`https://${GitUrlParse(normalizedRepoUrl).resource}`, {configuration});
   if (!networkSettings.enableNetwork)
     throw new Error(`Request to '${normalizedRepoUrl}' has been blocked because of your configuration settings`);
 
@@ -298,7 +299,7 @@ export async function clone(url: string, configuration: Configuration) {
       throw new Error(`Invalid treeish protocol when cloning`);
 
     const normalizedRepoUrl = normalizeRepoUrl(repo, {git: true});
-    if (httpUtils.getNetworkSettings(normalizedRepoUrl, {configuration}).enableNetwork === false)
+    if (httpUtils.getNetworkSettings(`https://${GitUrlParse(normalizedRepoUrl).resource}`, {configuration}).enableNetwork === false)
       throw new Error(`Request to '${normalizedRepoUrl}' has been blocked because of your configuration settings`);
 
     const directory = await xfs.mktempPromise();

packages/plugin-git/package.json

@@ -4393,6 +4393,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/git-url-parse@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@types/git-url-parse@npm:9.0.0"
+  checksum: 3f4dbd6d5ca3ba84221983ceffe4d81c6a79cc85529ba3d54b1d0963f2d91cbcffcd9998e8478ee18df73c9697cf05b8aeddb1349f9e65af0e4b039a89d7fff6
+  languageName: node
+  linkType: hard
+
 "@types/glob@npm:*, @types/glob@npm:^7.1.1":
   version: 7.1.1
   resolution: "@types/glob@npm:7.1.1"
@@ -6021,6 +6028,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@yarnpkg/plugin-git@workspace:packages/plugin-git"
   dependencies:
+    "@types/git-url-parse": ^9.0.0
     "@types/semver": ^7.1.0
     "@yarnpkg/core": "workspace:*"
     "@yarnpkg/fslib": "workspace:^2.5.0-rc.2"