From 34caeb5871e07589decf76e82931e9e662c188b9 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 27 Apr 2024 23:01:31 +0800 Subject: [PATCH] :art: Do not execute scripts in HTML blocks by default to prevent XSS https://github.com/siyuan-note/siyuan/issues/11172 --- app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/config/editor.ts | 9 +++++++++ app/src/config/search.ts | 4 +++- app/src/types/config.d.ts | 5 +++++ app/stage/protyle/js/protyle-html.js | 12 +++++++++++- kernel/conf/editor.go | 1 + 10 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 16e0dd47b..c941558d7 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "allowHTMLBLockScript": "Allow execution of scripts within HTML blocks", + "allowHTMLBLockScriptTip": "After enabling, the script in the HTML block will not be sanitized, Please be aware of the potential risk of XSS attacks", "autoLaunchMode0": "Do not launch automatically", "autoLaunchMode1": "Auto launch after booting", "autoLaunchMode2": "Auto launch and minimize the main interface after booting", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index cd54ba048..0ccc3db69 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "allowHTMLBLockScript": "Permitir la ejecución de scripts dentro de bloques HTML", + "allowHTMLBLockScriptTip": "Después de habilitarlo, el script en el bloque HTML no se desinfectará. Tenga en cuenta el riesgo potencial de ataques XSS", "autoLaunchMode0": "No iniciar automáticamente", "autoLaunchMode1": "Inicio automático después del arranque", "autoLaunchMode2": "Iniciar automáticamente y minimizar la interfaz principal después del arranque", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 5f133ad9d..ad03ce672 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "allowHTMLBLockScript": "Autoriser l'exécution de scripts dans les blocs HTML", + "allowHTMLBLockScriptTip": "Après activation, le script dans le bloc HTML ne sera pas nettoyé. Veuillez être conscient du risque potentiel d'attaques XSS", "autoLaunchMode0": "Ne pas lancer automatiquement", "autoLaunchMode1": "Lancement automatique après le démarrage", "autoLaunchMode2": "Lancement automatique et minimisation de l'interface principale après le démarrage", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 976f502b3..e02f5f100 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "allowHTMLBLockScript": "允許執行 HTML 區塊內腳本", + "allowHTMLBLockScriptTip": "啟用後將不對 HTML 區塊中的程式碼進行安全過濾,請注意潛在的 XSS 攻擊風險", "autoLaunchMode0": "不自動啟動", "autoLaunchMode1": "開機自動啟動", "autoLaunchMode2": "開機後自動啟動並最小化主介面", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index aa4dc3bbd..3c201da24 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "allowHTMLBLockScript": "允许执行 HTML 块内脚本", + "allowHTMLBLockScriptTip": "启用后将不对 HTML 块中的代码进行安全过滤,请注意潜在的 XSS 攻击风险", "autoLaunchMode0": "不自动启动", "autoLaunchMode1": "开机后自动启动", "autoLaunchMode2": "开机后自动启动并最小化主界面", diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts index 5cb9d47c6..88e774ded 100644 --- a/app/src/config/editor.ts +++ b/app/src/config/editor.ts @@ -267,6 +267,14 @@ export const editor = { +