Turned on the sec-fetch-dest header for Chrome

catchpoint · Apr 25, 2019 · 1bf502e · 1bf502e
1 parent fcf14e5
commit 1bf502e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/internal/chrome_android.py b/internal/chrome_android.py
@@ -44,6 +44,10 @@
     '"MAP clients1.google.com 127.0.0.1"'
 ]
 
+ENABLE_CHROME_FEATURES = [
+    'SecMetadata'
+]
+
 """ Orange page
 <html>
 <head>
@@ -109,6 +113,7 @@ def prepare(self, job, task):
     def launch(self, job, task):
         """Launch the browser"""
         args = list(CHROME_COMMAND_LINE_OPTIONS)
+        features = list(ENABLE_CHROME_FEATURES)
         host_rules = list(HOST_RULES)
         if 'host_rules' in task:
             host_rules.extend(task['host_rules'])
@@ -119,9 +124,9 @@ def launch(self, job, task):
             self.adb.shell(['rm', '/data/local/tmp/netlog.txt'])
             args.append('--log-net-log=/data/local/tmp/netlog.txt')
         if 'overrideHosts' in task and task['overrideHosts']:
-            args.append('--enable-features=NetworkService')
-        else:
-            args.append('--disable-features=NetworkService')
+            features.append('NetworkService')
+            features.append('NetworkServiceInProcess')
+        args.append('--enable-features=' + ','.join(features))
         command_line = 'chrome ' + ' '.join(args)
         if 'addCmdLine' in job:
             command_line += ' ' + job['addCmdLine']

diff --git a/internal/chrome_desktop.py b/internal/chrome_desktop.py
@@ -43,6 +43,12 @@
     '"MAP clients1.google.com 127.0.0.1"'
 ]
 
+ENABLE_CHROME_FEATURES = [
+    'NetworkService',
+    'NetworkServiceInProcess',
+    'SecMetadata'
+]
+
 class ChromeDesktop(DesktopBrowser, DevtoolsBrowser):
     """Desktop Chrome"""
     def __init__(self, path, options, job):
@@ -58,6 +64,7 @@ def launch(self, job, task):
         """Launch the browser"""
         self.install_policy()
         args = list(CHROME_COMMAND_LINE_OPTIONS)
+        features = list(ENABLE_CHROME_FEATURES)
         host_rules = list(HOST_RULES)
         if 'host_rules' in task:
             host_rules.extend(task['host_rules'])
@@ -73,16 +80,13 @@ def launch(self, job, task):
         if 'profile' in task:
             args.append('--user-data-dir="{0}"'.format(task['profile']))
             self.setup_prefs(task['profile'])
-        if 'overrideHosts' in task and task['overrideHosts']:
-            args.append('--enable-features=NetworkService')
-        else:
-            args.append('--disable-features=NetworkService')
         if self.options.xvfb:
             args.append('--disable-gpu')
         if self.options.dockerized:
             args.append('--no-sandbox')
         if platform.system() == "Linux":
             args.append('--disable-setuid-sandbox')
+        args.append('--enable-features=' + ','.join(features))
         if self.path.find(' ') > -1:
             command_line = '"{0}"'.format(self.path)
         else: