github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: fix chrome_app password_manager dialog

pull/15788/head
Eric 2025-07-25 14:34:26 +08:00 committed by 老广
parent 14e0396508
commit 04dca794dd
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/terminal/applets/chrome/ChangeLog
View File

@ -1,3 +1,7 @@
#2025-07-25 Version 1.3
## Bug 修复
- 修复 Chrome 密码管理器弹窗的问题
#2025-05-30 Version 1.2 #2025-05-30 Version 1.2
## 功能更新 ## 功能更新
- 新增用户配置的语言支持，默认使用系统当前语言 - 新增用户配置的语言支持，默认使用系统当前语言

10
apps/terminal/applets/chrome/app.py
View File

@ -210,7 +210,7 @@ def load_extensions():
return extension_paths return extension_paths
def default_chrome_driver_options(): def default_chrome_driver_options(languag: str = 'en') -> webdriver.ChromeOptions:
options = webdriver.ChromeOptions() options = webdriver.ChromeOptions()
options.add_argument("--start-maximized") options.add_argument("--start-maximized")
@ -225,7 +225,8 @@ def default_chrome_driver_options():
# 禁用 密码管理器弹窗 # 禁用 密码管理器弹窗
prefs = { prefs = {
"credentials_enable_service": False, "credentials_enable_service": False,
"profile.password_manager_enabled": False "profile.password_manager_enabled": False,
"intl.accept_languages": languag,
} }
options.add_experimental_option("prefs", prefs) options.add_experimental_option("prefs", prefs)
# chromedriver 退出后也不关闭浏览器 # chromedriver 退出后也不关闭浏览器
@ -243,7 +244,8 @@ class AppletApplication(BaseApplication):
self.app = WebAPP(app_name=self.app_name, user=self.user, self.app = WebAPP(app_name=self.app_name, user=self.user,
account=self.account, asset=self.asset, platform=self.platform) account=self.account, asset=self.asset, platform=self.platform)
self._tmp_user_dir = tempfile.TemporaryDirectory() self._tmp_user_dir = tempfile.TemporaryDirectory()
self._chrome_options = default_chrome_driver_options() lang = self.connect_option.lang if self.connect_option.lang else get_system_language()
self._chrome_options = default_chrome_driver_options(languag=lang)
self._chrome_options.add_argument("--app={}".format(self.asset.address)) self._chrome_options.add_argument("--app={}".format(self.asset.address))
self._chrome_options.add_argument("--user-data-dir={}".format(self._tmp_user_dir.name)) self._chrome_options.add_argument("--user-data-dir={}".format(self._tmp_user_dir.name))
protocol_setting = self.platform.get_protocol_setting(self.protocol) protocol_setting = self.platform.get_protocol_setting(self.protocol)
@ -252,8 +254,6 @@ class AppletApplication(BaseApplication):
extension_paths = load_extensions() extension_paths = load_extensions()
self._chrome_options.add_argument('--load-extension={}'.format(','.join(extension_paths))) self._chrome_options.add_argument('--load-extension={}'.format(','.join(extension_paths)))
# 设置语言 # 设置语言
lang = self.connect_option.lang if self.connect_option.lang else get_system_language()
self._chrome_options.add_experimental_option('prefs', {'intl.accept_languages': lang})
self._chrome_options.add_argument('--lang={}'.format(lang)) self._chrome_options.add_argument('--lang={}'.format(lang))
@wrapper_progress_bar @wrapper_progress_bar

2
apps/terminal/applets/chrome/manifest.yml
View File

@ -1,6 +1,6 @@
name: chrome name: chrome
display_name: "{{ 'Chrome Browser' | trans }}" display_name: "{{ 'Chrome Browser' | trans }}"
version: 1.2 version: 1.3
comment: "{{ 'Chrome Browser Open URL Page Address' | trans }}" comment: "{{ 'Chrome Browser Open URL Page Address' | trans }}"
author: JumpServer Team author: JumpServer Team
exec_type: python exec_type: python