NPM: fix GitHub registry not working when path is specified (#7468)

dependabot · Jun 23, 2023 · bcdb78d · bcdb78d
1 parent c304cbb
commit bcdb78d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_parser.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_parser.rb
@@ -303,7 +303,7 @@ def url_for_relevant_cred(resolved_url)
                   else
                     URI("https://#{details['registry']}")
                   end
-            resolved_url_host == uri.host
+            resolved_url_host == uri.host && resolved_url.include?(details["registry"])
           end
 
         return unless credential_matching_url

diff --git a/npm_and_yarn/spec/dependabot/npm_and_yarn/file_parser_spec.rb b/npm_and_yarn/spec/dependabot/npm_and_yarn/file_parser_spec.rb
@@ -251,6 +251,31 @@
                 }]
               )
             end
+
+            context "with a credential that matches the hostname, but not the path" do
+              let(:credentials) do
+                [{
+                  "type" => "npm_registry",
+                  "registry" => "npm.pkg.github.com/dependabot",
+                  "username" => "x-access-token",
+                  "password" => "token"
+                }]
+              end
+
+              its(:requirements) do
+                is_expected.to eq(
+                  [{
+                    requirement: "^2.0.1",
+                    file: "package.json",
+                    groups: ["devDependencies"],
+                    source: {
+                      type: "registry",
+                      url: "https://npm.pkg.github.com"
+                    }
+                  }]
+                )
+              end
+            end
           end
 
           describe "the scoped gitlab dependency" do