An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Replace encrypted attribute view ciphertext atomically https://github.com/siyuan-note/siyuan/issues/20372
Danielb1fa91bc04bb
diff --git a/kernel/av/av.go b/kernel/av/av.goindex 2f7aae3c40..57ec2c9e6c 100644--- a/kernel/av/av.go+++ b/kernel/av/av.go@@ -1105,7 +1105,13 @@ func saveAttributeView(av *AttributeView, original []byte) (err error) {logging.LogErrorf("create attribute view dir [%s] failed: %s", filepath.Dir(avJSONPath), err)return}- if err = util.WriteFileByMmap(avJSONPath, writeData); nil != err {+ if avBoxID != "" {+ // 密文通过临时文件原子替换,避免原址覆写中断后丢失可认证的旧数据。+ if err = filelock.WriteFile(avJSONPath, writeData); nil != err {+ logging.LogErrorf("save attribute view [%s] failed: %s", av.ID, err)+ return+ }+ } else if err = util.WriteFileByMmap(avJSONPath, writeData); nil != err {if err = filelock.WriteFile(avJSONPath, writeData); nil != err {logging.LogErrorf("save attribute view [%s] failed: %s", av.ID, err)returndiff --git a/kernel/av/encrypted_atomic_write_test.go b/kernel/av/encrypted_atomic_write_test.gonew file mode 100644index 0000000000..ba5a8ed286--- /dev/null+++ b/kernel/av/encrypted_atomic_write_test.go@@ -0,0 +1,67 @@+package av++import (+ "bytes"+ "os"+ "path/filepath"+ "testing"++ "github.com/siyuan-note/siyuan/kernel/cache"+ "github.com/siyuan-note/siyuan/kernel/util"+)++func TestEncryptedAttributeViewSaveReplacesCiphertext(t *testing.T) {+ const boxID, avID = "20261010120000-encbox0", "20261010120001-encav00"+ oldData := util.DataDir+ oldDEK, oldEncrypted, oldUnlocked := AVDEKProvider, AVIsEncryptedBox, AVIsBoxUnlocked+ oldAcquire, oldRelease := AVLockAcquire, AVLockRelease+ util.DataDir = t.TempDir()+ key := bytes.Repeat([]byte{0x71}, 32)+ AVDEKProvider = func(string) ([]byte, error) { return key, nil }+ AVIsEncryptedBox = func(id string) bool { return id == boxID }+ AVIsBoxUnlocked = func(string) bool { return true }+ AVLockAcquire, AVLockRelease = func(string) {}, func(string) {}+ SetAVBoxID(avID, boxID)+ t.Cleanup(func() {+ SetAVBoxID(avID, "")+ cache.RemoveAVDataInBox(avID, boxID)+ util.DataDir = oldData+ AVDEKProvider, AVIsEncryptedBox, AVIsBoxUnlocked = oldDEK, oldEncrypted, oldUnlocked+ AVLockAcquire, AVLockRelease = oldAcquire, oldRelease+ })+ view := &AttributeView{ID: avID, Spec: PlainTextSpec}+ view.Name = "first encrypted version"+ if err := SaveAttributeView(view); err != nil {+ t.Fatal(err)+ }+ file := attributeViewDataPathByBox(avID, boxID)+ before, err := os.ReadFile(file)+ if err != nil {+ t.Fatal(err)+ }+ link := filepath.Join(filepath.Dir(file), "original-ciphertext")+ if err := os.Link(file, link); err != nil {+ t.Fatal(err)+ }+ view.Name = "second encrypted version with different length"+ if err := SaveAttributeView(view); err != nil {+ t.Fatal(err)+ }+ retained, err := os.ReadFile(link)+ if err != nil || !bytes.Equal(before, retained) {+ t.Fatalf("save modified the previous ciphertext in place: %v", err)+ }+ cache.RemoveAVDataInBox(avID, boxID)+ loaded, err := ParseAttributeViewInBox(avID, boxID)+ if err != nil || loaded.Name != view.Name {+ t.Fatalf("updated ciphertext did not authenticate: %+v, %v", loaded, err)+ }+ plain, err := decryptAVData(boxID, avID, retained)+ if err != nil {+ t.Fatal(err)+ }+ previous, err := ParseAttributeViewData(avID, plain)+ if err != nil || previous.Name != "first encrypted version" {+ t.Fatalf("previous ciphertext is not recoverable: %+v, %v", previous, err)+ }+}