Add a command-line option to disable the Content Security Policy

mdmintz · mdmintz · commit 2d13833f8db9 · 2019-03-20T03:13:46.000-04:00
diff --git a/seleniumbase/config/settings.py b/seleniumbase/config/settings.py
@@ -67,10 +67,20 @@
 # Messenger notifications appear when reaching assert statements in Demo Mode.
 DEFAULT_MESSAGE_DURATION = 2.55
 
-# If True, the Content Security Policy will be disabled on Chrome and Firefox.
+# If True, the Content Security Policy will be disabled on Firefox.
 # If False, each website's default Content Security Policy will be used.
 # (A website's CSP may prevent SeleniumBase from loading custom JavaScript.)
-DISABLE_CONTENT_SECURITY_POLICY = True
+# If using demo_mode or MasterQA, this value will become True regardless.
+# You can also disable the CSP on the command line by using "--disable_csp".
+DISABLE_CSP_ON_FIREFOX = True
+
+# If True, the Content Security Policy will be disabled on Chrome.
+# If False, each website's default Content Security Policy will be used.
+# (A website's CSP may prevent SeleniumBase from loading custom JavaScript.)
+# If using demo_mode or MasterQA, this value will become True regardless,
+# with the exception of running in headless mode, in which case it'll be False.
+# You can also disable the CSP on the command line by using "--disable_csp".
+DISABLE_CSP_ON_CHROME = False
 
 # If True, an Exception is raised immediately for invalid proxy string syntax.
 # If False, a Warning will appear after the test, with no proxy server used.
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
@@ -95,7 +95,7 @@ def _add_chrome_disable_csp_extension(chrome_options):
 
 def _set_chrome_options(
         downloads_path, headless, proxy_string, proxy_auth,
-        proxy_user, proxy_pass, user_agent):
+        proxy_user, proxy_pass, user_agent, disable_csp):
     chrome_options = webdriver.ChromeOptions()
     prefs = {
         "download.default_directory": downloads_path,
@@ -119,7 +119,7 @@ def _set_chrome_options(
     chrome_options.add_argument("--disable-single-click-autofill")
     chrome_options.add_argument("--disable-translate")
     chrome_options.add_argument("--disable-web-security")
-    if settings.DISABLE_CONTENT_SECURITY_POLICY and not headless:
+    if (settings.DISABLE_CSP_ON_CHROME or disable_csp) and not headless:
         # Headless Chrome doesn't support extensions, which are required
         # for disabling the Content Security Policy on Chrome
         chrome_options = _add_chrome_disable_csp_extension(chrome_options)
@@ -131,7 +131,8 @@ def _set_chrome_options(
     return chrome_options
 
 
-def _create_firefox_profile(downloads_path, proxy_string, user_agent):
+def _create_firefox_profile(
+        downloads_path, proxy_string, user_agent, disable_csp):
     profile = webdriver.FirefoxProfile()
     profile.accept_untrusted_certs = True
     profile.set_preference("reader.parse-on-load.enabled", False)
@@ -150,7 +151,7 @@ def _create_firefox_profile(downloads_path, proxy_string, user_agent):
         profile.set_preference("general.useragent.override", user_agent)
     profile.set_preference(
         "security.mixed_content.block_active_content", False)
-    if settings.DISABLE_CONTENT_SECURITY_POLICY:
+    if settings.DISABLE_CSP_ON_FIREFOX or disable_csp:
         profile.set_preference("security.csp.enable", False)
     profile.set_preference(
         "browser.download.manager.showAlertOnComplete", False)
@@ -216,7 +217,7 @@ def validate_proxy_string(proxy_string):
 
 def get_driver(browser_name, headless=False, use_grid=False,
                servername='localhost', port=4444, proxy_string=None,
-               user_agent=None, cap_file=None):
+               user_agent=None, cap_file=None, disable_csp=None):
     proxy_auth = False
     proxy_user = None
     proxy_pass = None
@@ -245,16 +246,16 @@ def get_driver(browser_name, headless=False, use_grid=False,
     if use_grid:
         return get_remote_driver(
             browser_name, headless, servername, port, proxy_string, proxy_auth,
-            proxy_user, proxy_pass, user_agent, cap_file)
+            proxy_user, proxy_pass, user_agent, cap_file, disable_csp)
     else:
         return get_local_driver(
             browser_name, headless, proxy_string, proxy_auth,
-            proxy_user, proxy_pass, user_agent)
+            proxy_user, proxy_pass, user_agent, disable_csp)
 
 
 def get_remote_driver(
         browser_name, headless, servername, port, proxy_string, proxy_auth,
-        proxy_user, proxy_pass, user_agent, cap_file):
+        proxy_user, proxy_pass, user_agent, cap_file, disable_csp):
     downloads_path = download_helper.get_downloads_folder()
     download_helper.reset_downloads_folder()
     address = "http://%s:%s/wd/hub" % (servername, port)
