fix failing test

Kong · Dec 13, 2024 · b936b18 · b936b18
1 parent 4446d2c
commit b936b18
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/packages/insomnia-sdk/src/objects/insomnia.ts b/packages/insomnia-sdk/src/objects/insomnia.ts
@@ -180,7 +180,9 @@ export async function initInsomniaObject(
     const host = reqUrl.getHost().replace(/{{\s*\_\./g, '{{');
     const renderedHost = variables.replaceIn(host);
 
-    const filteredCerts = filterClientCertificates(rawObj.clientCertificates || [], renderedHost, 'https:');
+    const renderedBaseUrl = toUrlObject(`${reqUrl.protocol}//${renderedHost}`);
+
+    const filteredCerts = filterClientCertificates(rawObj.clientCertificates || [], renderedBaseUrl.toString());
     const existingClientCert = filteredCerts != null && filteredCerts.length > 0 && filteredCerts[0];
     const certificate = existingClientCert ?
         {

diff --git a/packages/insomnia-sdk/src/objects/request.ts b/packages/insomnia-sdk/src/objects/request.ts
@@ -515,6 +515,8 @@ export function mergeClientCertificates(
             ...baseCertificate,
             key: null,
             cert: null,
+            name: updatedReq.certificate.name || '',
+            disabled: updatedReq.certificate.disabled || false,
             passphrase: updatedReq.certificate.passphrase || null,
             pfx: updatedReq.certificate.pfx?.src,
         }];

diff --git a/packages/insomnia-smoke-test/fixtures/pre-request-collection.yaml b/packages/insomnia-smoke-test/fixtures/pre-request-collection.yaml
@@ -300,7 +300,7 @@ resources:
           cert: {src: 'invalid.cert'},
           passphrase: '',
           pfx: {src: ''},
-      });    
+      });
     _type: request
   - _id: req_89dade2ee9ee42fbb22d588783a9df3e
     parentId: fld_01de564274824ecaad272330339ea6b2

diff --git a/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts b/packages/insomnia-smoke-test/tests/smoke/pre-request-script-features.test.ts
@@ -381,7 +381,7 @@ test.describe('pre-request features tests', async () => {
         // update proxy configuration
         await page.locator('text=Add Certificates').click();
         await page.locator('text=Add client certificate').click();
-        await page.locator('[name="host"]').fill('a.com');
+        await page.locator('[name="host"]').fill('127.0.0.1');
         await page.locator('[data-key="pfx"]').click();
 
         const fileChooserPromise = page.waitForEvent('filechooser');

diff --git a/packages/insomnia/src/network/certificate.ts b/packages/insomnia/src/network/certificate.ts
@@ -2,7 +2,7 @@ import type { ClientCertificate } from '../models/client-certificate';
 import { setDefaultProtocol } from '../utils/url/protocol';
 import { urlMatchesCertHost } from './url-matches-cert-host';
 
-export function filterClientCertificates(clientCertificates: ClientCertificate[], requestUrl: string, protocol: string) {
+export function filterClientCertificates(clientCertificates: ClientCertificate[], requestUrl: string, protocol?: string) {
   const res = clientCertificates.filter(c => !c.disabled && urlMatchesCertHost(setDefaultProtocol(c.host, protocol), requestUrl, true));
   // If didn't get a matching certificate at the first time, ignore the port check and try again
   if (!res.length) {