manually merge pr GoogleChrome#9170

lighthouse-cli/bin.js

@@ -122,6 +122,19 @@ async function begin() {
     cliFlags.extraHeaders = JSON.parse(extraHeadersStr);
   }
 
+  if (cliFlags.extraCookies) {
+    // TODO: LH.Flags.extraCookies is actually a string at this point, but needs to be
+    // copied over to LH.Settings.extraCookies, which is LH.Crdp.Network.Cookies. Force
+    // the conversion here, but long term either the CLI flag or the setting should have
+    // a different name.
+    // @ts-ignore
+    const extraCookiesStr = /** @type {string} */ (cliFlags.extraCookies);
+    cliFlags.extraCookies = JSON.parse(extraCookiesStr);
+    if (!Array.isArray(cliFlags.extraCookies)) {
+      throw new Error('extraCookies parameter must be a valid JSON array');
+    }
+  }
+
   if (cliFlags.precomputedLanternDataPath) {
     const lanternDataStr = fs.readFileSync(cliFlags.precomputedLanternDataPath, 'utf8');
     /** @type {LH.PrecomputedLanternData} */

lighthouse-cli/cli-flags.js

@@ -53,11 +53,17 @@ function getFlags(manualArgv) {
           'lighthouse <url> --quiet --chrome-flags="--headless"',
           'Launch Headless Chrome, turn off logging')
       .example(
-          'lighthouse <url> --extra-headers "{\\"Cookie\\":\\"monster=blue\\", \\"x-men\\":\\"wolverine\\"}"',
+          'lighthouse <url> --extra-headers "{\\"x-men\\":\\"wolverine\\"}"',
           'Stringify\'d JSON HTTP Header key/value pairs to send in requests')
       .example(
           'lighthouse <url> --extra-headers=./path/to/file.json',
           'Path to JSON file of HTTP Header key/value pairs to send in requests')
+      .example(
+        'lighthouse <url> --extra-cookies "[{\\"name\\":\\"session_id\\",\\"value\\":\\"x-men\\" }]"',
+        'Stringify\'d JSON array of HTTP Cookies to send in requests')
+      .example(
+        'lighthouse <url> --extra-cookies=./path/to/file.json',
+        'Path to JSON file of HTTP Cookies to send in requests')
       .example(
           'lighthouse <url> --only-categories=performance,pwa',
           'Only run specific categories.')
@@ -126,6 +132,7 @@ function getFlags(manualArgv) {
         'max-wait-for-load':
             'The timeout (in milliseconds) to wait before the page is considered done loading and the run should continue. WARNING: Very high values can lead to large traces and instability',
         'extra-headers': 'Set extra HTTP Headers to pass with request',
+        'extra-cookies': 'Set extra HTTP Cookies to pass with request',
         'precomputed-lantern-data-path': 'Path to the file where lantern simulation data should be read from, overwriting the lantern observed estimates for RTT and server latency.',
         'lantern-data-output-path': 'Path to the file where lantern simulation data should be written to, can be used in a future run with the `precomputed-lantern-data-path` flag.',
         'only-audits': 'Only run the specified audits',
@@ -166,6 +173,7 @@ function getFlags(manualArgv) {
       .array('output')
       .array('plugins')
       .string('extraHeaders')
+      .string('extraCookies')
       .string('channel')
       .string('precomputedLanternDataPath')
       .string('lanternDataOutputPath')

lighthouse-cli/test/cli/__snapshots__/index-test.js.snap

@@ -1245,6 +1245,7 @@ Object {
     "channel": "cli",
     "disableStorageReset": false,
     "emulatedFormFactor": "mobile",
+    "extraCookies": null,
     "extraHeaders": null,
     "gatherMode": false,
     "locale": "en-US",
@@ -1379,6 +1380,7 @@ Object {
     "channel": "cli",
     "disableStorageReset": false,
     "emulatedFormFactor": "mobile",
+    "extraCookies": null,
     "extraHeaders": null,
     "gatherMode": false,
     "locale": "en-US",

lighthouse-cli/test/cli/bin-test.js

@@ -170,6 +170,22 @@ describe('CLI bin', function() {
     });
   });
 
+  describe('extraCookies', () => {
+    it('should convert extra cookies to object', async () => {
+      // @ts-ignore - see TODO: in bin.js
+      cliFlags = { ...cliFlags, extraCookies: '[{"name":"foo", "value": "bar", "url": "http://localhost"}]' };
+      await bin.begin();
+
+      expect(getRunLighthouseArgs()[1]).toHaveProperty('extraCookies', [{ 'name': 'foo', 'value': 'bar', 'url': 'http://localhost' }]);
+    });
+
+    it('should throw when invalid array is used', async () => {
+      // @ts-ignore - see TODO: in bin.js
+      cliFlags = { ...cliFlags, extraCookies: 'INVALID_JSON_ARRAY' };
+      await expect(bin.begin()).rejects.toBeTruthy();
+    });
+  });
+
   describe('precomputedLanternData', () => {
     it('should read lantern data from file', async () => {
       const lanternDataFile = require.resolve('../fixtures/lantern-data.json');

lighthouse-cli/test/fixtures/static-server.js

@@ -105,6 +105,19 @@ function requestHandler(request, response) {
         }
       }
 
+      if (params.has('extra_cookie')) {
+        const extraCookies = new URLSearchParams(params.get('extra_cookie'));
+        let cookeString = '';
+        for (const [cookieName, cookieValue] of extraCookies) {
+          cookeString += cookieName + '=' + cookieValue + ';';
+        }
+
+        // Extra cookie we allways override possible 'Set-Cookie' header
+        // which may be already present in request by extra_header
+        headers['Set-Cookie'] = [];
+        headers['Set-Cookie'].push(cookeString);
+      }
+
       if (params.has('gzip')) {
         useGzip = Boolean(params.get('gzip'));
       }

lighthouse-core/config/constants.js

@@ -60,6 +60,7 @@ const defaultSettings = {
   blockedUrlPatterns: null,
   additionalTraceCategories: null,
   extraHeaders: null,
+  extraCookies: null,
   precomputedLanternData: null,
   onlyAudits: null,
   onlyCategories: null,

lighthouse-core/gather/driver.js

@@ -1487,6 +1487,18 @@ class Driver {
     return this.sendCommand('Network.setExtraHTTPHeaders', {headers});
   }
 
+  /**
+   * @param {LH.Crdp.Network.CookieParam[]|null} cookies key/value pairs of HTTP Cookies.
+   * @return {Promise<void>}
+   */
+  async setCookies(cookies) {
+    if (!cookies) {
+      return;
+    }
+
+    return this.sendCommand('Network.setCookies', {cookies});
+  }
+
   /**
    * @param {string} url
    * @return {Promise<void>}

lighthouse-core/gather/gather-runner.js

@@ -230,7 +230,7 @@ class GatherRunner {
 
   /**
    * Initialize network settings for the pass, e.g. throttling, blocked URLs,
-   * and manual request headers.
+   * manual request headers and cookies.
    * @param {LH.Gatherer.PassContext} passContext
    * @return {Promise<void>}
    */
@@ -249,10 +249,31 @@ class GatherRunner {
     // neccessary at the beginning of the next pass.
     await passContext.driver.blockUrlPatterns(blockedUrls);
     await passContext.driver.setExtraHTTPHeaders(passContext.settings.extraHeaders);
+    await GatherRunner.setupCookies(passContext);
 
     log.timeEnd(status);
   }
 
+  /**
+   * Initialize cookies settings for pass
+   * and manual request headers.
+   * @param {LH.Gatherer.PassContext} passContext
+   * @return {Promise<void>}
+   */
+  static async setupCookies(passContext) {
+    const extraCookies = passContext.settings.extraCookies;
+    if (!extraCookies) {
+      return;
+    }
+    extraCookies.forEach(cookie => {
+      if (!cookie.url || !cookie.domain) {
+        // Default cookie URL to to current URL, if neither domain nor url is specified
+        cookie.url = passContext.url;
+      }
+    });
+    await passContext.driver.setCookies(extraCookies);
+  }
+
   /**
    * Beging recording devtoolsLog and trace (if requested).
    * @param {LH.Gatherer.PassContext} passContext

lighthouse-core/test/gather/driver-test.js

@@ -355,6 +355,32 @@ describe('.setExtraHTTPHeaders', () => {
   });
 });
 
+describe('.setCookies', () => {
+  it('should call Network.setCookies when there are extra-cookies', async () => {
+    connectionStub.sendCommand = createMockSendCommandFn().mockResponse(
+      'Network.setCookies',
+      {}
+    );
+
+    await driver.setCookies([{
+      'name': 'cookie1',
+      'value': 'monster',
+    }]);
+
+    expect(connectionStub.sendCommand).toHaveBeenCalledWith(
+      'Network.setCookies',
+      expect.anything()
+    );
+  });
+
+  it('should not call Network.setCookies when there aren\'t extra-cookies', async () => {
+    connectionStub.sendCommand = createMockSendCommandFn();
+    await driver.setCookies();
+
+    expect(connectionStub.sendCommand).not.toHaveBeenCalled();
+  });
+});
+
 describe('.getAppManifest', () => {
   it('should return null when no manifest', async () => {
     connectionStub.sendCommand = createMockSendCommandFn().mockResponse(

lighthouse-core/test/gather/fake-driver.js

@@ -87,6 +87,9 @@ function makeFakeDriver({protocolGetVersionResponse}) {
     setExtraHTTPHeaders() {
       return Promise.resolve();
     },
+    setCookies() {
+      return Promise.resolve();
+    }
   };
 }
 

lighthouse-core/test/gather/gather-runner-test.js

@@ -40,7 +40,7 @@ const fakeDriver = require('./fake-driver.js');
 const fakeDriverUsingRealMobileDevice = fakeDriver.fakeDriverUsingRealMobileDevice;
 
 function getMockedEmulationDriver(emulationFn, netThrottleFn, cpuThrottleFn,
-  blockUrlFn, extraHeadersFn) {
+  blockUrlFn, extraHeadersFn, extraCookiesFn) {
   const Driver = require('../../gather/driver.js');
   const Connection = require('../../gather/connections/connection.js');
   const EmulationDriver = class extends Driver {
@@ -81,6 +81,9 @@ function getMockedEmulationDriver(emulationFn, netThrottleFn, cpuThrottleFn,
         case 'Network.setExtraHTTPHeaders':
           fn = extraHeadersFn;
           break;
+        case 'Network.setCookies':
+          fn = extraCookiesFn;
+          break;
         default:
           fn = null;
           break;
@@ -397,6 +400,7 @@ describe('GatherRunner', function() {
       setThrottling: asyncFunc,
       blockUrlPatterns: asyncFunc,
       setExtraHTTPHeaders: asyncFunc,
+      setCookies: asyncFunc,
       endTrace: asyncFunc,
       endDevtoolsLog: () => [],
       getBrowserVersion: async () => ({userAgent: ''}),
@@ -577,6 +581,58 @@ describe('GatherRunner', function() {
       ));
   });
 
+  it('tells the driver to set additional cookies when extraCookies flag is given', () => {
+    let receivedCookies = null;
+    const driver = getMockedEmulationDriver(null, null, null, null, null, params => {
+      receivedCookies = params.cookies;
+    });
+    const cookies = [{
+      'name': 'cookie1',
+      'value': 'monster',
+      'domain': 'test.com',
+    }];
+
+    return GatherRunner.setupPassNetwork({
+      driver,
+      settings: {
+        extraCookies: cookies,
+      },
+      passConfig: { gatherers: [] },
+    }).then(() => assert.deepStrictEqual(
+      receivedCookies,
+      cookies
+    ));
+  });
+
+  it('uses current url as cookie\'s url if neither domain nor url is specified', () => {
+    let receivedCookies = null;
+    const driver = getMockedEmulationDriver(null, null, null, null, null, params => {
+      receivedCookies = params.cookies;
+    });
+    const inputCookies = [{
+      'name': 'cookie1',
+      'value': 'monster',
+    }];
+    const expectedCookies = [{
+      'name': 'cookie1',
+      'value': 'monster',
+      'url': 'http://test.com/some_path',
+    }];
+
+    return GatherRunner.setupPassNetwork({
+      url: 'http://test.com/some_path',
+      driver,
+      settings: {
+        extraCookies: inputCookies,
+      },
+      passConfig: { gatherers: [] },
+    }).then(() => assert.deepStrictEqual(
+      receivedCookies,
+      expectedCookies
+    ));
+  });
+
+
   it('tells the driver to begin tracing', async () => {
     let calledTrace = false;
     const driver = {

lighthouse-core/test/results/artifacts/artifacts.json

@@ -60,6 +60,7 @@
     "blockedUrlPatterns": null,
     "additionalTraceCategories": null,
     "extraHeaders": null,
+    "extraCookies": null,
     "precomputedLanternData": null,
     "onlyAudits": null,
     "onlyCategories": null,

lighthouse-core/test/results/sample_v2.json

@@ -3373,6 +3373,7 @@
     "blockedUrlPatterns": null,
     "additionalTraceCategories": null,
     "extraHeaders": null,
+    "extraCookies": null,
     "precomputedLanternData": null,
     "onlyAudits": null,
     "onlyCategories": null,

readme.md

@@ -101,6 +101,7 @@ Options:
   --throttling.uploadThroughputKbps    Controls emulated network upload throughput
   --throttling.cpuSlowdownMultiplier   Controls simulated + emulated CPU throttling
   --extra-headers               Set extra HTTP Headers to pass with request                                                                 [string]
+  --extra-cookies                      Set extra HTTP Cookies to pass with request
 
 Examples:
   lighthouse <url> --view                                                   Opens the HTML report in a browser after the run completes
@@ -113,6 +114,8 @@ Examples:
   lighthouse <url> --quiet --chrome-flags="--headless"                      Launch Headless Chrome, turn off logging
   lighthouse <url> --extra-headers "{\"Cookie\":\"monster=blue\"}"          Stringify\'d JSON HTTP Header key/value pairs to send in requests
   lighthouse <url> --extra-headers=./path/to/file.json                      Path to JSON file of HTTP Header key/value pairs to send in requests
+  lighthouse <url> --extra-cookies "[{\"name\":\"session_id\",\"value\":\"x-men\" }]" Stringify'd JSON array of HTTP Cookies to send in requests
+  lighthouse <url> --extra-cookies=./path/to/file.json  Path to JSON file of HTTP Cookies to send in requests
 
 For more information on Lighthouse, see https://developers.google.com/web/tools/lighthouse/.
 ```

types/externs.d.ts

@@ -113,6 +113,8 @@ declare global {
       onlyCategories?: string[] | null;
       /** If present, the run should skip this list of audits. */
       skipAudits?: string[] | null;
+      /** List of extra HTTP Cookies to include. */
+      extraCookies?: Crdp.Network.CookieParam[] | null; // See extraCookies TODO in bin.js
       /** List of extra HTTP Headers to include. */
       extraHeaders?: Crdp.Network.Headers | null; // See extraHeaders TODO in bin.js
       /** How Lighthouse was run, e.g. from the Chrome extension or from the npm module */