fix(git-url): clean up state of parsed URL (#24306)

Signed-off-by: Luís Cobucci <lcobucci@gmail.com> Co-authored-by: Tobias <github@tobiasgabriel.de>
renovatebot · Sep 14, 2023 · 0b50feb · 0b50feb
1 parent 69e7c80
commit 0b50feb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/lib/modules/manager/git-submodules/extract.spec.ts b/lib/modules/manager/git-submodules/extract.spec.ts
@@ -247,7 +247,7 @@ describe('modules/manager/git-submodules/extract', () => {
             currentValue: 'main',
             depName: 'some-azure',
             packageName:
-              'https://organization@dev.azure.com/organization/whitespace%20project/_git/repo',
+              'https://dev.azure.com/organization/whitespace%20project/_git/repo',
           },
         ],
       });

diff --git a/lib/util/git/url.spec.ts b/lib/util/git/url.spec.ts
@@ -78,6 +78,21 @@ describe('util/git/url', () => {
         'https://x-access-token:token@github.com/some/repo'
       );
     });
+
+    it('removes username/password from URL', () => {
+      expect(getHttpUrl('https://user:password@foo.bar/someOrg/someRepo')).toBe(
+        'https://foo.bar/someOrg/someRepo'
+      );
+    });
+
+    it('replaces username/password with given token', () => {
+      expect(
+        getHttpUrl(
+          'https://user:password@foo.bar/someOrg/someRepo',
+          'another-user:a-secret-pwd'
+        )
+      ).toBe('https://another-user:a-secret-pwd@foo.bar/someOrg/someRepo');
+    });
   });
 
   describe('getRemoteUrlWithToken()', () => {

diff --git a/lib/util/git/url.ts b/lib/util/git/url.ts
@@ -15,6 +15,7 @@ export function getHttpUrl(url: string, token?: string): string {
     ? parsedUrl.protocol
     : 'https';
 
+  parsedUrl.user = '';
   parsedUrl.token = token ?? '';
 
   if (token) {