From 6d0f8a27f417b1427ff15c5302c58c25a83f5d93 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Fri, 24 Nov 2023 19:47:30 +0800
Subject: [PATCH] =?UTF-8?q?4.0.0b12=E8=A7=A3=E5=86=B3=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8403=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/_base/chromium_driver.py | 7 ++++---
 DrissionPage/_commons/browser.py      | 8 +-------
 DrissionPage/_configs/configs.ini     | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/DrissionPage/_base/chromium_driver.py b/DrissionPage/_base/chromium_driver.py
index a7392a4..6ba3127 100644
--- a/DrissionPage/_base/chromium_driver.py
+++ b/DrissionPage/_base/chromium_driver.py
@@ -9,8 +9,8 @@ from threading import Thread, Event
 from time import perf_counter
 
 from requests import get
-from websocket import WebSocketTimeoutException, WebSocketException, WebSocketConnectionClosedException, \
-    create_connection
+from websocket import (WebSocketTimeoutException, WebSocketException, WebSocketConnectionClosedException, \
+                       create_connection)
 
 
 class ChromiumDriver(object):
@@ -172,7 +172,8 @@ class ChromiumDriver(object):
     def start(self):
         """启动连接"""
         self._stopped.clear()
-        self._ws = create_connection(self._websocket_url, enable_multithread=True)
+        self._ws = create_connection(self._websocket_url, enable_multithread=True,
+                                     suppress_origin=True)
         self._recv_th.start()
         self._handle_event_th.start()
         return True
diff --git a/DrissionPage/_commons/browser.py b/DrissionPage/_commons/browser.py
index f06f881..b8c3440 100644
--- a/DrissionPage/_commons/browser.py
+++ b/DrissionPage/_commons/browser.py
@@ -65,7 +65,6 @@ def get_launch_args(opt):
     # ----------处理arguments-----------
     result = set()
     has_user_path = False
-    remote_allow = False
     headless = None
     for i in opt.arguments:
         if i.startswith(('--load-extension=', '--remote-debugging-port=')):
@@ -74,8 +73,6 @@ def get_launch_args(opt):
             result.add(f'--user-data-dir={Path(i[16:]).absolute()}')
             has_user_path = True
             continue
-        elif i.startswith('--remote-allow-origins='):
-            remote_allow = True
         elif i.startswith('--headless'):
             if i == '--headless=false':
                 headless = False
@@ -95,9 +92,6 @@ def get_launch_args(opt):
         opt.set_user_data_path(path)
         result.add(f'--user-data-dir={path}')
 
-    if not remote_allow:
-        result.add('--remote-allow-origins=*')
-
     if headless is None and system().lower() == 'linux':
         from os import popen
         r = popen('systemctl list-units | grep graphical.target')
@@ -215,7 +209,7 @@ def test_connect(ip, port, timeout=30):
             sleep(.2)
 
     raise BrowserConnectError(f'\n{ip}:{port}浏览器无法链接。\n请确认：\n1、该端口为浏览器\n'
-                              f'2、已添加--remote-allow-origins=*和--remote-debugging-port={port}启动项\n'
+                              f'2、已添加--remote-debugging-port={port}启动项\n'
                               f'3、用户文件夹没有和已打开的浏览器冲突\n'
                               f'4、如为无界面系统，请添加--headless=new参数\n'
                               f'5、如果是Linux系统，可能还要添加--no-sandbox启动参数\n'
diff --git a/DrissionPage/_configs/configs.ini b/DrissionPage/_configs/configs.ini
index 62e1746..a977a3b 100644
--- a/DrissionPage/_configs/configs.ini
+++ b/DrissionPage/_configs/configs.ini
@@ -4,7 +4,7 @@ download_path =
 [chrome_options]
 debugger_address = 127.0.0.1:9222
 browser_path = chrome
-arguments = ['--remote-allow-origins=*', '--no-first-run', '--disable-infobars', '--disable-popup-blocking']
+arguments = ['--no-first-run', '--disable-infobars', '--disable-popup-blocking']
 extensions = []
 prefs = {'profile.default_content_settings.popups': 0, 'profile.default_content_setting_values': {'notifications': 2}}
 flags = {}