From 9db7b490379d50c3213236e91fbfffe16ac07583 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 7 Aug 2024 23:36:06 +0800
Subject: [PATCH 1/8] :art: Improve the pasting of selected text in PDF
rectangular annotation https://github.com/siyuan-note/siyuan/issues/11629
---
app/src/protyle/util/paste.ts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/src/protyle/util/paste.ts b/app/src/protyle/util/paste.ts
index dc6732127..307fd540b 100644
--- a/app/src/protyle/util/paste.ts
+++ b/app/src/protyle/util/paste.ts
@@ -241,6 +241,10 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
files = event.dataTransfer.items;
}
}
+
+ // Improve the pasting of selected text in PDF rectangular annotation https://github.com/siyuan-note/siyuan/issues/11629
+ textPlain = textPlain.replace(/\r\n|\r|\u2028|\u2029/g, "\n");
+
/// #if !BROWSER
// 不再支持 PC 浏览器 https://github.com/siyuan-note/siyuan/issues/7206
if (!siyuanHTML && !textHTML && !textPlain && ("clipboardData" in event)) {
From f8374201de362f62631079e3253af6b265eaedf3 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 8 Aug 2024 10:56:31 +0800
Subject: [PATCH 2/8] :lock: Potential data export disclosure security
vulnerability
---
kernel/server/serve.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index c530395e2..d9855e0a8 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -172,7 +172,8 @@ func rewritePortJSON(pid, port string) {
}
func serveExport(ginServer *gin.Engine) {
- ginServer.Static("/export/", filepath.Join(util.TempDir, "export"))
+ exportGroup := ginServer.Group("/export/", model.CheckAuth)
+ exportGroup.Static("/", filepath.Join(util.TempDir, "export"))
}
func serveWidgets(ginServer *gin.Engine) {
From f9127e8e0f907565b6e2789f98b927ee0ab0c09c Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 8 Aug 2024 10:58:43 +0800
Subject: [PATCH 3/8] :lock: Potential data export disclosure security
vulnerability https://github.com/siyuan-note/siyuan/issues/12213
---
kernel/server/serve.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index d9855e0a8..376748cf0 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -172,6 +172,7 @@ func rewritePortJSON(pid, port string) {
}
func serveExport(ginServer *gin.Engine) {
+ // Potential data export disclosure security vulnerability https://github.com/siyuan-note/siyuan/issues/12213
exportGroup := ginServer.Group("/export/", model.CheckAuth)
exportGroup.Static("/", filepath.Join(util.TempDir, "export"))
}
From db7b42439d63c8e1139dab93ffd8062861331228 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 8 Aug 2024 11:06:38 +0800
Subject: [PATCH 4/8] :art: Improve the title for exporting HTML
https://github.com/siyuan-note/siyuan/issues/12212
---
app/src/protyle/export/index.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts
index 6c5e62f7c..ce15cc80e 100644
--- a/app/src/protyle/export/index.ts
+++ b/app/src/protyle/export/index.ts
@@ -10,7 +10,6 @@ import {confirmDialog} from "../../dialog/confirmDialog";
import {getThemeMode, setInlineStyle} from "../../util/assets";
import {fetchPost} from "../../util/fetch";
import {Dialog} from "../../dialog";
-import {pathPosix} from "../../util/pathName";
import {replaceLocalPath} from "../../editor/rename";
import {setStorageVal} from "../util/compatibility";
import {isPaidUser} from "../../util/needSubscribe";
@@ -661,7 +660,8 @@ const onExport = (data: IWebSocketData, filePath: string, exportOption: IExportO
${themeStyle}
- ${pathPosix().basename(filePath)} - ${window.siyuan.languages.siyuanNote} v${Constants.SIYUAN_VERSION}
+ ${data.data.name}
+