chore: fix invalid URL when trying a registry using basic auth

fixes podman-desktop#6344 Signed-off-by: Florent Benoit <[email protected]>
axel7083 · Mar 11, 2024 · 9d0cd33 · 9d0cd33
1 parent bb64408
commit 9d0cd33
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/packages/main/src/plugin/image-registry.spec.ts b/packages/main/src/plugin/image-registry.spec.ts
@@ -171,6 +171,36 @@ test('should map ecr', () => {
   expect(registryServer).toBe('12345.dkr.ecr.us-east-1.amazonaws.com');
 });
 
+describe('extract auth info', () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test('getAuthInfo with basic auth', async () => {
+    // reply a 401 Unauthorized error with a custom header having the www-authenticate field
+    nock('https://my-podman-desktop-fake-registry.io').get('/v2/').reply(401, '', {
+      'Www-Authenticate': 'Basic realm="Registry Realm"',
+    });
+
+    const value = await imageRegistry.getAuthInfo('https://my-podman-desktop-fake-registry.io');
+    expect(value).toBeDefined();
+    expect(value?.authUrl).toBe('https://my-podman-desktop-fake-registry.io/v2/');
+    expect(value?.scheme).toBe('basic');
+  });
+
+  test('getAuthInfo from docker.io with bearer', async () => {
+    // reply a 401 Unauthorized error with a custom header having the www-authenticate field
+    nock('https://my-podman-desktop-fake-registry.io').get('/v2/').reply(401, '', {
+      'www-authenticate': 'Bearer realm="https://auth.docker.io/token",service="registry.docker.io"',
+    });
+
+    const value = await imageRegistry.getAuthInfo('https://my-podman-desktop-fake-registry.io');
+    expect(value).toBeDefined();
+    expect(value?.authUrl).toBe('https://auth.docker.io/token?service=registry.docker.io');
+    expect(value?.scheme).toBe('bearer');
+  });
+});
+
 describe('extractImageDataFromImageName', () => {
   test('library image', () => {
     const nameAndTag = imageRegistry.extractImageDataFromImageName('httpd');

diff --git a/packages/main/src/plugin/image-registry.ts b/packages/main/src/plugin/image-registry.ts
@@ -735,12 +735,12 @@ export class ImageRegistry {
         if (wwwAuthenticate) {
           const authInfo = this.extractAuthData(wwwAuthenticate);
           if (authInfo) {
-            const url = new URL(authInfo.authUrl);
             scheme = authInfo.scheme?.toLowerCase();
             // in case of basic auth, we use directly the registry URL
             if (scheme === 'basic') {
               return { authUrl: registryUrl, scheme };
             }
+            const url = new URL(authInfo.authUrl);
             if (authInfo.service) {
               url.searchParams.set('service', authInfo.service);
             }