Poa tls changes

packages/sdk-utils/src/request.js

@@ -1,4 +1,5 @@
 import percy from './percy-info.js';
+import logger from './logger.js';
 
 // Helper to send a request to the local CLI API
 export async function request(path, options = {}) {
@@ -53,6 +54,9 @@ if (process.env.__PERCY_BROWSERIFIED__) {
     // rollup throws error for -> await import(protocol === 'https:' ? 'https' : 'http')
     let { default: http } = protocol === 'https:' ? await import('https') : await import('http');
 
+    const log = logger('request');
+    log.debug(`Request object for url: ${url},\nRequest object: ${JSON.stringify(options)}`);
+
     return new Promise((resolve, reject) => {
       http.request(url, options)
         .on('response', response => {

packages/webdriver-utils/src/driver.js

@@ -1,5 +1,6 @@
 import utils from '@percy/sdk-utils';
 import Cache from './util/cache.js';
+import httpsAgent from './util/utils.js';
 const { request } = utils;
 const log = utils.logger('webdriver-utils:driver');
 
@@ -13,8 +14,11 @@ export default class Driver {
   async getCapabilites() {
     return await Cache.withCache(Cache.caps, this.sessionId, async () => {
       try {
+        const options = {
+          agent: httpsAgent()
+        };
         const baseUrl = `${this.executorUrl}/session/${this.sessionId}`;
-        const caps = JSON.parse((await request(baseUrl)).body);
+        const caps = JSON.parse((await request(baseUrl, options)).body);
         return caps.value;
       } catch (err) {
         log.warn(`Falling back to legacy protocol, Error: ${err.message}`);
@@ -24,8 +28,11 @@ export default class Driver {
   }
 
   async getWindowSize() {
+    const options = {
+      agent: httpsAgent()
+    };
     const baseUrl = `${this.executorUrl}/session/${this.sessionId}/window/current/size`;
-    const windowSize = JSON.parse((await request(baseUrl)).body);
+    const windowSize = JSON.parse((await request(baseUrl, options)).body);
     return windowSize;
   }
 
@@ -48,6 +55,7 @@ export default class Driver {
       headers: {
         'Content-Type': 'application/json;charset=utf-8'
       },
+      agent: httpsAgent(),
       body: JSON.stringify(command)
     };
     const baseUrl = `${this.executorUrl}/session/${this.sessionId}/execute/sync`;
@@ -56,14 +64,20 @@ export default class Driver {
   }
 
   async takeScreenshot() {
+    const options = {
+      agent: httpsAgent()
+    };
     const baseUrl = `${this.executorUrl}/session/${this.sessionId}/screenshot`;
-    const screenShot = JSON.parse((await request(baseUrl)).body);
+    const screenShot = JSON.parse((await request(baseUrl, options)).body);
     return screenShot.value;
   }
 
   async rect(elementId) {
+    const options = {
+      agent: httpsAgent()
+    };
     const baseUrl = `${this.executorUrl}/session/${this.sessionId}/element/${elementId}/rect`;
-    const response = JSON.parse((await request(baseUrl)).body);
+    const response = JSON.parse((await request(baseUrl, options)).body);
     return response.value;
   }
 
@@ -73,6 +87,7 @@ export default class Driver {
       headers: {
         'Content-Type': 'application/json;charset=utf-8'
       },
+      agent: httpsAgent(),
       body: JSON.stringify({ using, value })
     };
     const baseUrl = `${this.executorUrl}/session/${this.sessionId}/element`;

packages/webdriver-utils/src/providers/genericProvider.js

@@ -4,6 +4,7 @@ import MetaDataResolver from '../metadata/metaDataResolver.js';
 import Tile from '../util/tile.js';
 import Driver from '../driver.js';
 import Cache from '../util/cache.js';
+import httpsAgent from '../util/utils.js';
 const { request } = utils;
 
 const DEVICES_CONFIG_URL = 'https://storage.googleapis.com/percy-utils/devices.json';
@@ -272,7 +273,7 @@ export default class GenericProvider {
   async getHeaderFooter(deviceName, osVersion, browserName) {
     // passing 0 as key, since across different pages and tests, this config will remain same
     const devicesConfig = await Cache.withCache(Cache.devicesConfig, 0, async () => {
-      return (await request(DEVICES_CONFIG_URL)).body;
+      return (await request(DEVICES_CONFIG_URL, httpsAgent())).body;
     });
     let deviceKey = `${deviceName}-${osVersion}`;
     return devicesConfig[deviceKey]

packages/webdriver-utils/src/util/utils.js

@@ -0,0 +1,10 @@
+import https from 'https';
+
+export function httpsAgent() {
+  return new https.Agent({
+    minVersion: 'TLSv1.2',
+    maxVersion: 'TLSv1.2'
+  });
+}
+
+export default httpsAgent;

packages/webdriver-utils/test/driver.test.js

@@ -33,7 +33,10 @@ describe('Driver', () => {
   describe('getCapabilities', () => {
     it('calls requests', async () => {
       let res = await driver.getCapabilites();
-      expect(requestSpy).toHaveBeenCalledOnceWith(`${executorUrl}/session/${sessionId}`, Object({}));
+      expect(requestSpy).toHaveBeenCalledWith(
+        `${executorUrl}/session/${sessionId}`,
+        { agent: jasmine.any(Object) }
+      );
       expect(res).toBe('mockVal');
     });
   });
@@ -56,7 +59,9 @@ describe('Driver', () => {
 
     it('falls back to passed capabilites', async () => {
       let res = await newDriver.getCapabilites();
-      expect(requestFailedSpy).toHaveBeenCalledOnceWith(`${executorUrl}/session/${sessionId}`, Object({}));
+      expect(requestFailedSpy).toHaveBeenCalledOnceWith(`${executorUrl}/session/${sessionId}`,
+        { agent: jasmine.any(Object) }
+      );
       expect(res).toBe(passedCapabilities);
     });
   });
@@ -66,7 +71,7 @@ describe('Driver', () => {
       let res = await driver.getWindowSize();
       expect(requestSpy).toHaveBeenCalledOnceWith(
         `${executorUrl}/session/${sessionId}/window/current/size`,
-        Object({}));
+        { agent: jasmine.any(Object) });
       expect(res).toEqual({ value: 'mockVal' });
     });
   });
@@ -83,7 +88,8 @@ describe('Driver', () => {
           headers: {
             'Content-Type': 'application/json;charset=utf-8'
           },
-          body: JSON.stringify(command)
+          body: JSON.stringify(command),
+          agent: jasmine.any(Object)
         }
       );
       expect(res).toEqual({ value: 'mockVal' });
@@ -100,7 +106,8 @@ describe('Driver', () => {
           headers: {
             'Content-Type': 'application/json;charset=utf-8'
           },
-          body: JSON.stringify(command)
+          body: JSON.stringify(command),
+          agent: jasmine.any(Object)
         }
       );
       expect(res).toEqual({ value: 'mockVal' });
@@ -119,7 +126,7 @@ describe('Driver', () => {
       let res = await driver.takeScreenshot();
       expect(requestSpy).toHaveBeenCalledOnceWith(
         `${executorUrl}/session/${sessionId}/screenshot`,
-        Object({}));
+        { agent: jasmine.any(Object) });
       expect(res).toEqual('mockVal');
     });
   });
@@ -136,7 +143,8 @@ describe('Driver', () => {
           headers: {
             'Content-Type': 'application/json;charset=utf-8'
           },
-          body: JSON.stringify({ using, value: value })
+          body: JSON.stringify({ using, value: value }),
+          agent: jasmine.any(Object)
         }
       );
       expect(res).toEqual('mockVal');
@@ -157,7 +165,7 @@ describe('Driver', () => {
       let res = await driver.rect(elementId);
       expect(requestSpy).toHaveBeenCalledOnceWith(
         `${executorUrl}/session/${sessionId}/element/${elementId}/rect`,
-        Object({}));
+        { agent: jasmine.any(Object) });
       expect(res).toEqual('mockVal');
     });
   });