@@ -264,7 +265,7 @@ def get_remote_driver(
     if browser_name == constants.Browser.GOOGLE_CHROME:
         chrome_options = _set_chrome_options(
             downloads_path, headless, proxy_string, proxy_auth,
-            proxy_user, proxy_pass, user_agent)
+            proxy_user, proxy_pass, user_agent, disable_csp)
         if headless:
             if not proxy_auth:
                 # Headless Chrome doesn't support extensions, which are
@@ -285,7 +286,7 @@ def get_remote_driver(
         try:
             # Use Geckodriver for Firefox if it's on the PATH
             profile = _create_firefox_profile(
-                downloads_path, proxy_string, user_agent)
+                downloads_path, proxy_string, user_agent, disable_csp)
             firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
             firefox_capabilities['marionette'] = True
             if headless:
@@ -302,7 +303,7 @@ def get_remote_driver(
         except WebDriverException:
             # Don't use Geckodriver: Only works for old versions of Firefox
             profile = _create_firefox_profile(
-                downloads_path, proxy_string, user_agent)
+                downloads_path, proxy_string, user_agent, disable_csp)
             firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
             firefox_capabilities['marionette'] = False
             if headless:
@@ -382,7 +383,7 @@ def get_remote_driver(
 
 def get_local_driver(
         browser_name, headless, proxy_string, proxy_auth,
-        proxy_user, proxy_pass, user_agent):
+        proxy_user, proxy_pass, user_agent, disable_csp):
     '''
     Spins up a new web browser and returns the driver.
     Can also be used to spin up additional browsers for the same test.
@@ -395,7 +396,7 @@ def get_local_driver(
             try:
                 # Use Geckodriver for Firefox if it's on the PATH
                 profile = _create_firefox_profile(
-                    downloads_path, proxy_string, user_agent)
+                    downloads_path, proxy_string, user_agent, disable_csp)
                 firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
                 firefox_capabilities['marionette'] = True
                 options = webdriver.FirefoxOptions()
@@ -416,7 +417,7 @@ def get_local_driver(
             except WebDriverException:
                 # Don't use Geckodriver: Only works for old versions of Firefox
                 profile = _create_firefox_profile(
-                    downloads_path, proxy_string, user_agent)
+                    downloads_path, proxy_string, user_agent, disable_csp)
                 firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
                 firefox_capabilities['marionette'] = False
                 firefox_driver = webdriver.Firefox(
@@ -475,7 +476,7 @@ def get_local_driver(
         try:
             chrome_options = _set_chrome_options(
                 downloads_path, headless, proxy_string, proxy_auth,
-                proxy_user, proxy_pass, user_agent)
+                proxy_user, proxy_pass, user_agent, disable_csp)
             if headless:
                 # Headless Chrome doesn't support extensions, which are
                 # required when using a proxy server that has authentication.
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -2405,7 +2405,7 @@ def save_screenshot(self, name, folder=None):
 
     def get_new_driver(self, browser=None, headless=None,
                        servername=None, port=None, proxy=None, agent=None,
-                       switch_to=True, cap_file=None):
+                       switch_to=True, cap_file=None, disable_csp=None):
         """ This method spins up an extra browser for tests that require
             more than one. The first browser is already provided by tests
             that import base_case.BaseCase from seleniumbase. If parameters
@@ -2473,7 +2473,8 @@ def get_new_driver(self, browser=None, headless=None,
                                                  port=port,
                                                  proxy_string=proxy_string,
                                                  user_agent=user_agent,
-                                                 cap_file=cap_file)
+                                                 cap_file=cap_file,
+                                                 disable_csp=disable_csp)
         self._drivers_list.append(new_driver)
         if switch_to:
             self.driver = new_driver
@@ -2843,6 +2844,7 @@ def setUp(self):
             self.js_checking_on = sb_config.js_checking_on
             self.ad_block_on = sb_config.ad_block_on
             self.verify_delay = sb_config.verify_delay
+            self.disable_csp = sb_config.disable_csp
             self.save_screenshot_after_test = sb_config.save_screenshot
             self.timeout_multiplier = sb_config.timeout_multiplier
             self.use_grid = False
@@ -2910,7 +2912,8 @@ def setUp(self):
                                           proxy=self.proxy_string,
                                           agent=self.user_agent,
                                           switch_to=True,
-                                          cap_file=self.cap_file)
+                                          cap_file=self.cap_file,
+                                          disable_csp=self.disable_csp)
         self._default_driver = self.driver
 
     def __insert_test_result(self, state, err):
diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py
@@ -159,6 +159,15 @@ def pytest_addoption(parser):
                      default=None,
                      help="""Setting this overrides the default wait time
                           before each MasterQA verification pop-up.""")
+    parser.addoption('--disable_csp', action="store_true",
+                     dest='disable_csp',
+                     default=False,
+                     help="""Using this disables the Content Security Policy of
+                          websites, which may interfere with some features of
+                          SeleniumBase, such as loading custom JavaScript
+                          libraries for various testing actions.
+                          Setting this to True (--disable_csp) overrides the
+                          value set in seleniumbase/config/settings.py""")
     parser.addoption('--save_screenshot', action='store_true',
                      dest='save_screenshot',
                      default=False,
@@ -201,6 +210,7 @@ def pytest_configure(config):
     sb_config.js_checking_on = config.getoption('js_checking_on')
     sb_config.ad_block_on = config.getoption('ad_block_on')
     sb_config.verify_delay = config.getoption('verify_delay')
+    sb_config.disable_csp = config.getoption('disable_csp')
     sb_config.save_screenshot = config.getoption('save_screenshot')
     sb_config.timeout_multiplier = config.getoption('timeout_multiplier')
 
diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py
@@ -28,6 +28,7 @@ class SeleniumBrowser(Plugin):
     self.options.js_checking_on -- option to check for js errors (--check_js)
     self.options.ad_block -- the option to block some display ads (--ad_block)
     self.options.verify_delay -- delay before MasterQA checks (--verify_delay)
+    self.options.disable_csp -- disable Content Security Policy (--disable_csp)
     self.options.save_screenshot -- save screen after test (--save_screenshot)
     self.options.timeout_multiplier -- increase defaults (--timeout_multiplier)
     """
@@ -127,6 +128,16 @@ def options(self, parser, env):
             dest='verify_delay', default=None,
             help="""Setting this overrides the default wait time
                     before each MasterQA verification pop-up.""")
+        parser.add_option(
+            '--disable_csp', action="store_true",
+            dest='disable_csp',
+            default=False,
+            help="""Using this disables the Content Security Policy of
+                    websites, which may interfere with some features of
+                    SeleniumBase, such as loading custom JavaScript
+                    libraries for various testing actions.
+                    Setting this to True (--disable_csp) overrides the
+                    value set in seleniumbase/config/settings.py""")
         parser.add_option(
             '--save_screenshot', action="store_true",
             dest='save_screenshot',
@@ -163,6 +174,7 @@ def beforeTest(self, test):
         test.test.js_checking_on = self.options.js_checking_on
         test.test.ad_block_on = self.options.ad_block_on
         test.test.verify_delay = self.options.verify_delay  # MasterQA
+        test.test.disable_csp = self.options.disable_csp
         test.test.save_screenshot_after_test = self.options.save_screenshot
         test.test.timeout_multiplier = self.options.timeout_multiplier
         test.test.use_grid = False
