Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:sparkles: Improve encrypted notebook Data.zip imports https://github.com/siyuan-note/siyuan/issues/20758

Danieldfd7c8a39fc0
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index 3718ec7133..2814990039 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "دفاتر الملاحظات المتعارضة",
+ "dataImportSkip": "تخطي التعارضات",
+ "dataImportOverwrite": "الكتابة فوق التعارضات",
+ "dataImportSkipped": "دفاتر الملاحظات التي تم تخطيها",
"automationCollectionDepth": "عمق المستندات الفرعية",
"automationCollectionDepthUnlimited": "بلا حدود",
"automationCollectionDepthCurrent": "المستند الحالي فقط",
@@ -3365,6 +3369,9 @@
"418": "يتطلب هذا النموذج الاحتفاظ بسجل استدعاءات الأدوات كاملًا في الجولة الحالية. استخدم نموذجًا بنافذة سياق أكبر أو قسّم المهمة",
"419": "وصل ضغط سياق الوكيل إلى الحد الأقصى للطلبات أو الوقت. تم الاحتفاظ بالمحادثة",
"420": "تعذّر عرض قائمة فهارس المزامنة السحابية (%s). هذا لا يعني أن السحابة فارغة. تحقّق من الشبكة وإعدادات المزامنة وأذونات عرض القائمة",
- "421": "تعالج مساحة عمل أخرى حزم التحديث. يرجى التحقق من التحديثات مرة أخرى لاحقًا"
+ "421": "تعالج مساحة عمل أخرى حزم التحديث. يرجى التحقق من التحديثات مرة أخرى لاحقًا",
+ "422": "انتهت صلاحية استيراد Data.zip أو تغيرت البيانات؛ حدد الأرشيف مرة أخرى",
+ "423": "لا يمكن دمج دفاتر ملاحظات تختلف في حالة التشفير أو مفاتيح البيانات [%s]",
+ "424": "فشل استرداد استيراد Data.zip؛ احتفظ بمساحة العمل وأعد محاولة الاسترداد"
}
}
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index cdde6e095d..b810f0f23a 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Notizbücher mit Konflikten",
+ "dataImportSkip": "Konflikte überspringen",
+ "dataImportOverwrite": "Konflikte überschreiben",
+ "dataImportSkipped": "Übersprungene Notizbücher",
"automationCollectionDepth": "Tiefe der Unterdokumente",
"automationCollectionDepthUnlimited": "Unbegrenzt",
"automationCollectionDepthCurrent": "Nur aktuelles Dokument",
@@ -3365,6 +3369,9 @@
"418": "Dieses Modell benötigt den vollständigen Werkzeugverlauf des aktuellen Gesprächsschritts. Verwenden Sie ein Modell mit größerem Kontextfenster oder teilen Sie die Aufgabe auf",
"419": "Die Kontextkomprimierung des Agenten hat die Anfrage- oder Zeitgrenze erreicht. Ihr Gespräch wurde beibehalten",
"420": "Die Cloud-Synchronisierungsindizes (%s) können nicht aufgelistet werden. Dies bedeutet nicht, dass die Cloud leer ist. Prüfen Sie das Netzwerk, die Synchronisierungseinstellungen und die Berechtigungen zum Auflisten",
- "421": "Ein anderer Arbeitsbereich verarbeitet Updatepakete. Bitte später erneut nach Updates suchen"
+ "421": "Ein anderer Arbeitsbereich verarbeitet Updatepakete. Bitte später erneut nach Updates suchen",
+ "422": "Der Data.zip-Import ist abgelaufen oder wurde geändert; wählen Sie das Archiv erneut aus",
+ "423": "Notizbücher mit unterschiedlichem Verschlüsselungsstatus oder Datenschlüssel können nicht zusammengeführt werden [%s]",
+ "424": "Wiederherstellung des Data.zip-Imports fehlgeschlagen; bewahren Sie den Arbeitsbereich auf und versuchen Sie die Wiederherstellung erneut"
}
}
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index 111eb86f91..f2ea2b09b2 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Conflicting notebooks",
+ "dataImportSkip": "Skip conflicts",
+ "dataImportOverwrite": "Overwrite conflicts",
+ "dataImportSkipped": "Skipped notebooks",
"automationCollectionDepth": "Subdocument depth",
"automationCollectionDepthUnlimited": "Unlimited",
"automationCollectionDepthCurrent": "Current document only",
@@ -3365,6 +3369,9 @@
"418": "This model requires the current tool history to remain intact. Use a model with a larger context window or split the task",
"419": "Agent context compaction reached its request or time limit. Your conversation has been preserved",
"420": "Unable to list cloud sync indexes (%s). This does not mean the cloud is empty. Check the network, sync configuration, and listing permissions",
- "421": "Another workspace is processing update packages. Please check for updates again later"
+ "421": "Another workspace is processing update packages. Please check for updates again later",
+ "422": "Data.zip import has expired or changed; select the archive again",
+ "423": "Cannot merge notebooks with different encryption states or data keys [%s]",
+ "424": "Data.zip import recovery failed; preserve the workspace and retry recovery"
}
}
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 875dbe5fee..65e58c29af 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Cuadernos en conflicto",
+ "dataImportSkip": "Omitir conflictos",
+ "dataImportOverwrite": "Sobrescribir conflictos",
+ "dataImportSkipped": "Cuadernos omitidos",
"automationCollectionDepth": "Profundidad de subdocumentos",
"automationCollectionDepthUnlimited": "Sin límite",
"automationCollectionDepthCurrent": "Solo el documento actual",
@@ -3365,6 +3369,9 @@
"418": "Este modelo exige conservar íntegro el historial de llamadas a herramientas del turno actual. Utilice un modelo con una ventana de contexto mayor o divida la tarea",
"419": "La compresión del contexto del agente ha alcanzado el límite de solicitudes o de tiempo. La conversación se ha conservado",
"420": "No se pueden listar los índices de sincronización en la nube (%s). Esto no significa que la nube esté vacía. Compruebe la red, la configuración de sincronización y los permisos para listar",
- "421": "Otro espacio de trabajo está procesando paquetes de actualización. Vuelva a buscar actualizaciones más tarde"
+ "421": "Otro espacio de trabajo está procesando paquetes de actualización. Vuelva a buscar actualizaciones más tarde",
+ "422": "La importación de Data.zip ha caducado o ha cambiado; seleccione de nuevo el archivo",
+ "423": "No se pueden combinar cuadernos con distintos estados de cifrado o claves de datos [%s]",
+ "424": "Error al recuperar la importación de Data.zip; conserve el espacio de trabajo y vuelva a intentar la recuperación"
}
}
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index 3dd6737016..000e1556f6 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Carnets en conflit",
+ "dataImportSkip": "Ignorer les conflits",
+ "dataImportOverwrite": "Écraser les conflits",
+ "dataImportSkipped": "Carnets ignorés",
"automationCollectionDepth": "Profondeur des sous-documents",
"automationCollectionDepthUnlimited": "Illimitée",
"automationCollectionDepthCurrent": "Document actuel uniquement",
@@ -3365,6 +3369,9 @@
"418": "Ce modèle exige de conserver intégralement l’historique des appels d’outils du tour actuel. Utilisez un modèle avec une fenêtre de contexte plus grande ou divisez la tâche",
"419": "La compression du contexte de l’agent a atteint la limite de requêtes ou de durée. Votre conversation a été conservée",
"420": "Impossible de lister les index de synchronisation dans le cloud (%s). Cela ne signifie pas que le cloud est vide. Vérifiez le réseau, la configuration de synchronisation et les autorisations de listage",
- "421": "Un autre espace de travail traite les paquets de mise à jour. Veuillez rechercher à nouveau les mises à jour plus tard"
+ "421": "Un autre espace de travail traite les paquets de mise à jour. Veuillez rechercher à nouveau les mises à jour plus tard",
+ "422": "L’importation de Data.zip a expiré ou a changé ; sélectionnez à nouveau l’archive",
+ "423": "Impossible de fusionner des carnets dont l’état de chiffrement ou la clé de données diffère [%s]",
+ "424": "Échec de la récupération de l’importation de Data.zip ; conservez l’espace de travail et réessayez la récupération"
}
}
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index a7a7fe4942..0ff41846cc 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "מחברות מתנגשות",
+ "dataImportSkip": "דילוג על התנגשויות",
+ "dataImportOverwrite": "החלפת מחברות מתנגשות",
+ "dataImportSkipped": "מחברות שדולגו",
"automationCollectionDepth": "עומק מסמכי המשנה",
"automationCollectionDepthUnlimited": "ללא הגבלה",
"automationCollectionDepthCurrent": "המסמך הנוכחי בלבד",
@@ -3365,6 +3369,9 @@
"418": "מודל זה דורש לשמור את היסטוריית הקריאות לכלים בסבב הנוכחי בשלמותה. יש להשתמש במודל בעל חלון הקשר גדול יותר או לפצל את המשימה",
"419": "דחיסת ההקשר של הסוכן הגיעה למגבלת הבקשות או הזמן. השיחה נשמרה",
"420": "לא ניתן לקבל את רשימת האינדקסים של הסנכרון בענן (%s). אין פירוש הדבר שהענן ריק. יש לבדוק את הרשת, את הגדרות הסנכרון ואת ההרשאות לקבלת הרשימה",
- "421": "סביבת עבודה אחרת מעבדת חבילות עדכון. יש לבדוק שוב אם קיימים עדכונים מאוחר יותר"
+ "421": "סביבת עבודה אחרת מעבדת חבילות עדכון. יש לבדוק שוב אם קיימים עדכונים מאוחר יותר",
+ "422": "תוקף ייבוא Data.zip פג או שהנתונים השתנו; יש לבחור שוב את הארכיון",
+ "423": "לא ניתן למזג מחברות עם מצבי הצפנה או מפתחות נתונים שונים [%s]",
+ "424": "שחזור ייבוא Data.zip נכשל; יש לשמור את סביבת העבודה ולנסות לשחזר שוב"
}
}
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index b7d273b10d..b5dce67728 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "टकराव वाली नोटबुक",
+ "dataImportSkip": "टकराव छोड़ें",
+ "dataImportOverwrite": "टकराव अधिलेखित करें",
+ "dataImportSkipped": "छोड़ी गई नोटबुक",
"automationCollectionDepth": "उपदस्तावेज़ों की गहराई",
"automationCollectionDepthUnlimited": "असीमित",
"automationCollectionDepthCurrent": "केवल वर्तमान दस्तावेज़",
@@ -3365,6 +3369,9 @@
"418": "इस मॉडल को वर्तमान चरण के टूल कॉल का पूरा इतिहास बनाए रखना आवश्यक है। बड़ी संदर्भ विंडो वाला मॉडल चुनें या कार्य को भागों में बाँटें",
"419": "एजेंट का संदर्भ संपीड़न अनुरोध या समय सीमा तक पहुँच गया। आपकी बातचीत सुरक्षित है",
"420": "क्लाउड सिंक इंडेक्स (%s) की सूची प्राप्त नहीं की जा सकी। इसका अर्थ यह नहीं है कि क्लाउड खाली है। नेटवर्क, सिंक कॉन्फ़िगरेशन और सूची प्राप्त करने की अनुमतियाँ जाँचें",
- "421": "कोई अन्य कार्यस्थान अपडेट पैकेज संसाधित कर रहा है। कृपया बाद में अपडेट के लिए फिर से जाँचें"
+ "421": "कोई अन्य कार्यस्थान अपडेट पैकेज संसाधित कर रहा है। कृपया बाद में अपडेट के लिए फिर से जाँचें",
+ "422": "Data.zip आयात की समय सीमा समाप्त हो गई है या डेटा बदल गया है; संग्रह फिर से चुनें",
+ "423": "अलग एन्क्रिप्शन स्थिति या डेटा कुंजियों वाली नोटबुक मर्ज नहीं की जा सकतीं [%s]",
+ "424": "Data.zip आयात की पुनर्प्राप्ति विफल रही; कार्यस्थान सुरक्षित रखें और पुनर्प्राप्ति फिर से करें"
}
}
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index 516e589b53..6d2c73128a 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Buku catatan yang berkonflik",
+ "dataImportSkip": "Lewati konflik",
+ "dataImportOverwrite": "Timpa konflik",
+ "dataImportSkipped": "Buku catatan yang dilewati",
"automationCollectionDepth": "Kedalaman subdokumen",
"automationCollectionDepthUnlimited": "Tanpa batas",
"automationCollectionDepthCurrent": "Hanya dokumen saat ini",
@@ -3365,6 +3369,9 @@
"418": "Model ini mengharuskan seluruh riwayat pemanggilan alat pada giliran saat ini tetap utuh. Gunakan model dengan jendela konteks yang lebih besar atau bagi tugasnya",
"419": "Pemadatan konteks agen mencapai batas permintaan atau waktu. Percakapan Anda telah disimpan",
"420": "Tidak dapat menampilkan daftar indeks sinkronisasi cloud (%s). Ini tidak berarti cloud kosong. Periksa jaringan, konfigurasi sinkronisasi, dan izin untuk menampilkan daftar",
- "421": "Ruang kerja lain sedang memproses paket pembaruan. Silakan periksa pembaruan lagi nanti"
+ "421": "Ruang kerja lain sedang memproses paket pembaruan. Silakan periksa pembaruan lagi nanti",
+ "422": "Impor Data.zip telah kedaluwarsa atau berubah; pilih kembali arsipnya",
+ "423": "Tidak dapat menggabungkan buku catatan dengan status enkripsi atau kunci data yang berbeda [%s]",
+ "424": "Pemulihan impor Data.zip gagal; pertahankan ruang kerja dan coba pemulihan lagi"
}
}
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index 98f06955cd..747c177146 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Quaderni in conflitto",
+ "dataImportSkip": "Salta i conflitti",
+ "dataImportOverwrite": "Sovrascrivi i conflitti",
+ "dataImportSkipped": "Quaderni saltati",
"automationCollectionDepth": "Profondità dei sottodocumenti",
"automationCollectionDepthUnlimited": "Illimitata",
"automationCollectionDepthCurrent": "Solo il documento corrente",
@@ -3365,6 +3369,9 @@
"418": "Questo modello richiede di conservare integralmente la cronologia delle chiamate agli strumenti del turno corrente. Usa un modello con una finestra di contesto più ampia o suddividi l’attività",
"419": "La compressione del contesto dell’agente ha raggiunto il limite di richieste o di tempo. La conversazione è stata conservata",
"420": "Impossibile elencare gli indici di sincronizzazione nel cloud (%s). Questo non significa che il cloud sia vuoto. Controllare la rete, la configurazione di sincronizzazione e i permessi di elenco",
- "421": "Un altro spazio di lavoro sta elaborando i pacchetti di aggiornamento. Cerca nuovamente gli aggiornamenti più tardi"
+ "421": "Un altro spazio di lavoro sta elaborando i pacchetti di aggiornamento. Cerca nuovamente gli aggiornamenti più tardi",
+ "422": "L’importazione di Data.zip è scaduta o è cambiata; seleziona nuovamente l’archivio",
+ "423": "Impossibile unire quaderni con stati di crittografia o chiavi dei dati diversi [%s]",
+ "424": "Ripristino dell’importazione di Data.zip non riuscito; conserva lo spazio di lavoro e riprova il ripristino"
}
}
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index 0b46dcca5b..1df83e2228 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "競合するノートブック",
+ "dataImportSkip": "競合をスキップ",
+ "dataImportOverwrite": "競合を上書き",
+ "dataImportSkipped": "スキップしたノートブック",
"automationCollectionDepth": "子文書の深さ",
"automationCollectionDepthUnlimited": "無制限",
"automationCollectionDepthCurrent": "現在の文書のみ",
@@ -3365,6 +3369,9 @@
"418": "このモデルでは現在のターンのツール呼び出し履歴を完全に保持する必要があります。コンテキストウィンドウの大きいモデルに切り替えるか、タスクを分割してください",
"419": "エージェントのコンテキスト圧縮がリクエスト回数または時間の上限に達しました。会話履歴は保持されています",
"420": "クラウド同期インデックス(%s)の一覧を取得できません。クラウドが空であることを意味するものではありません。ネットワーク、同期設定、一覧取得の権限を確認してください",
- "421": "別のワークスペースが更新パッケージを処理しています。しばらくしてから再度更新を確認してください"
+ "421": "別のワークスペースが更新パッケージを処理しています。しばらくしてから再度更新を確認してください",
+ "422": "Data.zip のインポートが期限切れか変更されています。アーカイブを選択し直してください",
+ "423": "暗号化状態またはデータキーが異なるノートブックは結合できません [%s]",
+ "424": "Data.zip のインポート復旧に失敗しました。ワークスペースを保持して復旧を再試行してください"
}
}
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index 30eb994949..153ec22ae3 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "충돌하는 노트북",
+ "dataImportSkip": "충돌 건너뛰기",
+ "dataImportOverwrite": "충돌 덮어쓰기",
+ "dataImportSkipped": "건너뛴 노트북",
"automationCollectionDepth": "하위 문서 깊이",
"automationCollectionDepthUnlimited": "제한 없음",
"automationCollectionDepthCurrent": "현재 문서만",
@@ -3365,6 +3369,9 @@
"418": "이 모델은 현재 턴의 도구 호출 기록을 온전히 유지해야 합니다. 컨텍스트 창이 더 큰 모델을 사용하거나 작업을 나누세요",
"419": "에이전트 컨텍스트 압축이 요청 횟수 또는 시간 제한에 도달했습니다. 대화 기록은 보존되었습니다",
"420": "클라우드 동기화 인덱스(%s) 목록을 가져올 수 없습니다. 클라우드가 비어 있다는 뜻은 아닙니다. 네트워크, 동기화 설정 및 목록 조회 권한을 확인하세요",
- "421": "다른 워크스페이스에서 업데이트 패키지를 처리하고 있습니다. 나중에 업데이트를 다시 확인해 주세요"
+ "421": "다른 워크스페이스에서 업데이트 패키지를 처리하고 있습니다. 나중에 업데이트를 다시 확인해 주세요",
+ "422": "Data.zip 가져오기가 만료되었거나 변경되었습니다. 압축 파일을 다시 선택하세요",
+ "423": "암호화 상태 또는 데이터 키가 다른 노트북은 병합할 수 없습니다 [%s]",
+ "424": "Data.zip 가져오기 복구에 실패했습니다. 작업 공간을 보존하고 복구를 다시 시도하세요"
}
}
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index 134dc777a0..fc6d0513e5 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Notitieboeken met conflicten",
+ "dataImportSkip": "Conflicten overslaan",
+ "dataImportOverwrite": "Conflicten overschrijven",
+ "dataImportSkipped": "Overgeslagen notitieboeken",
"automationCollectionDepth": "Diepte van subdocumenten",
"automationCollectionDepthUnlimited": "Onbeperkt",
"automationCollectionDepthCurrent": "Alleen huidig document",
@@ -3365,6 +3369,9 @@
"418": "Dit model vereist dat de volledige geschiedenis van hulpmiddelaanroepen in de huidige beurt behouden blijft. Gebruik een model met een groter contextvenster of splits de taak op",
"419": "Het comprimeren van de agentcontext heeft de aanvraag- of tijdslimiet bereikt. Je gesprek is bewaard",
"420": "De cloudsynchronisatie-indexen (%s) kunnen niet worden weergegeven. Dit betekent niet dat de cloud leeg is. Controleer het netwerk, de synchronisatie-instellingen en de machtigingen voor het opvragen van de lijst",
- "421": "Een andere werkruimte verwerkt updatepakketten. Controleer later opnieuw op updates"
+ "421": "Een andere werkruimte verwerkt updatepakketten. Controleer later opnieuw op updates",
+ "422": "De Data.zip-import is verlopen of gewijzigd; selecteer het archief opnieuw",
+ "423": "Notitieboeken met een verschillende versleutelingsstatus of gegevenssleutel kunnen niet worden samengevoegd [%s]",
+ "424": "Herstel van de Data.zip-import is mislukt; bewaar de werkruimte en probeer het herstel opnieuw"
}
}
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index c551de3ebc..fbd643cb18 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Konfliktujące notatniki",
+ "dataImportSkip": "Pomiń konflikty",
+ "dataImportOverwrite": "Nadpisz konflikty",
+ "dataImportSkipped": "Pominięte notatniki",
"automationCollectionDepth": "Głębokość dokumentów podrzędnych",
"automationCollectionDepthUnlimited": "Bez ograniczeń",
"automationCollectionDepthCurrent": "Tylko bieżący dokument",
@@ -3365,6 +3369,9 @@
"418": "Ten model wymaga zachowania pełnej historii wywołań narzędzi w bieżącej turze. Wybierz model z większym oknem kontekstu lub podziel zadanie",
"419": "Kompresja kontekstu agenta osiągnęła limit żądań lub czasu. Rozmowa została zachowana",
"420": "Nie można wyświetlić listy indeksów synchronizacji w chmurze (%s). Nie oznacza to, że chmura jest pusta. Sprawdź sieć, konfigurację synchronizacji i uprawnienia do wyświetlania listy",
- "421": "Inny obszar roboczy przetwarza pakiety aktualizacji. Sprawdź dostępność aktualizacji ponownie później"
+ "421": "Inny obszar roboczy przetwarza pakiety aktualizacji. Sprawdź dostępność aktualizacji ponownie później",
+ "422": "Import Data.zip wygasł lub uległ zmianie; wybierz archiwum ponownie",
+ "423": "Nie można scalić notatników o różnych stanach szyfrowania lub kluczach danych [%s]",
+ "424": "Nie udało się odzyskać importu Data.zip; zachowaj obszar roboczy i ponów odzyskiwanie"
}
}
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index 3b4185063a..2d0af1c213 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Cadernos em conflito",
+ "dataImportSkip": "Ignorar conflitos",
+ "dataImportOverwrite": "Sobrescrever conflitos",
+ "dataImportSkipped": "Cadernos ignorados",
"automationCollectionDepth": "Profundidade dos subdocumentos",
"automationCollectionDepthUnlimited": "Sem limite",
"automationCollectionDepthCurrent": "Somente o documento atual",
@@ -3365,6 +3369,9 @@
"418": "Este modelo exige manter intacto o histórico de chamadas de ferramentas do turno atual. Use um modelo com uma janela de contexto maior ou divida a tarefa",
"419": "A compactação do contexto do agente atingiu o limite de solicitações ou de tempo. Sua conversa foi preservada",
"420": "Não foi possível listar os índices de sincronização na nuvem (%s). Isso não significa que a nuvem esteja vazia. Verifique a rede, a configuração de sincronização e as permissões de listagem",
- "421": "Outro espaço de trabalho está processando pacotes de atualização. Verifique novamente se há atualizações mais tarde"
+ "421": "Outro espaço de trabalho está processando pacotes de atualização. Verifique novamente se há atualizações mais tarde",
+ "422": "A importação de Data.zip expirou ou foi alterada; selecione o arquivo novamente",
+ "423": "Não é possível mesclar cadernos com estados de criptografia ou chaves de dados diferentes [%s]",
+ "424": "Falha na recuperação da importação de Data.zip; preserve o espaço de trabalho e tente a recuperação novamente"
}
}
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index ef8189eb64..2a0c7e8bc4 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Конфликтующие блокноты",
+ "dataImportSkip": "Пропустить конфликты",
+ "dataImportOverwrite": "Перезаписать конфликты",
+ "dataImportSkipped": "Пропущенные блокноты",
"automationCollectionDepth": "Глубина вложенных документов",
"automationCollectionDepthUnlimited": "Без ограничений",
"automationCollectionDepthCurrent": "Только текущий документ",
@@ -3365,6 +3369,9 @@
"418": "Эта модель требует сохранять полную историю вызовов инструментов текущего хода. Выберите модель с большим контекстным окном или разделите задачу",
"419": "Сжатие контекста агента достигло лимита запросов или времени. История диалога сохранена",
"420": "Не удалось получить список индексов облачной синхронизации (%s). Это не означает, что облако пустое. Проверьте сеть, настройки синхронизации и права на получение списка",
- "421": "Другое рабочее пространство обрабатывает пакеты обновления. Повторите проверку обновлений позже"
+ "421": "Другое рабочее пространство обрабатывает пакеты обновления. Повторите проверку обновлений позже",
+ "422": "Срок импорта Data.zip истёк или данные изменились; выберите архив заново",
+ "423": "Невозможно объединить блокноты с разным состоянием шифрования или ключами данных [%s]",
+ "424": "Не удалось восстановить импорт Data.zip; сохраните рабочее пространство и повторите восстановление"
}
}
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index b4221dd66e..dfc295e4c4 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Konfliktné poznámkové bloky",
+ "dataImportSkip": "Preskočiť konflikty",
+ "dataImportOverwrite": "Prepísať konflikty",
+ "dataImportSkipped": "Preskočené poznámkové bloky",
"automationCollectionDepth": "Hĺbka poddokumentov",
"automationCollectionDepthUnlimited": "Bez obmedzenia",
"automationCollectionDepthCurrent": "Iba aktuálny dokument",
@@ -3365,6 +3369,9 @@
"418": "Tento model vyžaduje zachovanie celej histórie volaní nástrojov v aktuálnom ťahu. Použite model s väčším kontextovým oknom alebo rozdeľte úlohu",
"419": "Kompresia kontextu agenta dosiahla limit požiadaviek alebo času. Konverzácia bola zachovaná",
"420": "Nepodarilo sa získať zoznam indexov synchronizácie v cloude (%s). To neznamená, že cloud je prázdny. Skontrolujte sieť, nastavenia synchronizácie a oprávnenia na zobrazenie zoznamu",
- "421": "Iný pracovný priestor spracúva aktualizačné balíky. Skontrolujte aktualizácie znova neskôr"
+ "421": "Iný pracovný priestor spracúva aktualizačné balíky. Skontrolujte aktualizácie znova neskôr",
+ "422": "Import Data.zip vypršal alebo sa zmenil; vyberte archív znova",
+ "423": "Nie je možné zlúčiť poznámkové bloky s odlišným stavom šifrovania alebo dátovými kľúčmi [%s]",
+ "424": "Obnova importu Data.zip zlyhala; zachovajte pracovný priestor a skúste obnovu znova"
}
}
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index 0c38de2dd7..a48eb29cee 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Бележнице у сукобу",
+ "dataImportSkip": "Прескочи сукобе",
+ "dataImportOverwrite": "Препиши сукобе",
+ "dataImportSkipped": "Прескочене бележнице",
"automationCollectionDepth": "Дубина поддокумената",
"automationCollectionDepthUnlimited": "Неограничено",
"automationCollectionDepthCurrent": "Само тренутни документ",
@@ -3365,6 +3369,9 @@
"418": "Овај модел захтева очување целе историје позива алата у тренутном потезу. Користите модел са већим контекстним прозором или поделите задатак",
"419": "Сажимање контекста агента достигло је ограничење броја захтева или времена. Разговор је сачуван",
"420": "Није могуће приказати листу индекса синхронизације у облаку (%s). То не значи да је облак празан. Проверите мрежу, подешавања синхронизације и дозволе за приказ листе",
- "421": "Други радни простор обрађује пакете ажурирања. Проверите ажурирања поново касније"
+ "421": "Други радни простор обрађује пакете ажурирања. Проверите ажурирања поново касније",
+ "422": "Увоз Data.zip је истекао или је измењен; поново изаберите архиву",
+ "423": "Није могуће спојити бележнице са различитим стањем шифровања или кључевима података [%s]",
+ "424": "Опоравак увоза Data.zip није успео; сачувајте радни простор и поновите опоравак"
}
}
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index 2fb0340659..ba0f2d1db4 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "สมุดบันทึกที่ขัดแย้งกัน",
+ "dataImportSkip": "ข้ามรายการที่ขัดแย้ง",
+ "dataImportOverwrite": "เขียนทับรายการที่ขัดแย้ง",
+ "dataImportSkipped": "สมุดบันทึกที่ข้าม",
"automationCollectionDepth": "ความลึกของเอกสารย่อย",
"automationCollectionDepthUnlimited": "ไม่จำกัด",
"automationCollectionDepthCurrent": "เฉพาะเอกสารปัจจุบัน",
@@ -3365,6 +3369,9 @@
"418": "โมเดลนี้ต้องเก็บประวัติการเรียกเครื่องมือในรอบปัจจุบันไว้ครบถ้วน โปรดใช้โมเดลที่มีหน้าต่างบริบทใหญ่กว่าหรือแบ่งงานเป็นส่วนย่อย",
"419": "การบีบอัดบริบทของเอเจนต์ถึงขีดจำกัดจำนวนคำขอหรือเวลา ระบบเก็บประวัติการสนทนาไว้แล้ว",
"420": "ไม่สามารถแสดงรายการดัชนีการซิงค์บนคลาวด์ (%s) ได้ ซึ่งไม่ได้หมายความว่าคลาวด์ว่างเปล่า โปรดตรวจสอบเครือข่าย การตั้งค่าการซิงค์ และสิทธิ์ในการแสดงรายการ",
- "421": "พื้นที่ทำงานอื่นกำลังประมวลผลแพ็กเกจอัปเดต โปรดตรวจสอบการอัปเดตอีกครั้งในภายหลัง"
+ "421": "พื้นที่ทำงานอื่นกำลังประมวลผลแพ็กเกจอัปเดต โปรดตรวจสอบการอัปเดตอีกครั้งในภายหลัง",
+ "422": "การนำเข้า Data.zip หมดอายุหรือมีการเปลี่ยนแปลง โปรดเลือกไฟล์เก็บถาวรอีกครั้ง",
+ "423": "ไม่สามารถรวมสมุดบันทึกที่มีสถานะการเข้ารหัสหรือคีย์ข้อมูลต่างกัน [%s]",
+ "424": "กู้คืนการนำเข้า Data.zip ไม่สำเร็จ โปรดเก็บพื้นที่ทำงานไว้และลองกู้คืนอีกครั้ง"
}
}
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index 2a43b92ee9..c6018001a3 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Çakışan not defterleri",
+ "dataImportSkip": "Çakışmaları atla",
+ "dataImportOverwrite": "Çakışmaların üzerine yaz",
+ "dataImportSkipped": "Atlanan not defterleri",
"automationCollectionDepth": "Alt belge derinliği",
"automationCollectionDepthUnlimited": "Sınırsız",
"automationCollectionDepthCurrent": "Yalnızca mevcut belge",
@@ -3365,6 +3369,9 @@
"418": "Bu model, mevcut turdaki araç çağrısı geçmişinin tamamının korunmasını gerektirir. Daha geniş bağlam penceresine sahip bir model kullanın veya görevi bölün",
"419": "Ajan bağlamı sıkıştırma işlemi istek veya süre sınırına ulaştı. Görüşmeniz korundu",
"420": "Bulut eşitleme dizinleri (%s) listelenemiyor. Bu, bulutun boş olduğu anlamına gelmez. Ağı, eşitleme yapılandırmasını ve listeleme izinlerini kontrol edin",
- "421": "Başka bir çalışma alanı güncelleme paketlerini işliyor. Lütfen daha sonra güncellemeleri tekrar kontrol edin"
+ "421": "Başka bir çalışma alanı güncelleme paketlerini işliyor. Lütfen daha sonra güncellemeleri tekrar kontrol edin",
+ "422": "Data.zip içe aktarımının süresi doldu veya veriler değişti; arşivi yeniden seçin",
+ "423": "Şifreleme durumları veya veri anahtarları farklı olan not defterleri birleştirilemez [%s]",
+ "424": "Data.zip içe aktarımı kurtarılamadı; çalışma alanını koruyun ve kurtarmayı yeniden deneyin"
}
}
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index bf8b0988f4..b77a2cac86 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "Конфліктні блокноти",
+ "dataImportSkip": "Пропустити конфлікти",
+ "dataImportOverwrite": "Перезаписати конфлікти",
+ "dataImportSkipped": "Пропущені блокноти",
"automationCollectionDepth": "Глибина вкладених документів",
"automationCollectionDepthUnlimited": "Без обмежень",
"automationCollectionDepthCurrent": "Лише поточний документ",
@@ -3365,6 +3369,9 @@
"418": "Ця модель вимагає зберігати повну історію викликів інструментів поточного ходу. Виберіть модель із більшим контекстним вікном або розділіть завдання",
"419": "Стиснення контексту агента досягло обмеження запитів або часу. Історію розмови збережено",
"420": "Не вдалося отримати список індексів хмарної синхронізації (%s). Це не означає, що хмара порожня. Перевірте мережу, налаштування синхронізації та права на отримання списку",
- "421": "Інший робочий простір обробляє пакети оновлення. Перевірте наявність оновлень знову пізніше"
+ "421": "Інший робочий простір обробляє пакети оновлення. Перевірте наявність оновлень знову пізніше",
+ "422": "Термін імпорту Data.zip минув або дані змінилися; виберіть архів знову",
+ "423": "Неможливо об’єднати блокноти з різними станами шифрування або ключами даних [%s]",
+ "424": "Не вдалося відновити імпорт Data.zip; збережіть робочий простір і повторіть відновлення"
}
}
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 9aaae60b60..4ee4afa5db 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "冲突的笔记本",
+ "dataImportSkip": "跳过冲突",
+ "dataImportOverwrite": "覆盖冲突",
+ "dataImportSkipped": "已跳过的笔记本",
"automationCollectionDepth": "子文档深度",
"automationCollectionDepthUnlimited": "不限",
"automationCollectionDepthCurrent": "仅当前文档",
@@ -3365,6 +3369,9 @@
"418": "当前模型要求完整保留本轮工具调用记录,请切换到上下文窗口更大的模型或拆分任务",
"419": "智能体上下文压缩达到请求次数或耗时上限,对话记录已保留",
"420": "无法列举云端同步索引(%s),这不代表云端为空。请检查网络、同步配置和列举权限",
- "421": "另一个工作空间正在处理更新安装包,请稍后重新检查更新"
+ "421": "另一个工作空间正在处理更新安装包,请稍后重新检查更新",
+ "422": "Data.zip 导入已过期或发生变化,请重新选择压缩包",
+ "423": "无法合并加密状态或数据密钥不同的笔记本 [%s]",
+ "424": "Data.zip 导入恢复失败,请保留工作空间并重试恢复"
}
}
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index d911f92162..c1ff553a59 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,8 @@
{
+ "dataImportConflicts": "衝突的筆記本",
+ "dataImportSkip": "略過衝突",
+ "dataImportOverwrite": "覆寫衝突",
+ "dataImportSkipped": "已略過的筆記本",
"automationCollectionDepth": "子文件深度",
"automationCollectionDepthUnlimited": "不限",
"automationCollectionDepthCurrent": "僅目前文件",
@@ -3365,6 +3369,9 @@
"418": "目前模型要求完整保留本輪工具呼叫記錄,請切換到上下文視窗更大的模型或拆分任務",
"419": "智慧體上下文壓縮達到請求次數或耗時上限,對話記錄已保留",
"420": "無法列舉雲端同步索引(%s),這不代表雲端為空。請檢查網路、同步設定和列舉權限",
- "421": "另一個工作空間正在處理更新安裝套件,請稍後重新檢查更新"
+ "421": "另一個工作空間正在處理更新安裝套件,請稍後重新檢查更新",
+ "422": "Data.zip 匯入已過期或發生變更,請重新選擇壓縮檔",
+ "423": "無法合併加密狀態或資料金鑰不同的筆記本 [%s]",
+ "424": "Data.zip 匯入復原失敗,請保留工作空間並重試復原"
}
}
diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100808-j9sddk9.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100808-j9sddk9.sy
index 9628dad2b5..3f45a9cb7f 100644
--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100808-j9sddk9.sy
+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100808-j9sddk9.sy
@@ -6,7 +6,7 @@
"id": "20200924100808-j9sddk9",
"title": "Import and Export",
"type": "doc",
- "updated": "20261016200946"
+ "updated": "20261020220502"
},
"Children": [
{
@@ -411,6 +411,48 @@
}
]
},
+ {
+ "ID": "20261020220502-tsupjxf",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-tsupjxf",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Data.zip can update the current workspace without creating another workspace. The archive is analyzed before importing. If encrypted notebooks conflict, choose Skip conflicts (the default), Overwrite conflicts or Cancel. The result lists skipped notebook IDs before the interface reloads."
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-v98hoer",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-v98hoer",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Importing encrypted content requires a compatible master password. A backup from before a password change can be read with compatible historical keys without reverting the current password. Notebooks with different encryption states or data keys cannot be merged directly. Overwrite replaces matching paths and retains destination-only files; it does not propagate deletions. Imported encrypted notebooks remain locked until you unlock them again."
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-9jmeu5c",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-9jmeu5c",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "The import verifies selected content before writing and can roll back a failed or interrupted commit. The original archive, replaced files and key material remain in the workspace’s conf/data-imports/ directory. Keep these recovery files until you have verified the imported content and required history."
+ }
+ ]
+ },
{
"ID": "20260614201131-zgav44f",
"Type": "NodeHeading",
diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813125307-pxsjela.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813125307-pxsjela.sy
index ed3ae2a1d4..61e701e75a 100644
--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813125307-pxsjela.sy
+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813125307-pxsjela.sy
@@ -6,7 +6,7 @@
"id": "20200813125307-pxsjela",
"title": "导入和导出",
"type": "doc",
- "updated": "20261016200946"
+ "updated": "20261020220502"
},
"Children": [
{
@@ -407,6 +407,48 @@
}
]
},
+ {
+ "ID": "20261020220502-6qiv57v",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-6qiv57v",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Data.zip 可以直接更新当前工作空间,无需新建工作空间。导入前会先分析压缩包,加密笔记本发生冲突时,可选择默认的“跳过冲突”、“覆盖冲突”或取消。导入结果会在界面重载前列出已跳过的笔记本 ID。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-gnmpswl",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-gnmpswl",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "导入加密内容需要输入兼容的主密码。改密前的备份可通过兼容的历史密钥读取,不会回退当前密码。加密状态或数据密钥不同的笔记本不能直接合并。覆盖只替换相同路径,保留目标独有的文件,不会传播删除;导入后的加密笔记本保持锁定,需要重新解锁。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-l5uc6wm",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-l5uc6wm",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "导入先验证选中内容,再写入数据,失败或中断时可以回滚。上传原件、被覆盖文件和密钥材料保存在工作空间的 conf/data-imports/ 目录;在核对导入内容及所需历史之前,请保留这些恢复文件。"
+ }
+ ]
+ },
{
"ID": "20260614200806-k4r9npq",
"Type": "NodeHeading",
diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123302-akitvb1.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123302-akitvb1.sy
index 80dd00bf2c..a4c402f5e9 100644
--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123302-akitvb1.sy
+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123302-akitvb1.sy
@@ -6,7 +6,7 @@
"id": "20211226123302-akitvb1",
"title": "導入和導出",
"type": "doc",
- "updated": "20261016200946"
+ "updated": "20261020220502"
},
"Children": [
{
@@ -407,6 +407,48 @@
}
]
},
+ {
+ "ID": "20261020220502-4t0tff0",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-4t0tff0",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Data.zip 可以直接更新目前的工作空間,無須建立另一個工作空間。匯入前會先分析壓縮檔,加密筆記本發生衝突時,可選擇預設的「略過衝突」、「覆寫衝突」或取消。匯入結果會在介面重新載入前列出已略過的筆記本 ID。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-6s2mbpe",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-6s2mbpe",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "匯入加密內容需要輸入相容的主密碼。變更密碼前的備份可透過相容的歷史金鑰讀取,不會還原目前密碼。加密狀態或資料金鑰不同的筆記本無法直接合併。覆寫只取代相同路徑,保留目標獨有的檔案,不會傳播刪除;匯入後的加密筆記本保持鎖定,需要重新解鎖。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-s7xahw4",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-s7xahw4",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "匯入先驗證選取內容,再寫入資料,失敗或中斷時可以回復。上傳原件、被覆寫檔案及金鑰材料保存在工作空間的 conf/data-imports/ 目錄;核對匯入內容及所需歷史之前,請保留這些復原檔案。"
+ }
+ ]
+ },
{
"ID": "20260614201247-kregnjm",
"Type": "NodeHeading",
diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-d31i9v5.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-d31i9v5.sy
index 5d817b2b61..bb4c43f4fb 100644
--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-d31i9v5.sy
+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-d31i9v5.sy
@@ -7,7 +7,7 @@
"id": "20240530101000-d31i9v5",
"title": "インポートとエクスポート",
"type": "doc",
- "updated": "20261016200946"
+ "updated": "20261020220502"
},
"Children": [
{
@@ -418,6 +418,48 @@
}
]
},
+ {
+ "ID": "20261020220502-x9fsafc",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-x9fsafc",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "Data.zip は別のワークスペースを作成せずに、現在のワークスペースを更新できます。インポート前にアーカイブを解析し、暗号化ノートブックが競合する場合は、初期選択の「競合をスキップ」、「競合を上書き」、またはキャンセルを選べます。画面の再読み込み前に、スキップしたノートブックの ID が結果に表示されます。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-196kynq",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-196kynq",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "暗号化された内容のインポートには、互換性のあるマスターパスワードが必要です。パスワード変更前のバックアップは、互換性のある履歴キーを使用して読み取ることができ、現在のパスワードは元に戻りません。暗号化状態やデータキーが異なるノートブックは直接結合できません。上書きは同じパスのファイルを置き換え、取り込み先だけにあるファイルを保持し、削除を伝播しません。取り込まれた暗号化ノートブックはロックされたままなので、再度ロックを解除してください。"
+ }
+ ]
+ },
+ {
+ "ID": "20261020220502-c9dn1ha",
+ "Type": "NodeParagraph",
+ "Properties": {
+ "id": "20261020220502-c9dn1ha",
+ "updated": "20261020220502"
+ },
+ "Children": [
+ {
+ "Type": "NodeText",
+ "Data": "選択した内容を検証してからデータを書き込み、失敗や中断が発生した場合はロールバックできます。元のアーカイブ、上書き前のファイル、キー情報はワークスペースの conf/data-imports/ ディレクトリに保持されます。取り込まれた内容と必要な履歴を確認するまでは、これらの復旧ファイルを保持してください。"
+ }
+ ]
+ },
{
"ID": "20260614201218-j16bj6l",
"Type": "NodeHeading",
diff --git a/app/src/config/tabs/appTab.ts b/app/src/config/tabs/appTab.ts
index 42a0cf193b..59e146bc9f 100644
--- a/app/src/config/tabs/appTab.ts
+++ b/app/src/config/tabs/appTab.ts
@@ -8,7 +8,6 @@ import type {SettingTabBuilder} from "../setting/builder";
import {confirmResetSettings} from "../setting/reset";
import {Constants} from "../../constants";
import {fetchPost} from "../../util/fetch";
-import {ContractFormData} from "../../util/contractFormData";
/// #if !MOBILE
import {reloadUI} from "../../layout/util";
/// #endif
@@ -30,6 +29,7 @@ import {genConfigItemMainHtml, genConfigItemName} from "../render/fragments";
import {sendAppSetting} from "./appRuntime";
import {getHostCapabilities} from "../../util/hostCapabilities";
import {genWorkspaceStorageHtml, mountWorkspaceStorage} from "./workspaceStorage";
+import {importDataFile} from "../../menus/importData";
/// #if MOBILE
const registerAppWorkspaceGroup = (tab: SettingTabBuilder) => {
@@ -423,8 +423,11 @@ const registerAppDataGroup = (tab: SettingTabBuilder) => {
afterMount: (root) => {
root.querySelector("#importData")?.addEventListener("change", (event: Event) => {
const target = event.target as HTMLInputElement;
- const formData = new ContractFormData({file: target.files[0]});
- fetchPost("/api/import/importData", formData);
+ const file = target.files?.[0];
+ target.value = "";
+ if (file) {
+ void importDataFile(file);
+ }
});
},
});
diff --git a/app/src/menus/dataMigration.ts b/app/src/menus/dataMigration.ts
index 96afd915f1..e1eb36917f 100644
--- a/app/src/menus/dataMigration.ts
+++ b/app/src/menus/dataMigration.ts
@@ -6,7 +6,6 @@ import {escapeHtml} from "../util/escape";
import {fetchPost} from "../util/fetch";
import {ContractFormData} from "../util/contractFormData";
import type {APICallbackResponse, APIPOSTRoutes} from "../types/api";
-import {confirmDialog} from "../dialog/confirmDialog";
import {showMessage} from "../dialog/message";
import {importObsidianVault} from "./importObsidian";
import {saveExportFile, writeText} from "../protyle/util/compatibility";
@@ -16,6 +15,7 @@ import * as path from "path";
import {afterExport} from "../protyle/export/util";
/// #endif
import {getHostCapabilities} from "../util/hostCapabilities";
+import {importDataFile} from "./importData";
interface IDataMigrationOptions {
mode?: "manage" | "onboarding";
@@ -248,9 +248,7 @@ export const openDataMigration = (options: IDataMigrationOptions = {}) => {
});
});
bindFileInput("data", (file, input) => {
- confirmDialog(`${window.siyuan.languages.import} Data`, window.siyuan.languages.importDataTip, () => {
- postFile("/api/import/importData", file);
- });
+ void importDataFile(file, completeContentImport);
input.value = "";
});
bindFileInput("conf", (file, input) => {
diff --git a/app/src/menus/importData.test.ts b/app/src/menus/importData.test.ts
new file mode 100644
index 0000000000..1bbced2d0a
--- /dev/null
+++ b/app/src/menus/importData.test.ts
@@ -0,0 +1,163 @@
+import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {test} from "node:test";
+import {runInNewContext} from "node:vm";
+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";
+
+const compiled = transpileModule(readFileSync("src/menus/importData.ts", "utf8"), {
+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},
+}).outputText;
+
+class Control {
+ value = "";
+ disabled = false;
+ required = false;
+ hidden = false;
+ classList = {toggle: (_name: string, hidden: boolean) => this.hidden = hidden};
+ listeners = new Map<string, () => Promise<void> | void>();
+ addEventListener(event: string, handler: () => Promise<void> | void) {
+ this.listeners.set(event, handler);
+ }
+ async dispatch(event: string) {
+ await this.listeners.get(event)?.();
+ }
+}
+
+const setup = (encrypted = ["box"], conflicts = ["box"]) => {
+ const requests: Array<{url: string, data: {id?: string, mode?: string, password?: string}}> = [];
+ const dialogs: MockDialog[] = [];
+ let selectedMode = "skip";
+ let commitCode = 0;
+ let prepareCode = 0;
+ const messages: unknown[] = [];
+ class MockDialog {
+ controls = new Map<string, Control>();
+ modes = [new Control(), new Control()];
+ destroyed = false;
+ element = {
+ querySelector: (selector: string) => {
+ if (selector.endsWith(":checked")) {
+ const current = new Control();
+ current.value = selectedMode;
+ return current;
+ }
+ return this.controls.get(selector);
+ },
+ querySelectorAll: () => this.modes,
+ };
+ constructor(public options: {content: string, width: string, destroyCallback: () => void}) {
+ for (const name of ["password", "password-label", "import", "cancel", "confirm"]) {
+ this.controls.set(`[data-type="${name}"]`, new Control());
+ }
+ dialogs.push(this);
+ }
+ destroy() {
+ if (!this.destroyed) {
+ this.destroyed = true;
+ this.options.destroyCallback();
+ }
+ }
+ control(name: string) {
+ return this.controls.get(`[data-type="${name}"]`);
+ }
+ }
+ const exports = {} as {
+ importDataFile: (file: File, onComplete?: () => void) => Promise<void>;
+ needsDataImportPassword: (plan: {encrypted: string[], conflicts: string[]}, mode: string) => boolean;
+ };
+ const dependencies = {
+ Dialog: MockDialog,
+ ContractFormData: class {},
+ escapeHtml: (value: string) => value.replaceAll("<", "&lt;").replaceAll(">", "&gt;"),
+ isMobile: () => true,
+ showMessage: (...args: unknown[]) => messages.push(args),
+ fetchSyncPost: async (url: string, data: {id?: string, mode?: string, password?: string}) => {
+ requests.push({url, data});
+ if (url.endsWith("prepareDataImport")) {
+ return {code: prepareCode, data: {id: "plan-id", encrypted, conflicts}};
+ }
+ if (url.endsWith("commitDataImport")) {
+ return {code: commitCode, data: {skipped: data.mode === "skip" ? conflicts : []}};
+ }
+ return {code: 0};
+ },
+ };
+ runInNewContext(compiled, {exports, require: () => dependencies, window: {siyuan: {languages: {
+ import: "Import", imported: "Imported", dataImportConflicts: "Conflicts", dataImportSkip: "Skip",
+ dataImportOverwrite: "Overwrite", dataImportSkipped: "Skipped notebooks", masterPassword: "Password",
+ importDataTip: "Overwrite by path", cancel: "Cancel", confirm: "Confirm",
+ }}}});
+ return {exports, requests, dialogs, messages,
+ selectMode: (mode: string) => selectedMode = mode,
+ failCommit: () => commitCode = -1,
+ failPrepare: () => prepareCode = -1};
+};
+
+test("Data.zip defaults to skip and shows skipped IDs before reloading", async () => {
+ const state = setup(["<box>"], ["<box>"]);
+ let completed = 0;
+ await state.exports.importDataFile({} as File, () => completed++);
+ assert.equal(state.dialogs.length, 1);
+ const dialog = state.dialogs[0];
+ assert.equal(dialog.options.width, "92vw");
+ assert.match(dialog.options.content, /value="skip" checked/);
+ assert.match(dialog.options.content, /&lt;box&gt;/);
+ assert.equal(dialog.control("password-label").hidden, true);
+ await dialog.control("import").dispatch("click");
+ const commit = state.requests.find((item) => item.url.endsWith("commitDataImport"));
+ assert.equal(commit.data.mode, "skip");
+ assert.equal(commit.data.password, "");
+ assert.equal(state.dialogs.length, 2);
+ assert.match(state.dialogs[1].options.content, /Skipped notebooks.*&lt;box&gt;/);
+ assert.equal(completed, 0);
+ assert.equal(state.requests.some((item) => item.url.endsWith("reloadUI")), false);
+ await state.dialogs[1].control("confirm").dispatch("click");
+ assert.equal(completed, 1);
+ assert.equal(state.requests.some((item) => item.url.endsWith("reloadUI")), true);
+ assert.equal(state.requests.some((item) => item.url.endsWith("cancelDataImport")), false);
+});
+
+test("Data.zip overwrite requires a password and failed authentication remains retryable", async () => {
+ const state = setup();
+ await state.exports.importDataFile({} as File);
+ const dialog = state.dialogs[0];
+ state.selectMode("overwrite");
+ await dialog.modes[1].dispatch("change");
+ assert.equal(dialog.control("import").disabled, true);
+ assert.equal(dialog.control("password").required, true);
+ dialog.control("password").value = " secret ";
+ await dialog.control("password").dispatch("input");
+ assert.equal(dialog.control("import").disabled, false);
+ state.failCommit();
+ await dialog.control("import").dispatch("click");
+ const commit = state.requests.find((item) => item.url.endsWith("commitDataImport"));
+ assert.equal(commit.data.mode, "overwrite");
+ assert.equal(commit.data.password, "secret");
+ assert.equal(dialog.destroyed, false);
+ assert.equal(dialog.control("password").value, "");
+ assert.equal(state.dialogs.length, 1);
+ assert.equal(state.requests.some((item) => item.url.endsWith("reloadUI")), false);
+});
+
+test("Data.zip cancellation only cancels the prepared upload", async () => {
+ const state = setup();
+ await state.exports.importDataFile({} as File);
+ await state.dialogs[0].control("cancel").dispatch("click");
+ assert.equal(state.requests.filter((item) => item.url.endsWith("cancelDataImport")).length, 1);
+ assert.equal(state.requests.some((item) => item.url.endsWith("commitDataImport")), false);
+});
+
+test("Data.zip still authenticates non-conflicting encrypted notebooks when conflicts are skipped", () => {
+ const state = setup();
+ assert.equal(state.exports.needsDataImportPassword({encrypted: ["old", "new"], conflicts: ["old"]}, "skip"), true);
+ assert.equal(state.exports.needsDataImportPassword({encrypted: ["old"], conflicts: ["old"]}, "skip"), false);
+ assert.equal(state.exports.needsDataImportPassword({encrypted: ["old"], conflicts: ["old"]}, "overwrite"), true);
+});
+
+test("failed Data.zip analysis opens no import dialog", async () => {
+ const state = setup();
+ state.failPrepare();
+ await state.exports.importDataFile({} as File);
+ assert.equal(state.dialogs.length, 0);
+ assert.equal(state.requests.length, 1);
+});
diff --git a/app/src/menus/importData.ts b/app/src/menus/importData.ts
new file mode 100644
index 0000000000..a729545167
--- /dev/null
+++ b/app/src/menus/importData.ts
@@ -0,0 +1,114 @@
+import {Dialog} from "../dialog";
+import {fetchSyncPost} from "../util/fetch";
+import {ContractFormData} from "../util/contractFormData";
+import {escapeHtml} from "../util/escape";
+import {isMobile} from "../util/functions";
+import type {DataImportPlan} from "../types/api";
+import {showMessage} from "../dialog/message";
+
+export const needsDataImportPassword = (plan: DataImportPlan, mode: "skip" | "overwrite") =>
+ plan.encrypted.some((id) => mode === "overwrite" || !plan.conflicts.includes(id));
+
+// 桌面设置与移动端数据迁移共用预检、冲突选择和认证流程。
+export const importDataFile = async (file: File, onComplete?: () => void) => {
+ const prepared = await fetchSyncPost("/api/import/prepareDataImport", new ContractFormData({file})).catch((error): null => {
+ showMessage(error instanceof Error ? error.message : String(error), 0, "error");
+ return null;
+ });
+ if (!prepared || prepared.code !== 0) {
+ return;
+ }
+ const plan = prepared.data;
+ const lang = window.siyuan.languages;
+ let busy = false;
+ let committed = false;
+ let closed = false;
+ const cancel = () => {
+ if (!busy && !committed) {
+ void fetchSyncPost("/api/import/cancelDataImport", {id: plan.id}, undefined, false).catch(() => {});
+ }
+ };
+ const dialog = new Dialog({
+ title: `${lang.import} Data`,
+ width: isMobile() ? "92vw" : "560px",
+ content: `<div class="b3-dialog__content">
+ <div class="ft__breakword">${lang.importDataTip}</div>
+ ${plan.conflicts.length ? `<div class="fn__hr"></div>
+ <div class="ft__secondary">${lang.dataImportConflicts}</div>
+ <div class="ft__breakword">${plan.conflicts.map(escapeHtml).join("<br>")}</div>
+ <label class="b3-label fn__flex"><input type="radio" name="data-import-mode" value="skip" checked>
+ <span class="fn__space"></span>${lang.dataImportSkip}</label>
+ <label class="b3-label fn__flex"><input type="radio" name="data-import-mode" value="overwrite">
+ <span class="fn__space"></span>${lang.dataImportOverwrite}</label>` : ""}
+ <label class="b3-label fn__block" data-type="password-label">${lang.masterPassword}
+ <div class="fn__hr"></div><input class="b3-text-field fn__block" type="password" data-type="password" autocomplete="off">
+ </label>
+</div>
+<div class="b3-dialog__action">
+ <button class="b3-button b3-button--cancel" data-type="cancel">${lang.cancel}</button>
+ <div class="fn__space"></div><button class="b3-button b3-button--text" data-type="import">${lang.import}</button>
+</div>`,
+ destroyCallback: () => {
+ closed = true;
+ cancel();
+ },
+ });
+ const password = dialog.element.querySelector<HTMLInputElement>('[data-type="password"]');
+ const button = dialog.element.querySelector<HTMLButtonElement>('[data-type="import"]');
+ const modes = dialog.element.querySelectorAll<HTMLInputElement>('[name="data-import-mode"]');
+ const mode = (): "skip" | "overwrite" =>
+ dialog.element.querySelector<HTMLInputElement>('[name="data-import-mode"]:checked')?.value === "overwrite" ? "overwrite" : "skip";
+ const update = () => {
+ const required = needsDataImportPassword(plan, mode());
+ dialog.element.querySelector('[data-type="password-label"]').classList.toggle("fn__none", !required);
+ password.required = required;
+ password.disabled = busy;
+ button.disabled = busy || required && !password.value.trim();
+ };
+ modes.forEach((item) => item.addEventListener("change", update));
+ password.addEventListener("input", update);
+ dialog.element.querySelector('[data-type="cancel"]').addEventListener("click", () => dialog.destroy());
+ button.addEventListener("click", async () => {
+ if (busy || button.disabled) {
+ return;
+ }
+ busy = true;
+ modes.forEach((item) => item.disabled = true);
+ update();
+ try {
+ const result = await fetchSyncPost("/api/import/commitDataImport", {
+ id: plan.id, mode: mode(), password: needsDataImportPassword(plan, mode()) ? password.value.trim() : "",
+ });
+ password.value = "";
+ if (result.code !== 0) {
+ return;
+ }
+ committed = true;
+ dialog.destroy();
+ // 先展示跳过清单,用户关闭结果后再刷新,避免自动重载吞掉结果提示。
+ const completed = new Dialog({
+ title: lang.imported,
+ width: isMobile() ? "92vw" : "560px",
+ content: `<div class="b3-dialog__content ft__breakword">${result.data.skipped.length ?
+ `${lang.dataImportSkipped}<div class="fn__hr"></div>${result.data.skipped.map(escapeHtml).join("<br>")}` : lang.imported}</div>
+<div class="b3-dialog__action"><button class="b3-button b3-button--text" data-type="confirm">${lang.confirm}</button></div>`,
+ destroyCallback: () => {
+ onComplete?.();
+ void fetchSyncPost("/api/ui/reloadUI", {});
+ },
+ });
+ completed.element.querySelector('[data-type="confirm"]').addEventListener("click", () => completed.destroy());
+ } catch (error) {
+ showMessage(error instanceof Error ? error.message : String(error), 0, "error");
+ } finally {
+ busy = false;
+ password.value = "";
+ modes.forEach((item) => item.disabled = false);
+ update();
+ if (closed) {
+ cancel();
+ }
+ }
+ });
+ update();
+};
diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.ts
index 97990f0faa..f5816660b3 100644
--- a/app/src/types/api/index.d.ts
+++ b/app/src/types/api/index.d.ts
@@ -876,6 +876,8 @@ export type CloudSyncDir = { "cloudName": string; "hSize": string; "saveDir": st
export type CloudSyncDirsData = { "checkedSyncDir": string; "hSize": string; "syncDirs": Array<CloudSyncDir | null> | null; };
+export type CommitDataImportRequestInput = { "id": string; "mode": "skip" | "overwrite"; "password"?: string; };
+
export type CommitNotebookArchiveRequestInput = { "id": string; "saved": boolean; };
export type ConfirmSettingsResetRequestInput = { "saved": boolean; "token": string; };
@@ -938,6 +940,12 @@ export type DailyNoteInfo = { "existed": boolean; "hPath": string; "id": string;
export type DailyNoteInfoRequestInput = { "date"?: string | null; "notebook": string; };
+export type DataImportPlan = { "conflicts": Array<string> | null; "encrypted": Array<string> | null; "id": string; };
+
+export type DataImportRequestInput = { "id": string; };
+
+export type DataImportResult = { "skipped": Array<string> | null; };
+
export type DeleteBlockRequestInput = { "id": string; };
export type DiffDocVersionsRequestInput = { "left": DocVersionRefInput; "right": DocVersionRefInput; };
@@ -5664,6 +5672,16 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin"];
};
+ /**
+ * 取消尚未提交且仍有效的 Data.zip 预检;不能删除已提交批次的恢复材料。
+ */
+ "/api/import/cancelDataImport": {
+ request: DataImportRequestInput;
+ response: { "code": 0; "data": null; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
+ body: "json";
+ /** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
+ authorization?: readonly ["authenticated","admin","writable"];
+ };
"/api/import/cancelImportSY": {
request: ImportTokenRequestInput;
response: { "code": 0; "data": null; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
@@ -5678,6 +5696,19 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin"];
};
+ /**
+ * 按路径覆盖并保留目标独有文件,skip 保留冲突目录及其密钥材料,返回明确的跳过清单。
+ * 导入加密内容必须提供可认证兼容密钥的主密码;不同数据密钥或加密状态不能直接合并。
+ * 旧备份不回退当前密码或丢弃历史密钥;完整预检后提交,失败和中断可回滚,加密笔记本保持锁定。
+ * 成功批次的原件、旧密文和密钥材料保留在工作空间 conf/data-imports 下。
+ */
+ "/api/import/commitDataImport": {
+ request: CommitDataImportRequestInput;
+ response: { "code": 0; "data": DataImportResult; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
+ body: "json";
+ /** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
+ authorization?: readonly ["authenticated","admin","writable"];
+ };
"/api/import/continueImportSY": {
request: ContinueImportSYRequestInput;
response: { "code": 0; "data": ImportDocumentData; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
@@ -5692,6 +5723,10 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin"];
};
+ /**
+ * 旧 Data.zip 入口仍拒绝覆盖已有加密笔记本,也拒绝加密来源覆盖同 ID 的普通笔记本。
+ * 不会隐式选择冲突策略;交互式冲突处理使用 prepareDataImport、commitDataImport 和 cancelDataImport。
+ */
"/api/import/importData": {
request: ImportDataRequestInput;
response: { "code": 0; "data": null; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
@@ -5754,6 +5789,17 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin","writable"];
};
+ /**
+ * 预检 Data.zip 并保存原件,返回加密冲突及需要认证的笔记本 ID,不修改活动数据。
+ * 预检有效期为 30 分钟;提交前必须显式选择 skip 或 overwrite,取消会移除尚未提交的暂存文件。
+ */
+ "/api/import/prepareDataImport": {
+ request: ImportDataRequestInput;
+ response: { "code": 0; "data": DataImportPlan; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
+ body: "multipart";
+ /** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
+ authorization?: readonly ["authenticated","admin","writable"];
+ };
"/api/import/startObsidianVaultAnalysis": {
request: ObsidianAnalysisRequestInput;
response: { "code": 0; "data": ObsidianVaultTask | null; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
diff --git a/docs/ENCRYPTED-NOTEBOOK.md b/docs/ENCRYPTED-NOTEBOOK.md
index 54030aba26..6e67096368 100644
--- a/docs/ENCRYPTED-NOTEBOOK.md
+++ b/docs/ENCRYPTED-NOTEBOOK.md
@@ -184,6 +184,12 @@ Sync recovery can validate backup integrity but cannot prove that a backup is th
- Publish: Unsupported. Encrypted notebooks and their documents never appear through the publish service, and unlocking or setting a publish password cannot enable them
+Data.zip imports can update the current workspace on desktop and mobile. The import is analyzed before any active data is written. When an encrypted notebook conflicts with an existing notebook, the dialog defaults to skipping conflicts and also offers overwrite and cancel. Skipping preserves the notebook directory and its key material; the result lists skipped notebook IDs before the interface reloads. Overwrite retains the existing path-based semantics: matching paths are replaced and destination-only files are preserved. It is not a mirror restore and does not propagate deletions.
+
+Importing encrypted content requires a master password that authenticates a compatible key configuration, notebook envelopes, metadata, documents, assets and database definitions. Backups from before a password change can use authenticated historical keys without reverting the current password or discarding recovery keys. The same notebook ID or password string alone does not establish compatibility. Different encryption states or different data keys cannot be merged directly. An incomplete local key configuration must be recovered before importing encrypted content. The source archive's password-migration journal is never installed as an active operation. Existing ciphertext formats, AAD and key derivation remain unchanged.
+
+Affected notebooks stop accepting new operations and wait for existing operations before replacement; they remain locked after import. All selected content is staged and verified before commit. Replaced files and key material are retained with the uploaded archive under `<workspace>/conf/data-imports/<operation ID>/`; a persistent journal restores unfinished batches before notebook mounting or sync. Retain these recovery files until the imported data and required history have been verified. Legacy `/api/import/importData`, CLI and MCP callers do not silently overwrite encrypted conflicts; the interactive workflow uses the typed prepare, commit and cancel endpoints.
+
#### What if I forget the password
It cannot be recovered — by design (no backdoor). Even if the ciphertext has been synced to the cloud, it cannot be decrypted without the master password. You must remember the master password; using a password manager is recommended.
@@ -270,7 +276,8 @@ Recovery triggers (covering scenarios such as conf.json loss, sync to a new devi
| Trigger scenario | Function | Password required? | Notes |
|---|---|---|---|
| After sync completes (backup file pulled down) | `restoreNotebookCryptoConfigFromBackup` | No | Loads the config back into the local conf.json and sets `Enabled=true`; UI shows "enabled, locked" |
-| After importing Data.zip | `restoreNotebookCryptoConfigFromBackup` | No | Same; covers "backup arrived with Data.zip but the local machine is not enabled" |
+| After a legacy Data.zip import | `restoreNotebookCryptoConfigFromBackup` | No | Same; covers "backup arrived with Data.zip but the local machine is not enabled" |
+| Interactive Data.zip import | `CommitDataImport` | Yes, when encrypted content is selected | Authenticate compatible keys and the selected ciphertext before commit; preserve current password and history recovery keys |
| User enters master password to unlock (fallback) | `tryRestoreNotebookCryptoFromBackup` | Yes | `deriveKEK` attempts recovery when the local `Enabled=false`; returns the KEK after verifying the password |
| User manually enables (recovery guard) | `tryRestoreNotebookCryptoFromBackup` | Yes | When encrypted notebooks already exist, refuses to regenerate salt and instead recovers from backup, verifying the password |
diff --git a/docs/ENCRYPTED-NOTEBOOK.zh-CN.md b/docs/ENCRYPTED-NOTEBOOK.zh-CN.md
index 45da623fee..50421eb710 100644
--- a/docs/ENCRYPTED-NOTEBOOK.zh-CN.md
+++ b/docs/ENCRYPTED-NOTEBOOK.zh-CN.md
@@ -184,6 +184,12 @@ Windows 和 macOS 桌面端在 设置 - 鉴权 - 加密笔记本 中提供「跟
- 发布:不支持。加密笔记本及其文档不会出现在发布服务中,解锁或设置发布密码也不能启用
+桌面和移动端可以通过导入 Data.zip 更新当前工作空间。导入先进行分析,再写入活动数据。加密笔记本与现有笔记本冲突时,对话框默认跳过冲突,并提供覆盖和取消。跳过会保留笔记本目录及其密钥材料,结果在界面重载前列出跳过的笔记本 ID。覆盖沿用按路径覆盖语义:相同路径替换,目标独有的文件保留;它不是镜像恢复,也不会传播删除。
+
+导入加密内容需要输入主密码,认证兼容的密钥配置、笔记本包络、元数据、文档、资源和数据库定义。改密前的备份可以使用经过认证的历史密钥读取,不回退当前密码或丢弃恢复密钥。仅凭笔记本 ID 或密码字符串相同不能判定兼容,加密状态不同或数据密钥不同的笔记本不能直接合并。本机密钥配置不完整时,应先完成恢复,再导入加密内容。来源压缩包的改密事务记录不会作为活动操作安装。已有密文格式、AAD 和密钥派生保持不变。
+
+受影响的笔记本先停止接纳新操作并等待在途操作结束,再执行替换,导入后保持锁定。全部选中内容在提交前完成暂存和验证。上传原件、被覆盖文件和密钥材料保存在 `<工作空间>/conf/data-imports/<操作 ID>/`,持久化日志在挂载和同步前恢复未完成批次。在验证导入数据及所需历史之前应保留这些恢复文件。旧 `/api/import/importData`、CLI 和 MCP 调用不会静默覆盖加密冲突;交互流程使用有类型契约的预检、提交和取消接口。
+
#### 忘记密码怎么办
无法恢复——这是设计使然(没有后门)。即使密文已同步到云端,没有主密码也解不开。务必牢记主密码,建议使用密码管理器保存。
@@ -270,7 +276,8 @@ MasterSalt 是 KEK 派生的全局根基——主密码 + MasterSalt 经 Argon2i
| 触发场景 | 函数 | 需要主密码? | 说明 |
|---|---|---|---|
| 同步完成后(拉取到备份文件) | `restoreNotebookCryptoConfigFromBackup` | 否 | 把配置写回本机 conf.json 并置 `Enabled=true`,UI 显示"已启用、锁定" |
-| 导入 Data.zip 后 | `restoreNotebookCryptoConfigFromBackup` | 否 | 同上,覆盖"备份随 Data.zip 到达本机但本机未启用"的情况 |
+| 旧流程导入 Data.zip 后 | `restoreNotebookCryptoConfigFromBackup` | 否 | 同上,覆盖"备份随 Data.zip 到达本机但本机未启用"的情况 |
+| 交互式导入 Data.zip | `CommitDataImport` | 选中加密内容时需要 | 提交前认证兼容密钥和选中密文,保留当前密码及历史恢复密钥 |
| 用户输主密码解锁(最终保障) | `tryRestoreNotebookCryptoFromBackup` | 是 | `deriveKEK` 在本机 `Enabled=false` 时尝试恢复,校验主密码后返回 KEK |
| 用户手动启用(恢复保护) | `tryRestoreNotebookCryptoFromBackup` | 是 | 已存在加密笔记本时拒绝生成新 salt,改为从备份恢复并校验主密码 |
diff --git a/kernel/api/contract_import_data_test.go b/kernel/api/contract_import_data_test.go
new file mode 100644
index 0000000000..dfa301e468
--- /dev/null
+++ b/kernel/api/contract_import_data_test.go
@@ -0,0 +1,137 @@
+// SiYuan - From thought to insight, with agents
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package api
+
+import (
+ archivezip "archive/zip"
+ "bytes"
+ "encoding/json"
+ "mime/multipart"
+ "net/http"
+ "net/http/httptest"
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+
+ "github.com/gin-gonic/gin"
+ "github.com/siyuan-note/siyuan/kernel/apicontract"
+ "github.com/siyuan-note/siyuan/kernel/conf"
+ "github.com/siyuan-note/siyuan/kernel/model"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+func TestAPIContractDataImportPrepareCancelAndInvalidCommit(t *testing.T) {
+ oldConf, oldData, oldConfig, oldTemp, oldHistory := model.Conf, util.DataDir, util.ConfDir, util.TempDir, util.HistoryDir
+ root := t.TempDir()
+ util.DataDir, util.ConfDir, util.TempDir, util.HistoryDir = filepath.Join(root, "data"), filepath.Join(root, "conf"), filepath.Join(root, "temp"), filepath.Join(root, "history")
+ for _, dir := range []string{util.DataDir, util.ConfDir, util.TempDir, util.HistoryDir} {
+ if err := os.MkdirAll(dir, 0700); err != nil {
+ t.Fatal(err)
+ }
+ }
+ model.Conf = model.NewAppConf()
+ model.Conf.NotebookCrypto = conf.NewNotebookCrypto()
+ t.Cleanup(func() {
+ model.Conf, util.DataDir, util.ConfDir, util.TempDir, util.HistoryDir = oldConf, oldData, oldConfig, oldTemp, oldHistory
+ })
+ engine := gin.New()
+ engine.POST("/api/import/prepareDataImport", prepareDataImport)
+ engine.POST("/api/import/commitDataImport", commitDataImport)
+ engine.POST("/api/import/cancelDataImport", cancelDataImport)
+ var archive bytes.Buffer
+ writer := archivezip.NewWriter(&archive)
+ file, err := writer.Create("data/ordinary.txt")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = file.Write([]byte("prepared only")); err != nil {
+ t.Fatal(err)
+ }
+ if err = writer.Close(); err != nil {
+ t.Fatal(err)
+ }
+ var body bytes.Buffer
+ form := multipart.NewWriter(&body)
+ upload, err := form.CreateFormFile("file", "data.zip")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = upload.Write(archive.Bytes()); err != nil {
+ t.Fatal(err)
+ }
+ if err = form.Close(); err != nil {
+ t.Fatal(err)
+ }
+ request := httptest.NewRequest(http.MethodPost, "/api/import/prepareDataImport", &body)
+ request.Header.Set("Content-Type", form.FormDataContentType())
+ recorder := httptest.NewRecorder()
+ engine.ServeHTTP(recorder, request)
+ requireAPIContract(t, http.MethodPost, request.URL.Path, recorder)
+ var prepared struct {
+ Code int `json:"code"`
+ Data apicontract.DataImportPlan `json:"data"`
+ }
+ if err = json.Unmarshal(recorder.Body.Bytes(), &prepared); err != nil || prepared.Code != 0 || prepared.Data.ID == "" ||
+ prepared.Data.Conflicts == nil || prepared.Data.Encrypted == nil {
+ t.Fatalf("invalid prepared response: %s %v", recorder.Body.String(), err)
+ }
+ if _, err = os.Stat(filepath.Join(util.DataDir, "ordinary.txt")); !os.IsNotExist(err) {
+ t.Fatal("prepare wrote active data")
+ }
+ for _, input := range []string{
+ `{"id":"../../outside","mode":"overwrite"}`,
+ `{"id":"` + prepared.Data.ID + `","mode":"silent"}`,
+ `{"id":"` + prepared.Data.ID + `","mode":null}`,
+ `{"id":"` + prepared.Data.ID + `","mode":"skip","password":true}`,
+ } {
+ recorder = httptest.NewRecorder()
+ request = httptest.NewRequest(http.MethodPost, "/api/import/commitDataImport", strings.NewReader(input))
+ engine.ServeHTTP(recorder, request)
+ requireAPIContract(t, http.MethodPost, request.URL.Path, recorder)
+ var response struct{ Code int }
+ if err = json.Unmarshal(recorder.Body.Bytes(), &response); err != nil || response.Code == 0 {
+ t.Fatalf("accepted invalid commit: %s", recorder.Body.String())
+ }
+ }
+ recorder = httptest.NewRecorder()
+ request = httptest.NewRequest(http.MethodPost, "/api/import/cancelDataImport", strings.NewReader(`{"id":" `+prepared.Data.ID+` "}`))
+ engine.ServeHTTP(recorder, request)
+ requireAPIContract(t, http.MethodPost, request.URL.Path, recorder)
+ var canceled struct{ Code int }
+ if err = json.Unmarshal(recorder.Body.Bytes(), &canceled); err != nil || canceled.Code != 0 {
+ t.Fatalf("cancel failed: %s", recorder.Body.String())
+ }
+ if _, err = os.Stat(filepath.Join(util.ConfDir, "data-imports", prepared.Data.ID)); !os.IsNotExist(err) {
+ t.Fatal("cancel retained staging files")
+ }
+}
+
+func TestAPIContractDataImportAuthorization(t *testing.T) {
+ for _, role := range []model.Role{model.RoleReader, model.RoleEditor} {
+ engine := gin.New()
+ engine.Use(func(c *gin.Context) { c.Set(model.RoleContextKey, role); c.Next() })
+ ServeAPI(engine)
+ for _, endpoint := range []string{"prepareDataImport", "commitDataImport", "cancelDataImport"} {
+ recorder := httptest.NewRecorder()
+ engine.ServeHTTP(recorder, httptest.NewRequest(http.MethodPost, "/api/import/"+endpoint, strings.NewReader(`{}`)))
+ if recorder.Code != http.StatusForbidden {
+ t.Fatalf("role %v reached %s: %s", role, endpoint, recorder.Body.String())
+ }
+ }
+ }
+}
diff --git a/kernel/api/import_data.go b/kernel/api/import_data.go
new file mode 100644
index 0000000000..e38f3e5129
--- /dev/null
+++ b/kernel/api/import_data.go
@@ -0,0 +1,56 @@
+// SiYuan - From thought to insight, with agents
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package api
+
+import (
+ "github.com/gin-gonic/gin"
+ "github.com/siyuan-note/siyuan/kernel/apicontract"
+ "github.com/siyuan-note/siyuan/kernel/model"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+var prepareDataImport = contractHandler(apicontract.PrepareDataImport, func(c *gin.Context, request apicontract.ImportDataRequest) apicontract.Response[apicontract.DataImportPlan] {
+ defer util.ClearPushProgress(100)
+ p, cleanup, err := saveImportUploadFile(c, request.File)
+ if err != nil {
+ return apicontract.Failure[apicontract.DataImportPlan](-1, err.Error())
+ }
+ defer cleanup()
+ plan, err := model.PrepareDataImport(p)
+ if err != nil {
+ return apicontract.Failure[apicontract.DataImportPlan](-1, err.Error())
+ }
+ return apicontract.Success(apicontract.DataImportPlan{ID: plan.ID, Conflicts: plan.Conflicts, Encrypted: plan.Encrypted})
+}, beginImportUpload[apicontract.DataImportPlan])
+
+var commitDataImport = contractHandler(apicontract.CommitDataImport, func(c *gin.Context, request apicontract.CommitDataImportRequest) apicontract.Response[apicontract.DataImportResult] {
+ util.PushEndlessProgress(model.Conf.Language(73))
+ defer util.ClearPushProgress(100)
+ skipped, err := model.CommitDataImport(request.ID, string(request.Mode), request.Password)
+ if err != nil {
+ return apicontract.Failure[apicontract.DataImportResult](-1, err.Error())
+ }
+ model.FullReindexDirect()
+ return apicontract.Success(apicontract.DataImportResult{Skipped: skipped})
+})
+
+var cancelDataImport = contractHandler(apicontract.CancelDataImport, func(c *gin.Context, request apicontract.DataImportRequest) apicontract.Response[apicontract.Null] {
+ if err := model.CancelDataImport(request.ID); err != nil {
+ return apicontract.Failure[apicontract.Null](-1, err.Error())
+ }
+ return apicontract.Success(apicontract.Null{})
+})
diff --git a/kernel/api/router.go b/kernel/api/router.go
index f632b51940..f9dc5cc7e1 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -658,6 +658,9 @@ func registerImportRoutes(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/import/importStdMd", contractRouteHandlers(apicontract.ImportStdMd, importStdMd)...)
ginServer.Handle("POST", "/api/import/importZipMd", contractRouteHandlers(apicontract.ImportZipMd, importZipMd)...)
ginServer.Handle("POST", "/api/import/importData", contractRouteHandlers(apicontract.ImportData, importData)...)
+ ginServer.Handle("POST", "/api/import/prepareDataImport", contractRouteHandlers(apicontract.PrepareDataImport, prepareDataImport)...)
+ ginServer.Handle("POST", "/api/import/commitDataImport", contractRouteHandlers(apicontract.CommitDataImport, commitDataImport)...)
+ ginServer.Handle("POST", "/api/import/cancelDataImport", contractRouteHandlers(apicontract.CancelDataImport, cancelDataImport)...)
ginServer.Handle("POST", "/api/import/importSY", contractRouteHandlers(apicontract.ImportSY, importSY)...)
ginServer.Handle("POST", "/api/import/importSYNotebook", contractRouteHandlers(apicontract.ImportSYNotebook, importSYNotebook)...)
ginServer.Handle("POST", "/api/import/importSYAuto", contractRouteHandlers(apicontract.ImportSYAuto, importSYAuto)...)
diff --git a/kernel/apicontract/contracts.go b/kernel/apicontract/contracts.go
index a6c7343b1e..1c869374ab 100644
--- a/kernel/apicontract/contracts.go
+++ b/kernel/apicontract/contracts.go
@@ -676,8 +676,23 @@ var CancelObsidianVaultTask = define[ObsidianTaskRequest, *ObsidianVaultTask]("c
// 未定义的脚注不生成块引用,代码和转义的脚注文本保持原样;反链复用块引用索引。
var ImportStdMd = define[ImportMarkdownRequest, Null]("importStdMd", "/api/import/importStdMd", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{}, "POST")
+// 旧 Data.zip 入口仍拒绝覆盖已有加密笔记本,也拒绝加密来源覆盖同 ID 的普通笔记本。
+// 不会隐式选择冲突策略;交互式冲突处理使用 prepareDataImport、commitDataImport 和 cancelDataImport。
var ImportData = define[ImportDataRequest, Null]("importData", "/api/import/importData", AuthenticatedAccess|AdminAccess|WritableAccess, MultipartBody, ResponseOptions{}, "POST")
+// 预检 Data.zip 并保存原件,返回加密冲突及需要认证的笔记本 ID,不修改活动数据。
+// 预检有效期为 30 分钟;提交前必须显式选择 skip 或 overwrite,取消会移除尚未提交的暂存文件。
+var PrepareDataImport = define[ImportDataRequest, DataImportPlan]("prepareDataImport", "/api/import/prepareDataImport", AuthenticatedAccess|AdminAccess|WritableAccess, MultipartBody, ResponseOptions{}, "POST")
+
+// 按路径覆盖并保留目标独有文件,skip 保留冲突目录及其密钥材料,返回明确的跳过清单。
+// 导入加密内容必须提供可认证兼容密钥的主密码;不同数据密钥或加密状态不能直接合并。
+// 旧备份不回退当前密码或丢弃历史密钥;完整预检后提交,失败和中断可回滚,加密笔记本保持锁定。
+// 成功批次的原件、旧密文和密钥材料保留在工作空间 conf/data-imports 下。
+var CommitDataImport = define[CommitDataImportRequest, DataImportResult]("commitDataImport", "/api/import/commitDataImport", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{}, "POST")
+
+// 取消尚未提交且仍有效的 Data.zip 预检;不能删除已提交批次的恢复材料。
+var CancelDataImport = define[DataImportRequest, Null]("cancelDataImport", "/api/import/cancelDataImport", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{}, "POST")
+
// 压缩包中的 Markdown 使用与 `/api/import/importStdMd` 相同的标准脚注转换规则。
var ImportZipMd = define[ImportZipMarkdownRequest, Null]("importZipMd", "/api/import/importZipMd", AuthenticatedAccess|AdminAccess|WritableAccess, MultipartBody, ResponseOptions{}, "POST")
diff --git a/kernel/apicontract/import.go b/kernel/apicontract/import.go
index 6480af6e72..e31ebfbd13 100644
--- a/kernel/apicontract/import.go
+++ b/kernel/apicontract/import.go
@@ -14,6 +14,33 @@ type ImportDataRequest struct {
File *multipart.FileHeader `json:"file" api:"optional"`
}
+type DataImportPlan struct {
+ ID string `json:"id"`
+ Conflicts []string `json:"conflicts"`
+ Encrypted []string `json:"encrypted"`
+}
+
+type DataImportRequest struct {
+ ID string `json:"id" api:"trim"`
+}
+
+type DataImportMode string
+
+const (
+ DataImportSkip DataImportMode = "skip"
+ DataImportOverwrite DataImportMode = "overwrite"
+)
+
+type CommitDataImportRequest struct {
+ ID string `json:"id" api:"trim"`
+ Mode DataImportMode `json:"mode" api:"enum=skip|overwrite"`
+ Password string `json:"password" api:"optional,trim"`
+}
+
+type DataImportResult struct {
+ Skipped []string `json:"skipped"`
+}
+
// ImportSYRequest 导入 .sy.zip,同名同内容的自定义表情复用;同名不同内容返回错误并保留已有文件。
type ImportSYRequest struct {
File *multipart.FileHeader `json:"file" api:"optional"`
diff --git a/kernel/apicontract/import_test.go b/kernel/apicontract/import_test.go
index c166676ec3..76aca9f992 100644
--- a/kernel/apicontract/import_test.go
+++ b/kernel/apicontract/import_test.go
@@ -22,6 +22,20 @@ func TestStagedImportRequestCompatibility(t *testing.T) {
}
}
+func TestDataImportContractRequiresExplicitConflictChoice(t *testing.T) {
+ for _, mode := range []string{"skip", "overwrite"} {
+ request, err := CommitDataImport.Decode(strings.NewReader(`{"id":" plan ","mode":"` + mode + `","password":" secret "}`))
+ if err != nil || request.ID != "plan" || string(request.Mode) != mode || request.Password != "secret" {
+ t.Fatalf("invalid commit decoding: %+v %v", request, err)
+ }
+ }
+ for _, body := range []string{`{}`, `{"id":"plan"}`, `{"id":"plan","mode":"silent"}`, `{"id":"plan","mode":null}`, `{"id":"plan","mode":"skip","password":true}`} {
+ if _, err := CommitDataImport.Decode(strings.NewReader(body)); err == nil {
+ t.Fatalf("invalid import choice accepted: %s", body)
+ }
+ }
+}
+
func TestImportMarkdownRequestCompatibility(t *testing.T) {
for _, flag := range []string{`true`, `false`, `null`, `"ignored"`, `1`, `{}`} {
request, err := ImportStdMd.Decode(strings.NewReader(`{"notebook":" box ","localPath":" path ","toPath":"","skipRoot":` + flag + `}`))
diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.json
index fd86e27692..164d6d0c2c 100644
--- a/kernel/apicontract/schema.json
+++ b/kernel/apicontract/schema.json
@@ -21194,6 +21194,29 @@
],
"additionalProperties": false
},
+ "CommitDataImportRequestInput": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "mode": {
+ "type": "string",
+ "enum": [
+ "skip",
+ "overwrite"
+ ]
+ },
+ "password": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "id",
+ "mode"
+ ],
+ "additionalProperties": false
+ },
"CommitNotebookArchiveRequestInput": {
"type": "object",
"properties": {
@@ -22814,6 +22837,80 @@
],
"additionalProperties": false
},
+ "DataImportPlan": {
+ "type": "object",
+ "properties": {
+ "conflicts": {
+ "anyOf": [
+ {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "encrypted": {
+ "anyOf": [
+ {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "id": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "conflicts",
+ "encrypted",
+ "id"
+ ],
+ "additionalProperties": false
+ },
+ "DataImportRequestInput": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "id"
+ ],
+ "additionalProperties": false
+ },
+ "DataImportResult": {
+ "type": "object",
+ "properties": {
+ "skipped": {
+ "anyOf": [
+ {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "skipped"
+ ],
+ "additionalProperties": false
+ },
"DeleteBlockRequestInput": {
"type": "object",
"properties": {
@@ -151066,6 +151163,86 @@
]
}
},
+ {
+ "method": "POST",
+ "path": "/api/import/cancelDataImport",
+ "handler": "cancelDataImport",
+ "authorization": [
+ "authenticated",
+ "admin",
+ "writable"
+ ],
+ "body": "json",
+ "request": {
+ "$ref": "#/$defs/DataImportRequestInput"
+ },
+ "response": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ 0
+ ]
+ },
+ "data": {
+ "type": "null"
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ -1
+ ]
+ },
+ "data": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "closeTimeout": {
+ "type": "number"
+ }
+ },
+ "required": [
+ "closeTimeout"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": true
+ }
+ ]
+ }
+ },
{
"method": "POST",
"path": "/api/import/cancelImportSY",
@@ -151242,6 +151419,86 @@
]
}
},
+ {
+ "method": "POST",
+ "path": "/api/import/commitDataImport",
+ "handler": "commitDataImport",
+ "authorization": [
+ "authenticated",
+ "admin",
+ "writable"
+ ],
+ "body": "json",
+ "request": {
+ "$ref": "#/$defs/CommitDataImportRequestInput"
+ },
+ "response": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ 0
+ ]
+ },
+ "data": {
+ "$ref": "#/$defs/DataImportResult"
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ -1
+ ]
+ },
+ "data": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "closeTimeout": {
+ "type": "number"
+ }
+ },
+ "required": [
+ "closeTimeout"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": true
+ }
+ ]
+ }
+ },
{
"method": "POST",
"path": "/api/import/continueImportSY",
@@ -151918,6 +152175,86 @@
]
}
},
+ {
+ "method": "POST",
+ "path": "/api/import/prepareDataImport",
+ "handler": "prepareDataImport",
+ "authorization": [
+ "authenticated",
+ "admin",
+ "writable"
+ ],
+ "body": "multipart",
+ "request": {
+ "$ref": "#/$defs/ImportDataRequestInput"
+ },
+ "response": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ 0
+ ]
+ },
+ "data": {
+ "$ref": "#/$defs/DataImportPlan"
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer",
+ "enum": [
+ -1
+ ]
+ },
+ "data": {
+ "anyOf": [
+ {
+ "type": "object",
+ "properties": {
+ "closeTimeout": {
+ "type": "number"
+ }
+ },
+ "required": [
+ "closeTimeout"
+ ],
+ "additionalProperties": false
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "msg": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "code",
+ "msg",
+ "data"
+ ],
+ "additionalProperties": true
+ }
+ ]
+ }
+ },
{
"method": "POST",
"path": "/api/import/startObsidianVaultAnalysis",
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index 781fcf3525..dc0571873c 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -290,6 +290,10 @@ func InitConf() {
}
Conf = NewAppConf()
+ if err := recoverDataImports(); err != nil {
+ logging.LogFatalf(logging.ExitCodeFileSysErr, "recover Data.zip import failed: %s", err)
+ return
+ }
// 先回滚未提交的目录移动,即使配置文件丢失也必须在挂载和同步之前恢复。
if err := recoverNotebookArchiveOperations(); err != nil {
logging.LogErrorf("recover notebook archive operations failed: %s", err)
diff --git a/kernel/model/import.go b/kernel/model/import.go
index dda14fb6ad..edc86ae674 100644
--- a/kernel/model/import.go
+++ b/kernel/model/import.go
@@ -1284,76 +1284,21 @@ func writeImportedTree(boxID, syPath, newSyPath, relPath string, data []byte) er
}
func validateImportedNotebookIdentities(tmpDataPath string) ([]string, error) {
- dirs, err := os.ReadDir(tmpDataPath)
+ identities, err := inspectDataImportNotebooks(tmpDataPath)
if err != nil {
return nil, err
}
-
var encryptedBoxIDs []string
- for _, entry := range dirs {
- if !entry.IsDir() || !ast.IsNodeIDPattern(entry.Name()) {
- continue
- }
-
- boxID := entry.Name()
- boxDir := filepath.Join(tmpDataPath, boxID)
- confPath := filepath.Join(boxDir, ".siyuan", "conf.json")
- backupPath := filepath.Join(boxDir, ".siyuan", notebookCryptoBackupFilename)
-
- var boxConf *conf.BoxConf
- if filelock.IsExist(confPath) {
- data, readErr := filelock.ReadFile(confPath)
- if readErr != nil {
- return nil, fmt.Errorf("read imported notebook conf [%s] failed: %w", boxID, readErr)
- }
- boxConf = conf.NewBoxConf()
- if unmarshalErr := gulu.JSON.UnmarshalJSON(data, boxConf); unmarshalErr != nil {
- return nil, fmt.Errorf("parse imported notebook conf [%s] failed: %w", boxID, unmarshalErr)
- }
- }
-
- var backup *conf.BoxEncryption
- if filelock.IsExist(backupPath) {
- backup, err = readBoxEncryptionFile(backupPath)
- if err != nil {
- return nil, fmt.Errorf("invalid imported notebook identity [%s]: %w", boxID, err)
- }
+ for boxID, crypt := range identities {
+ if _, statErr := os.Lstat(filepath.Join(util.DataDir, boxID)); statErr == nil && IsEncryptedBox(boxID) {
+ return nil, fmt.Errorf("refuse to overwrite existing encrypted notebook [%s]", boxID)
}
-
- var boxCrypt *conf.BoxEncryption
- if boxConf != nil && boxConf.Encrypted {
- if boxConf.BoxCrypt != nil && validateBoxEncryption(boxConf.BoxCrypt) == nil {
- boxCrypt = boxConf.BoxCrypt
- } else {
- boxCrypt = backup
- }
- if boxCrypt == nil {
- return nil, fmt.Errorf("encrypted notebook [%s] has no valid identity", boxID)
+ if crypt != nil {
+ if _, statErr := os.Lstat(filepath.Join(util.DataDir, boxID)); statErr == nil {
+ return nil, fmt.Errorf(Conf.Language(423), boxID)
}
- } else if boxConf != nil && backup != nil {
- return nil, fmt.Errorf("notebook [%s] has conflicting normal and encrypted identities", boxID)
- } else if backup != nil {
- boxCrypt = backup
- }
-
- payloadFound, payloadErr := hasEncryptedNotebookPayloadAtPath(boxDir)
- if payloadErr != nil {
- return nil, fmt.Errorf("inspect imported notebook [%s] failed: %w", boxID, payloadErr)
- }
- if boxCrypt == nil && payloadFound {
- return nil, fmt.Errorf("imported notebook [%s] contains encrypted payload without identity", boxID)
- }
- if boxCrypt == nil {
- continue
- }
-
- if err = validateBoxEncryption(boxCrypt); err != nil {
- return nil, fmt.Errorf("invalid imported notebook identity [%s]: %w", boxID, err)
- }
- if filelock.IsExist(filepath.Join(util.DataDir, boxID)) && IsEncryptedBox(boxID) {
- return nil, fmt.Errorf("refuse to overwrite existing encrypted notebook [%s]", boxID)
+ encryptedBoxIDs = append(encryptedBoxIDs, boxID)
}
- encryptedBoxIDs = append(encryptedBoxIDs, boxID)
}
return encryptedBoxIDs, nil
}
diff --git a/kernel/model/import_data.go b/kernel/model/import_data.go
new file mode 100644
index 0000000000..6c68014bd9
--- /dev/null
+++ b/kernel/model/import_data.go
@@ -0,0 +1,571 @@
+// SiYuan - From thought to insight, with agents
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package model
+
+import (
+ "archive/zip"
+ "bytes"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "os"
+ "path/filepath"
+ "reflect"
+ "slices"
+ "sort"
+ "strings"
+ "sync"
+ "time"
+
+ "github.com/88250/lute/ast"
+ "github.com/siyuan-note/siyuan/kernel/conf"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+const dataImportTTL = 30 * time.Minute
+
+var dataImportMu sync.Mutex
+var dataImportAccess sync.RWMutex
+
+type DataImportPlan struct {
+ ID string `json:"id"`
+ Conflicts []string `json:"conflicts"`
+ Encrypted []string `json:"encrypted"`
+}
+
+type dataImportStage struct {
+ Version int `json:"version"`
+ Created int64 `json:"created"`
+ Plan DataImportPlan `json:"plan"`
+ Files map[string]notebookArchiveFile `json:"files"`
+}
+
+func dataImportBase() string { return filepath.Join(util.ConfDir, "data-imports") }
+
+func dataImportDirectory(id string) (string, error) {
+ if !ast.IsNodeIDPattern(id) {
+ return "", errors.New(Conf.Language(422))
+ }
+ directory := filepath.Join(dataImportBase(), id)
+ if err := validateEncryptedCleanupPath(util.ConfDir, directory); err != nil {
+ return "", err
+ }
+ return directory, nil
+}
+
+// PrepareDataImport 仅保存上传原件和预检结果,不修改活动数据或解锁笔记本。
+func PrepareDataImport(zipPath string) (plan DataImportPlan, err error) {
+ dataImportMu.Lock()
+ defer dataImportMu.Unlock()
+ if err = recoverDataImports(); err != nil {
+ return
+ }
+ plan = DataImportPlan{ID: ast.NewNodeID(), Conflicts: []string{}, Encrypted: []string{}}
+ directory, err := dataImportDirectory(plan.ID)
+ if err != nil {
+ return
+ }
+ if err = archiveCopyFile(zipPath, filepath.Join(directory, "source.zip")); err != nil {
+ return
+ }
+ incoming := filepath.Join(directory, "incoming")
+ if err = extractDataImport(filepath.Join(directory, "source.zip"), incoming); err != nil {
+ return
+ }
+ identities, err := inspectDataImportNotebooks(incoming)
+ if err != nil {
+ return
+ }
+ plan = planDataImport(plan.ID, identities)
+ files, err := archiveDirectoryFiles(incoming)
+ if err != nil {
+ return
+ }
+ stage := dataImportStage{Version: 1, Created: time.Now().Unix(), Plan: plan, Files: files}
+ err = writeDataImportJSON(filepath.Join(directory, "stage.json"), stage)
+ return
+}
+
+func planDataImport(id string, identities map[string]*conf.BoxEncryption) DataImportPlan {
+ plan := DataImportPlan{ID: id, Conflicts: []string{}, Encrypted: []string{}}
+ for boxID, crypt := range identities {
+ if crypt != nil {
+ plan.Encrypted = append(plan.Encrypted, boxID)
+ }
+ if _, err := os.Lstat(filepath.Join(util.DataDir, boxID)); err == nil && (crypt != nil || IsEncryptedBox(boxID)) {
+ plan.Conflicts = append(plan.Conflicts, boxID)
+ }
+ }
+ sort.Strings(plan.Conflicts)
+ sort.Strings(plan.Encrypted)
+ return plan
+}
+
+// extractDataImport 保留原有单层 Data.zip 容器,拒绝重复路径、跨平台歧义和链接条目。
+func extractDataImport(zipPath, destination string) error {
+ reader, err := zip.OpenReader(zipPath)
+ if err != nil {
+ return err
+ }
+ defer reader.Close()
+ if len(reader.File) == 0 || len(reader.File) > notebookArchiveMaxEntries {
+ return errors.New(Conf.Language(198))
+ }
+ root := ""
+ seen := map[string]bool{}
+ for _, file := range reader.File {
+ name := strings.TrimSuffix(file.Name, "/")
+ if !archiveRelativePath(name) || !file.Mode().IsRegular() && !file.FileInfo().IsDir() {
+ return errors.New(Conf.Language(198))
+ }
+ parts := strings.SplitN(name, "/", 2)
+ if root == "" {
+ root = parts[0]
+ }
+ if parts[0] != root || len(parts) == 1 && !file.FileInfo().IsDir() {
+ return errors.New(Conf.Language(198))
+ }
+ if seen[strings.ToLower(name)] {
+ return errors.New(Conf.Language(198))
+ }
+ seen[strings.ToLower(name)] = true
+ if len(parts) == 1 || file.FileInfo().IsDir() {
+ continue
+ }
+ target := filepath.Join(destination, filepath.FromSlash(parts[1]))
+ if err = os.MkdirAll(filepath.Dir(target), 0700); err != nil {
+ return err
+ }
+ input, openErr := file.Open()
+ if openErr != nil {
+ return openErr
+ }
+ output, createErr := os.OpenFile(target, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0600)
+ if createErr != nil {
+ input.Close()
+ return createErr
+ }
+ _, copyErr := io.Copy(output, input)
+ inputErr, outputErr := input.Close(), output.Close()
+ if err = errors.Join(copyErr, inputErr, outputErr); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+// inspectDataImportNotebooks 同时记录普通与加密身份,避免普通来源覆盖现有加密目录。
+func inspectDataImportNotebooks(root string) (map[string]*conf.BoxEncryption, error) {
+ entries, err := os.ReadDir(root)
+ if err != nil {
+ return nil, err
+ }
+ identities := map[string]*conf.BoxEncryption{}
+ for _, entry := range entries {
+ if strings.HasSuffix(entry.Name(), ".sy") {
+ return nil, errors.New(Conf.Language(198))
+ }
+ if !entry.IsDir() || !ast.IsNodeIDPattern(entry.Name()) {
+ continue
+ }
+ boxID := entry.Name()
+ directory := filepath.Join(root, boxID)
+ data, readErr := os.ReadFile(filepath.Join(directory, ".siyuan", "conf.json"))
+ var boxConf *conf.BoxConf
+ if readErr == nil {
+ boxConf = conf.NewBoxConf()
+ if err = json.Unmarshal(data, boxConf); err != nil {
+ return nil, err
+ }
+ } else if !os.IsNotExist(readErr) {
+ return nil, readErr
+ }
+ var backup *conf.BoxEncryption
+ backupPath := filepath.Join(directory, ".siyuan", notebookCryptoBackupFilename)
+ if _, statErr := os.Lstat(backupPath); statErr == nil {
+ backup, err = readBoxEncryptionFile(backupPath)
+ if err != nil {
+ return nil, err
+ }
+ } else if !os.IsNotExist(statErr) {
+ return nil, statErr
+ }
+ var crypt *conf.BoxEncryption
+ if boxConf != nil && boxConf.Encrypted {
+ crypt = boxConf.BoxCrypt
+ if crypt == nil || validateBoxEncryption(crypt) != nil {
+ crypt = backup
+ }
+ if crypt == nil {
+ return nil, errors.New(Conf.Language(316))
+ }
+ } else if boxConf != nil && backup != nil {
+ return nil, fmt.Errorf(Conf.Language(423), boxID)
+ } else {
+ crypt = backup
+ }
+ payload, payloadErr := hasEncryptedNotebookPayloadAtPath(directory)
+ if payloadErr != nil {
+ return nil, payloadErr
+ }
+ if crypt == nil && payload {
+ return nil, errors.New(Conf.Language(316))
+ }
+ if crypt != nil {
+ if err = validateBoxEncryption(crypt); err != nil {
+ return nil, err
+ }
+ }
+ identities[boxID] = crypt
+ }
+ return identities, nil
+}
+
+func loadDataImportStage(id string) (string, *dataImportStage, error) {
+ directory, err := dataImportDirectory(id)
+ if err != nil {
+ return "", nil, err
+ }
+ data, err := os.ReadFile(filepath.Join(directory, "stage.json"))
+ stage := &dataImportStage{}
+ if err != nil || json.Unmarshal(data, stage) != nil || stage.Version != 1 || stage.Plan.ID != id ||
+ time.Now().Unix()-stage.Created > int64(dataImportTTL.Seconds()) || stage.Created > time.Now().Unix() {
+ return "", nil, errors.New(Conf.Language(422))
+ }
+ if _, err = os.Lstat(filepath.Join(directory, "operation.json")); !os.IsNotExist(err) {
+ return "", nil, errors.New(Conf.Language(422))
+ }
+ return directory, stage, nil
+}
+
+func CancelDataImport(id string) error {
+ dataImportMu.Lock()
+ defer dataImportMu.Unlock()
+ directory, _, err := loadDataImportStage(id)
+ if err != nil {
+ return err
+ }
+ return os.RemoveAll(directory)
+}
+
+// CommitDataImport 在预检全部通过后提交按路径覆盖;跳过的目录与密钥材料保持原样。
+func CommitDataImport(id, mode, password string) (skipped []string, err error) {
+ dataImportAccess.Lock()
+ defer dataImportAccess.Unlock()
+ dataImportMu.Lock()
+ defer dataImportMu.Unlock()
+ lockSync()
+ defer unlockSync()
+ notebookCryptoMu.Lock()
+ defer notebookCryptoMu.Unlock()
+ if mode != "skip" && mode != "overwrite" {
+ return nil, errors.New(Conf.Language(422))
+ }
+ if err = recoverDataImports(); err != nil {
+ return
+ }
+ if err = checkPendingNotebookArchives(); err != nil {
+ return
+ }
+ if migration, migrationErr := readMasterPasswordMigration(); migrationErr != nil || migration != nil {
+ return nil, errors.New(Conf.Language(239))
+ }
+ directory, stage, err := loadDataImportStage(id)
+ if err != nil {
+ return
+ }
+ incoming := filepath.Join(directory, "incoming")
+ files, err := archiveDirectoryFiles(incoming)
+ if err != nil || !reflect.DeepEqual(files, stage.Files) {
+ return nil, errors.New(Conf.Language(422))
+ }
+ identities, err := inspectDataImportNotebooks(incoming)
+ if err != nil {
+ return
+ }
+ if !reflect.DeepEqual(planDataImport(id, identities), stage.Plan) {
+ return nil, errors.New(Conf.Language(422))
+ }
+ skipped = []string{}
+ if mode == "skip" {
+ skipped = append(skipped, stage.Plan.Conflicts...)
+ }
+ var encrypted []string
+ for _, boxID := range stage.Plan.Encrypted {
+ if !slices.Contains(skipped, boxID) {
+ encrypted = append(encrypted, boxID)
+ }
+ }
+ for _, boxID := range stage.Plan.Conflicts {
+ if !slices.Contains(skipped, boxID) && (identities[boxID] == nil || !IsEncryptedBox(boxID)) {
+ return nil, fmt.Errorf(Conf.Language(423), boxID)
+ }
+ }
+ var nc *conf.NotebookCrypto
+ var kek []byte
+ if len(encrypted) != 0 {
+ nc, kek, err = dataImportKey(incoming, password, encrypted, identities)
+ if err != nil {
+ return
+ }
+ defer zeroAndClear(kek)
+ }
+ // 生命周期锁先阻止新的访问并排空既有请求,随后才冻结编辑队列和复制磁盘快照。
+ for _, boxID := range encrypted {
+ release := holdEncryptedBoxTransition(boxID)
+ defer release()
+ if IsEncryptedBox(boxID) {
+ mounted := isEncryptedBoxMounted(boxID)
+ lockBoxWithPreparationHeld(boxID, func() {
+ if mounted {
+ GenerateFileHistoryForBox(&Box{ID: boxID})
+ }
+ })
+ }
+ }
+ FlushTxQueue()
+ flushLock.Lock()
+ defer flushLock.Unlock()
+ if txQueueSize() != 0 {
+ return nil, errors.New(Conf.Language(239))
+ }
+ install := filepath.Join(directory, "install")
+ if err = validateEncryptedCleanupPath(directory, install); err != nil {
+ return
+ }
+ if err = os.RemoveAll(install); err != nil {
+ return
+ }
+ if err = os.MkdirAll(install, 0700); err != nil {
+ return
+ }
+ if err = stageDataImportFiles(incoming, install, skipped); err != nil {
+ return
+ }
+ for _, boxID := range encrypted {
+ if err = stageEncryptedDataImport(incoming, install, boxID, identities[boxID], nc, kek); err != nil {
+ return
+ }
+ }
+ if nc != nil {
+ nc.Enabled = true
+ prepareBackupForWrite(nc)
+ nc.KEKMAC = computeKEKMAC(nc, kek)
+ if err = writeDataImportJSON(filepath.Join(install, ".siyuan", "data-crypto-backup.json"), nc); err != nil {
+ return
+ }
+ if !verifyKEKAgainstExistingBoxes(kek, nc) || !verifyKEKAgainstEncryptedHistory(kek, nc) {
+ return nil, errors.New(Conf.Language(316))
+ }
+ }
+ keys, err := notebookArchiveKeys()
+ if err != nil {
+ return nil, err
+ }
+ for name, data := range keys {
+ if err = writeDataImportBytes(filepath.Join(directory, name), data); err != nil {
+ return nil, err
+ }
+ }
+ if err = applyDataImport(directory, install, copyDataImportFile); err != nil {
+ return
+ }
+ if nc != nil {
+ Conf.m.Lock()
+ Conf.NotebookCrypto = nc
+ Conf.m.Unlock()
+ Conf.Save()
+ }
+ for _, boxID := range encrypted {
+ forgetRuntimeNormalBox(boxID)
+ markRuntimeEncryptedBox(boxID)
+ setEncryptedBoxState(boxID, EncryptedBoxStateLocked)
+ }
+ IncSync()
+ return
+}
+
+func stageDataImportFiles(source, target string, skipped []string) error {
+ return archiveWalk(source, func(name, fullPath string) error {
+ lower := strings.ToLower(name)
+ if slices.Contains(skipped, strings.SplitN(name, "/", 2)[0]) || lower == ".siyuan/data-crypto-backup.json" ||
+ lower == ".siyuan/master-password-migration.json" {
+ return nil
+ }
+ return copyDataImportFile(fullPath, filepath.Join(target, filepath.FromSlash(name)))
+ })
+}
+
+func stageEncryptedDataImport(incoming, install, boxID string, crypt *conf.BoxEncryption, nc *conf.NotebookCrypto, kek []byte) error {
+ dek, err := decryptWrappedDEKWithHistory(boxID, crypt, kek, nc)
+ if err != nil {
+ return errors.New(Conf.Language(316))
+ }
+ defer zeroAndClear(dek)
+ if err = authenticateNotebookArchiveBox(filepath.Join(incoming, boxID), boxID, dek, crypt); err != nil {
+ return err
+ }
+ current := filepath.Join(util.DataDir, boxID)
+ merged := filepath.Join(install, boxID)
+ if _, statErr := os.Lstat(current); statErr == nil {
+ local, readErr := GetBoxEncryption(boxID)
+ if readErr != nil || local == nil {
+ return fmt.Errorf(Conf.Language(423), boxID)
+ }
+ localDEK, decryptErr := decryptWrappedDEKWithHistory(boxID, local, kek, nc)
+ same := decryptErr == nil && bytes.Equal(localDEK, dek)
+ zeroAndClear(localDEK)
+ if !same {
+ return fmt.Errorf(Conf.Language(423), boxID)
+ }
+ // 先保留本机独有路径,再覆盖来源路径;不把旧文件隐式删除为镜像恢复。
+ if err = archiveWalk(current, func(name, p string) error {
+ target := filepath.Join(merged, filepath.FromSlash(name))
+ if _, existsErr := os.Lstat(target); existsErr == nil {
+ return nil
+ } else if !os.IsNotExist(existsErr) {
+ return existsErr
+ }
+ return copyDataImportFile(p, target)
+ }); err != nil {
+ return err
+ }
+ } else if !os.IsNotExist(statErr) {
+ return statErr
+ }
+ if err = authenticateNotebookArchiveBox(merged, boxID, dek, crypt); err != nil {
+ return err
+ }
+ boxConf := conf.NewBoxConf()
+ if data, readErr := os.ReadFile(filepath.Join(merged, ".siyuan", "conf.json")); readErr == nil {
+ if err = json.Unmarshal(data, boxConf); err != nil {
+ return err
+ }
+ } else if !os.IsNotExist(readErr) {
+ return readErr
+ }
+ boxConf.Encrypted, boxConf.Closed, boxConf.BoxCrypt = true, true, crypt
+ clearBoxMetadata(boxConf)
+ if err = writeDataImportJSON(filepath.Join(merged, ".siyuan", "conf.json"), boxConf); err != nil {
+ return err
+ }
+ return writeDataImportJSON(filepath.Join(merged, ".siyuan", notebookCryptoBackupFilename), crypt)
+}
+
+// dataImportKey 优先使用本机认证配置;候选必须保留当前及历史 KEK,避免旧备份回退密码。
+func dataImportKey(incoming, password string, encrypted []string, identities map[string]*conf.BoxEncryption) (*conf.NotebookCrypto, []byte, error) {
+ current := currentNotebookCrypto()
+ candidates := []*conf.NotebookCrypto{current}
+ if data, err := os.ReadFile(filepath.Join(incoming, ".siyuan", "data-crypto-backup.json")); err == nil {
+ candidate := &conf.NotebookCrypto{}
+ if json.Unmarshal(data, candidate) == nil {
+ candidates = append(candidates, candidate)
+ }
+ }
+ for _, nc := range candidates {
+ if !notebookCryptoConfigurationComplete(nc) || password == "" {
+ continue
+ }
+ kek := util.DeriveKey(password, nc.MasterSalt, nc.KDFParams)
+ verifier, err := util.DecryptWithAAD(kek, nc.KEKVerifier, []byte("siyuan:kek-verifier"))
+ if err != nil || !bytes.Equal(verifier, kekVerifierMagic) || !verifyKEKMAC(nc, kek) ||
+ !dataImportPreservesKeys(current, nc, kek) || !verifyKEKAgainstExistingBoxes(kek, nc) || !verifyKEKAgainstEncryptedHistory(kek, nc) {
+ zeroAndClear(kek)
+ continue
+ }
+ valid := true
+ for _, id := range encrypted {
+ dek, decryptErr := decryptWrappedDEKWithHistory(id, identities[id], kek, nc)
+ if decryptErr == nil {
+ decryptErr = authenticateNotebookArchiveBox(filepath.Join(incoming, id), id, dek, identities[id])
+ }
+ if decryptErr == nil && IsEncryptedBox(id) {
+ local, localErr := GetBoxEncryption(id)
+ if localErr != nil || local == nil {
+ decryptErr = errors.New(Conf.Language(316))
+ } else {
+ localDEK, localDecryptErr := decryptWrappedDEKWithHistory(id, local, kek, nc)
+ if localDecryptErr != nil || !bytes.Equal(localDEK, dek) {
+ decryptErr = errors.New(Conf.Language(316))
+ }
+ zeroAndClear(localDEK)
+ }
+ }
+ zeroAndClear(dek)
+ if decryptErr != nil {
+ valid = false
+ break
+ }
+ }
+ if !valid {
+ zeroAndClear(kek)
+ continue
+ }
+ nc.AutoLockMinutes = current.AutoLockMinutes
+ return nc, kek, nil
+ }
+ return nil, nil, errors.New(Conf.Language(316))
+}
+
+func dataImportPreservesKeys(current, candidate *conf.NotebookCrypto, kek []byte) bool {
+ keys, err := decryptHistoryKEKs(kek, candidate.HistoryKEKs)
+ if err != nil {
+ return false
+ }
+ defer func() { clearHistoryKEKs(keys) }()
+ if !notebookCryptoConfigurationComplete(current) {
+ return NotebookCryptoLifecycleState(false) == NotebookCryptoStateDisabled
+ }
+ if !bytes.Equal(current.MasterSalt, candidate.MasterSalt) {
+ return false
+ }
+ keys = append(keys, bytes.Clone(kek))
+ for _, key := range keys {
+ verifier, decryptErr := util.DecryptWithAAD(key, current.KEKVerifier, []byte("siyuan:kek-verifier"))
+ if decryptErr != nil || !bytes.Equal(verifier, kekVerifierMagic) || !verifyKEKMAC(current, key) {
+ continue
+ }
+ previous, historyErr := decryptHistoryKEKs(key, current.HistoryKEKs)
+ defer clearHistoryKEKs(previous)
+ if historyErr != nil {
+ return false
+ }
+ for _, old := range previous {
+ if !slices.ContainsFunc(keys, func(kept []byte) bool { return bytes.Equal(kept, old) }) {
+ return false
+ }
+ }
+ return true
+ }
+ return false
+}
+
+func writeDataImportJSON(p string, value interface{}) error {
+ data, err := json.Marshal(value)
+ if err != nil {
+ return err
+ }
+ return writeDataImportBytes(p, data)
+}
+
+func writeDataImportBytes(p string, data []byte) error {
+ if err := os.MkdirAll(filepath.Dir(p), 0700); err != nil {
+ return err
+ }
+ return writeEncryptedCleanupData(p, data)
+}
diff --git a/kernel/model/import_data_test.go b/kernel/model/import_data_test.go
new file mode 100644
index 0000000000..1ca396609e
--- /dev/null
+++ b/kernel/model/import_data_test.go
@@ -0,0 +1,672 @@
+// SiYuan - From thought to insight, with agents
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package model
+
+import (
+ "archive/zip"
+ "bytes"
+ "encoding/json"
+ "errors"
+ "net/http"
+ "net/http/httptest"
+ "os"
+ "path/filepath"
+ "reflect"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/gin-gonic/gin"
+ "github.com/siyuan-note/siyuan/kernel/conf"
+ "github.com/siyuan-note/siyuan/kernel/filesys"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+const dataImportTestID = "20261020180000-importa"
+
+func dataImportTestWorkspace(t *testing.T) []byte {
+ t.Helper()
+ notebookArchiveTestWorkspace(t)
+ editor := conf.NewEditor()
+ editor.VirtualBlockRef = false
+ editor.GenerateHistoryInterval = 0
+ Conf.Editor.Store(editor)
+ Conf.FileTree.Store(conf.NewFileTree())
+ Conf.Search.Store(conf.NewSearch())
+ if err := EnableEncryptedNotebook("import-password"); err != nil {
+ t.Fatal(err)
+ }
+ kek, err := deriveKEK("import-password")
+ if err != nil {
+ t.Fatal(err)
+ }
+ notebookArchiveTestBox(t, dataImportTestID, kek)
+ return kek
+}
+
+func dataImportTestSnapshot(t *testing.T) string {
+ t.Helper()
+ root := t.TempDir()
+ if err := archiveWalk(util.DataDir, func(name, p string) error {
+ return copyDataImportFile(p, filepath.Join(root, filepath.FromSlash(name)))
+ }); err != nil {
+ t.Fatal(err)
+ }
+ return root
+}
+
+func dataImportTestZip(t *testing.T, root string) string {
+ t.Helper()
+ p := filepath.Join(t.TempDir(), "data.zip")
+ output, err := os.Create(p)
+ if err != nil {
+ t.Fatal(err)
+ }
+ writer := zip.NewWriter(output)
+ if err = archiveWalk(root, func(name, p string) error {
+ entry, createErr := writer.Create("data/" + name)
+ if createErr != nil {
+ return createErr
+ }
+ data, readErr := os.ReadFile(p)
+ if readErr != nil {
+ return readErr
+ }
+ _, writeErr := entry.Write(data)
+ return writeErr
+ }); err != nil {
+ t.Fatal(err)
+ }
+ if err = writer.Close(); err != nil {
+ t.Fatal(err)
+ }
+ if err = output.Close(); err != nil {
+ t.Fatal(err)
+ }
+ return p
+}
+
+func dataImportTestDocument(t *testing.T, root, id string, dek []byte, title string) []byte {
+ t.Helper()
+ name := id + ".sy"
+ aad, err := filesys.SyAAD(dataImportTestID, name)
+ if err != nil {
+ t.Fatal(err)
+ }
+ key := util.DeriveSubKey(dek, "siyuan/file")
+ defer zeroAndClear(key)
+ plain := []byte(`{"ID":"` + id + `","Spec":"2","Type":"NodeDocument","Properties":{"title":"` + title + `"}}`)
+ data, err := util.EncryptWithAAD(key, plain, []byte(aad))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err = os.WriteFile(filepath.Join(root, dataImportTestID, name), data, 0600); err != nil {
+ t.Fatal(err)
+ }
+ return data
+}
+
+func TestDataImportSkipPreservesNotebookAndKeyBackup(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ before, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ source := dataImportTestSnapshot(t)
+ if err = os.WriteFile(filepath.Join(source, dataImportTestID, dataImportTestID+".sy"), []byte("corrupt source is skipped"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ if err = os.WriteFile(filepath.Join(source, ".siyuan", "data-crypto-backup.json"), []byte(`{}`), 0600); err != nil {
+ t.Fatal(err)
+ }
+ if err = os.WriteFile(filepath.Join(source, ".siyuan", "master-password-migration.json"), []byte(`{}`), 0600); err != nil {
+ t.Fatal(err)
+ }
+ if err = os.WriteFile(filepath.Join(source, "ordinary.txt"), []byte("imported"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil || !reflect.DeepEqual(plan.Conflicts, []string{dataImportTestID}) {
+ t.Fatalf("prepare: %+v %v", plan, err)
+ }
+ skipped, err := CommitDataImport(plan.ID, "skip", "")
+ if err != nil || !reflect.DeepEqual(skipped, plan.Conflicts) {
+ t.Fatalf("skip: %v %v", skipped, err)
+ }
+ after, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ for name, expected := range before {
+ if after[name] != expected {
+ t.Fatalf("skip changed existing file %s", name)
+ }
+ }
+ if _, exists := after["ordinary.txt"]; !exists {
+ t.Fatal("ordinary data was not imported")
+ }
+ if _, err = os.Stat(masterPasswordMigrationPath()); !os.IsNotExist(err) {
+ t.Fatal("installed the incoming password migration")
+ }
+ if err = CancelDataImport(plan.ID); err == nil {
+ t.Fatal("cancel deleted committed recovery material")
+ }
+}
+
+func TestDataImportCanSkipEveryFile(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ before, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ skipped, err := CommitDataImport(plan.ID, "skip", "")
+ if err != nil || !reflect.DeepEqual(skipped, []string{dataImportTestID}) {
+ t.Fatalf("all-skipped import failed: %v %v", skipped, err)
+ }
+ after, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil || !reflect.DeepEqual(before, after) {
+ t.Fatalf("all-skipped import changed active data: %v", err)
+ }
+}
+
+func TestDataImportRestoresEncryptedNotebookInUnconfiguredWorkspace(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ if err := os.RemoveAll(filepath.Join(util.DataDir, dataImportTestID)); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Remove(dataCryptoBackupPath()); err != nil {
+ t.Fatal(err)
+ }
+ forgetRuntimeEncryptedBox(dataImportTestID)
+ Conf.NotebookCrypto = conf.NewNotebookCrypto()
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil || len(plan.Conflicts) != 0 || !reflect.DeepEqual(plan.Encrypted, []string{dataImportTestID}) {
+ t.Fatalf("unexpected new notebook plan: %+v %v", plan, err)
+ }
+ if _, err = CommitDataImport(plan.ID, "skip", "import-password"); err != nil {
+ t.Fatal(err)
+ }
+ if !NotebookCryptoEnabled() || IsBoxUnlocked(dataImportTestID) {
+ t.Fatal("restored notebook was not configured and locked")
+ }
+ current, err := deriveKEK("import-password")
+ zeroAndClear(current)
+ if err != nil {
+ t.Fatal(err)
+ }
+}
+
+func TestDataImportOverwritePreservesLocalFilesAndLocksNotebook(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ crypt, err := GetBoxEncryption(dataImportTestID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ dek, err := decryptWrappedDEK(dataImportTestID, crypt, kek)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer zeroAndClear(dek)
+ source := dataImportTestSnapshot(t)
+ imported := dataImportTestDocument(t, source, dataImportTestID, dek, "imported")
+ local := dataImportTestDocument(t, util.DataDir, "20261020180001-importb", dek, "local-only")
+ prepareUnlockedEncryptedBoxTest(t, dataImportTestID, dek)
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ skipped, err := CommitDataImport(plan.ID, "overwrite", "import-password")
+ if err != nil || len(skipped) != 0 {
+ t.Fatalf("overwrite: %v %v", skipped, err)
+ }
+ for name, expected := range map[string][]byte{dataImportTestID + ".sy": imported, "20261020180001-importb.sy": local} {
+ actual, readErr := os.ReadFile(filepath.Join(util.DataDir, dataImportTestID, name))
+ if readErr != nil || !bytes.Equal(actual, expected) {
+ t.Fatalf("unexpected document %s: %v", name, readErr)
+ }
+ }
+ if IsBoxUnlocked(dataImportTestID) || GetEncryptedBoxState(dataImportTestID) != EncryptedBoxStateLocked {
+ t.Fatal("overwrite retained an unlocked notebook")
+ }
+ if err = authenticateNotebookArchiveBox(filepath.Join(util.DataDir, dataImportTestID), dataImportTestID, dek, crypt); err != nil {
+ t.Fatalf("documents, legacy/current assets or attribute views failed authentication: %v", err)
+ }
+}
+
+func TestDataImportPreservesIncompleteRecoveryConfiguration(t *testing.T) {
+ for _, kind := range []string{"partial-config", "backup-only"} {
+ t.Run(kind, func(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ if err := os.RemoveAll(filepath.Join(util.DataDir, dataImportTestID)); err != nil {
+ t.Fatal(err)
+ }
+ forgetRuntimeEncryptedBox(dataImportTestID)
+ if kind == "backup-only" {
+ Conf.NotebookCrypto = conf.NewNotebookCrypto()
+ } else {
+ Conf.NotebookCrypto.Enabled = false
+ Conf.NotebookCrypto.Checksum = "incomplete"
+ }
+ before := currentNotebookCrypto()
+ files, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "overwrite", "import-password"); err == nil {
+ t.Fatal("replaced recovery material without authenticating the current configuration")
+ }
+ after, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil || !reflect.DeepEqual(files, after) || !reflect.DeepEqual(before, currentNotebookCrypto()) {
+ t.Fatalf("failed import changed recovery material: %v", err)
+ }
+ })
+ }
+}
+
+func TestDataImportRejectsUnsafeArchives(t *testing.T) {
+ for _, names := range [][]string{
+ {"data/../outside.txt"},
+ {"data/file.txt", "other/file.txt"},
+ {"data/file.txt", "data/file.txt"},
+ {"data/file.txt", "data/FILE.txt"},
+ {"data/link"},
+ {"data\\file.txt"},
+ } {
+ t.Run(strings.Join(names, "+"), func(t *testing.T) {
+ notebookArchiveTestWorkspace(t)
+ p := filepath.Join(t.TempDir(), "data.zip")
+ output, err := os.Create(p)
+ if err != nil {
+ t.Fatal(err)
+ }
+ writer := zip.NewWriter(output)
+ for _, name := range names {
+ header := &zip.FileHeader{Name: name}
+ if name == "data/link" {
+ header.SetMode(os.ModeSymlink | 0600)
+ }
+ entry, createErr := writer.CreateHeader(header)
+ if createErr != nil {
+ t.Fatal(createErr)
+ }
+ if _, err = entry.Write([]byte("unsafe")); err != nil {
+ t.Fatal(err)
+ }
+ }
+ if err = errors.Join(writer.Close(), output.Close()); err != nil {
+ t.Fatal(err)
+ }
+ if _, err = PrepareDataImport(p); err == nil {
+ t.Fatal("accepted an unsafe archive")
+ }
+ files, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil || len(files) != 0 {
+ t.Fatalf("invalid archive changed active data: %v", err)
+ }
+ })
+ }
+}
+
+func TestDataImportOldBackupKeepsCurrentPasswordAndHistoryKeys(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ history := filepath.Join(util.HistoryDir, "2026-10-20-180000-delete", dataImportTestID)
+ if err := archiveWalk(filepath.Join(util.DataDir, dataImportTestID), func(name, p string) error {
+ return copyDataImportFile(p, filepath.Join(history, filepath.FromSlash(name)))
+ }); err != nil {
+ t.Fatal(err)
+ }
+ if err := ChangeMasterPassword("import-password", "current-password"); err != nil {
+ t.Fatal(err)
+ }
+ before := currentNotebookCrypto()
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "overwrite", "current-password"); err != nil {
+ t.Fatal(err)
+ }
+ currentKEK, err := deriveKEK("current-password")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !verifyKEKAgainstEncryptedHistory(currentKEK, currentNotebookCrypto()) {
+ zeroAndClear(currentKEK)
+ t.Fatal("import orphaned the existing deleted notebook history")
+ }
+ zeroAndClear(currentKEK)
+ if !bytes.Equal(Conf.NotebookCrypto.KEKVerifier, before.KEKVerifier) ||
+ !reflect.DeepEqual(Conf.NotebookCrypto.HistoryKEKs, before.HistoryKEKs) {
+ t.Fatal("old backup replaced the current password or history keys")
+ }
+ derived, err := deriveKEK("current-password")
+ zeroAndClear(derived)
+ if err != nil {
+ t.Fatal(err)
+ }
+ derived, err = deriveKEK("import-password")
+ zeroAndClear(derived)
+ if err == nil {
+ t.Fatal("old password became active again")
+ }
+}
+
+func TestDataImportBlocksOtherWriteRequestsDuringCommit(t *testing.T) {
+ notebookArchiveTestWorkspace(t)
+ previousReadonly := util.ReadOnly
+ util.ReadOnly = false
+ t.Cleanup(func() { util.ReadOnly = previousReadonly })
+ engine := gin.New()
+ engine.Use(func(c *gin.Context) { c.Set(RoleContextKey, RoleAdministrator) })
+ called := make(chan struct{}, 1)
+ engine.POST("/api/test/write", CheckReadonly, func(c *gin.Context) {
+ called <- struct{}{}
+ c.Status(http.StatusNoContent)
+ })
+ dataImportAccess.Lock()
+ locked := true
+ defer func() {
+ if locked {
+ dataImportAccess.Unlock()
+ }
+ }()
+ done := make(chan struct{})
+ go func() {
+ engine.ServeHTTP(httptest.NewRecorder(), httptest.NewRequest(http.MethodPost, "/api/test/write", nil))
+ close(done)
+ }()
+ select {
+ case <-called:
+ t.Fatal("another write entered the import commit")
+ case <-time.After(30 * time.Millisecond):
+ }
+ dataImportAccess.Unlock()
+ locked = false
+ select {
+ case <-done:
+ case <-time.After(time.Second):
+ t.Fatal("write admission was not restored after import")
+ }
+ if len(called) != 1 {
+ t.Fatal("write handler was not invoked exactly once")
+ }
+}
+
+func TestDataImportAdoptsNewerCompatibleKeyConfiguration(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ previous := dataImportTestSnapshot(t)
+ old, err := json.Marshal(currentNotebookCrypto())
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err = ChangeMasterPassword("import-password", "new-device-password"); err != nil {
+ t.Fatal(err)
+ }
+ source := dataImportTestSnapshot(t)
+ if err = archiveWalk(previous, func(name, p string) error {
+ return copyDataImportFile(p, filepath.Join(util.DataDir, filepath.FromSlash(name)))
+ }); err != nil {
+ t.Fatal(err)
+ }
+ oldConf := &conf.NotebookCrypto{}
+ if err = json.Unmarshal(old, oldConf); err != nil {
+ t.Fatal(err)
+ }
+ Conf.NotebookCrypto = oldConf
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "overwrite", "new-device-password"); err != nil {
+ t.Fatal(err)
+ }
+ current, err := deriveKEK("new-device-password")
+ zeroAndClear(current)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(Conf.NotebookCrypto.HistoryKEKs) == 0 {
+ t.Fatal("lost the old key needed by local history")
+ }
+}
+
+func TestDataImportRejectsInvalidEncryptedContentBeforeOrdinaryWrites(t *testing.T) {
+ for _, kind := range []string{"password", "document", "asset", "attribute-view", "different-key", "normal-source"} {
+ t.Run(kind, func(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ password := "import-password"
+ switch kind {
+ case "password":
+ password = "wrong"
+ case "document":
+ if err := os.WriteFile(filepath.Join(source, dataImportTestID, dataImportTestID+".sy"), []byte("broken"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ case "asset":
+ if err := os.WriteFile(filepath.Join(source, dataImportTestID, "assets", "resource.bin"), []byte("broken"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ case "attribute-view":
+ if err := os.WriteFile(filepath.Join(source, dataImportTestID, "storage", "av", dataImportTestID+".json"), []byte("broken"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ case "different-key":
+ active := util.DataDir
+ util.DataDir = source
+ notebookArchiveTestBox(t, dataImportTestID, kek)
+ util.DataDir = active
+ case "normal-source":
+ p := filepath.Join(source, dataImportTestID, ".siyuan", "conf.json")
+ if err := writeDataImportJSON(p, conf.NewBoxConf()); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Remove(filepath.Join(filepath.Dir(p), notebookCryptoBackupFilename)); err != nil {
+ t.Fatal(err)
+ }
+ // 普通来源不含密文载荷;只保留同 ID 的普通配置来验证反向边界保护。
+ if err := os.Remove(filepath.Join(source, dataImportTestID, dataImportTestID+".sy")); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.RemoveAll(filepath.Join(source, dataImportTestID, "assets")); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.RemoveAll(filepath.Join(source, dataImportTestID, "storage")); err != nil {
+ t.Fatal(err)
+ }
+ }
+ if err := os.WriteFile(filepath.Join(source, "ordinary.txt"), []byte("must not install"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ before, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "overwrite", password); err == nil {
+ t.Fatal("accepted invalid encrypted data")
+ }
+ after, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil || !reflect.DeepEqual(before, after) {
+ t.Fatalf("failed preflight changed data: %v", err)
+ }
+ })
+ }
+}
+
+func TestDataImportCancelChangesAndExpiration(t *testing.T) {
+ notebookArchiveTestWorkspace(t)
+ source := t.TempDir()
+ if err := os.WriteFile(filepath.Join(source, "ordinary.txt"), []byte("source"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ directory, _ := dataImportDirectory(plan.ID)
+ if err = os.WriteFile(filepath.Join(directory, "incoming", "ordinary.txt"), []byte("changed"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "skip", ""); err == nil {
+ t.Fatal("accepted changed staging files")
+ }
+ if err = CancelDataImport(plan.ID); err != nil {
+ t.Fatal(err)
+ }
+ if _, err = os.Stat(directory); !os.IsNotExist(err) {
+ t.Fatal("cancel retained staging files")
+ }
+ plan, err = PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ directory, stage, err := loadDataImportStage(plan.ID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ stage.Created = time.Now().Add(-time.Hour).Unix()
+ if err = writeDataImportJSON(filepath.Join(directory, "stage.json"), stage); err != nil {
+ t.Fatal(err)
+ }
+ if _, err = CommitDataImport(plan.ID, "overwrite", ""); err == nil {
+ t.Fatal("accepted expired preflight")
+ }
+}
+
+func TestDataImportTransactionFailureAndRestartRecovery(t *testing.T) {
+ for _, crash := range []bool{false, true} {
+ t.Run(map[bool]string{false: "write failure", true: "interruption"}[crash], func(t *testing.T) {
+ notebookArchiveTestWorkspace(t)
+ directory, _ := dataImportDirectory("20261020180002-importc")
+ install := filepath.Join(directory, "install")
+ for name, content := range map[string]string{"a.txt": "new", "new/b.txt": "new"} {
+ if err := writeDataImportBytes(filepath.Join(install, filepath.FromSlash(name)), []byte(content)); err != nil {
+ t.Fatal(err)
+ }
+ }
+ if err := os.WriteFile(filepath.Join(util.DataDir, "a.txt"), []byte("old"), 0600); err != nil {
+ t.Fatal(err)
+ }
+ before, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ writes := 0
+ crashed := errors.New("simulated process interruption")
+ operation := func() {
+ defer func() {
+ if recovered := recover(); recovered != nil && recovered != crashed {
+ panic(recovered)
+ }
+ }()
+ err = applyDataImport(directory, install, func(source, target string) error {
+ writes++
+ if writes == 2 {
+ if crash {
+ panic(crashed)
+ }
+ return errors.New("disk full")
+ }
+ return copyDataImportFile(source, target)
+ })
+ }
+ operation()
+ if !crash && err == nil {
+ t.Fatal("write failure was ignored")
+ }
+ if err = recoverDataImports(); err != nil {
+ t.Fatal(err)
+ }
+ after, err := archiveDirectoryFiles(util.DataDir)
+ if err != nil || !reflect.DeepEqual(before, after) {
+ t.Fatalf("rollback did not restore original bytes: %v", err)
+ }
+ })
+ }
+}
+
+func TestDataImportWaitsForActiveEncryptedReads(t *testing.T) {
+ kek := dataImportTestWorkspace(t)
+ defer zeroAndClear(kek)
+ source := dataImportTestSnapshot(t)
+ crypt, _ := GetBoxEncryption(dataImportTestID)
+ dek, err := decryptWrappedDEK(dataImportTestID, crypt, kek)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer zeroAndClear(dek)
+ prepareUnlockedEncryptedBoxTest(t, dataImportTestID, dek)
+ plan, err := PrepareDataImport(dataImportTestZip(t, source))
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err = AcquireEncryptedBoxOperation(dataImportTestID); err != nil {
+ t.Fatal(err)
+ }
+ done := make(chan error, 1)
+ go func() {
+ _, commitErr := CommitDataImport(plan.ID, "overwrite", "import-password")
+ done <- commitErr
+ }()
+ deadline := time.Now().Add(10 * time.Second)
+ for GetEncryptedBoxState(dataImportTestID) != EncryptedBoxStateLocking && time.Now().Before(deadline) {
+ time.Sleep(time.Millisecond)
+ }
+ if state := GetEncryptedBoxState(dataImportTestID); state != EncryptedBoxStateLocking {
+ ReleaseEncryptedBoxOperation(dataImportTestID)
+ t.Fatalf("did not enter locking state: %s", state)
+ }
+ select {
+ case err = <-done:
+ ReleaseEncryptedBoxOperation(dataImportTestID)
+ t.Fatalf("import finished while an encrypted response was active: %v", err)
+ default:
+ }
+ ReleaseEncryptedBoxOperation(dataImportTestID)
+ select {
+ case err = <-done:
+ if err != nil {
+ t.Fatal(err)
+ }
+ case <-time.After(10 * time.Second):
+ t.Fatal("import did not finish after read release")
+ }
+}
diff --git a/kernel/model/import_data_transaction.go b/kernel/model/import_data_transaction.go
new file mode 100644
index 0000000000..17733ef66a
--- /dev/null
+++ b/kernel/model/import_data_transaction.go
@@ -0,0 +1,264 @@
+// SiYuan - From thought to insight, with agents
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package model
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "os"
+ "path/filepath"
+ "slices"
+ "sort"
+ "strings"
+
+ "github.com/88250/lute/ast"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+type dataImportFile struct {
+ Path string `json:"path"`
+ Exists bool `json:"exists"`
+ Before notebookArchiveFile `json:"before"`
+ After notebookArchiveFile `json:"after"`
+}
+
+type dataImportOperation struct {
+ Version int `json:"version"`
+ State string `json:"state"`
+ Files []dataImportFile `json:"files"`
+ Dirs []string `json:"dirs"`
+}
+
+func dataImportFingerprint(p string) (notebookArchiveFile, error) {
+ file, err := os.Open(p)
+ if err != nil {
+ return notebookArchiveFile{}, err
+ }
+ defer file.Close()
+ return archiveFingerprint(file)
+}
+
+// copyDataImportFile 流式写入同目录临时文件,刷盘后替换,不把大资源整体载入内存。
+func copyDataImportFile(source, target string) (err error) {
+ if err = os.MkdirAll(filepath.Dir(target), 0700); err != nil {
+ return
+ }
+ input, err := os.Open(source)
+ if err != nil {
+ return
+ }
+ defer input.Close()
+ output, err := os.CreateTemp(filepath.Dir(target), ".data-import-*.tmp")
+ if err != nil {
+ return
+ }
+ defer func() {
+ output.Close()
+ os.Remove(output.Name())
+ }()
+ if _, err = io.Copy(output, input); err != nil {
+ return
+ }
+ if err = output.Sync(); err != nil {
+ return
+ }
+ if err = output.Close(); err != nil {
+ return
+ }
+ return os.Rename(output.Name(), target)
+}
+
+func dataImportTarget(name string) (string, error) {
+ if !archiveRelativePath(name) || strings.ToLower(name) == ".siyuan/master-password-migration.json" {
+ return "", errors.New(Conf.Language(422))
+ }
+ target := filepath.Join(util.DataDir, filepath.FromSlash(name))
+ if err := validateEncryptedCleanupPath(util.DataDir, target); err != nil {
+ return "", err
+ }
+ if info, err := os.Lstat(target); err == nil && !info.Mode().IsRegular() {
+ return "", errors.New(Conf.Language(422))
+ } else if err != nil && !os.IsNotExist(err) {
+ return "", err
+ }
+ return target, nil
+}
+
+// applyDataImport 先备份全部待覆盖文件,再登记提交日志;任何写入失败都补偿已安装的路径。
+func applyDataImport(directory, install string, write func(string, string) error) error {
+ files, err := archiveDirectoryFiles(install)
+ if err != nil {
+ return err
+ }
+ operation := &dataImportOperation{Version: 1, State: "committing", Files: []dataImportFile{}, Dirs: []string{}}
+ names := make([]string, 0, len(files))
+ for name := range files {
+ names = append(names, name)
+ }
+ sort.Strings(names)
+ dirs := map[string]bool{}
+ for _, name := range names {
+ target, targetErr := dataImportTarget(name)
+ if targetErr != nil {
+ return targetErr
+ }
+ entry := dataImportFile{Path: name, After: files[name]}
+ entry.Before, err = dataImportFingerprint(target)
+ if err == nil {
+ entry.Exists = true
+ if entry.Before == entry.After {
+ continue
+ }
+ backup := filepath.Join(directory, "rollback", filepath.FromSlash(name))
+ if err = copyDataImportFile(target, backup); err != nil {
+ return err
+ }
+ if actual, readErr := dataImportFingerprint(backup); readErr != nil || actual != entry.Before {
+ return errors.New(Conf.Language(422))
+ }
+ } else if !os.IsNotExist(err) {
+ return err
+ }
+ for parent := filepath.Dir(name); parent != "."; parent = filepath.Dir(parent) {
+ if _, statErr := os.Lstat(filepath.Join(util.DataDir, parent)); os.IsNotExist(statErr) {
+ dirs[filepath.ToSlash(parent)] = true
+ } else if statErr != nil {
+ return statErr
+ }
+ }
+ operation.Files = append(operation.Files, entry)
+ }
+ for directory := range dirs {
+ operation.Dirs = append(operation.Dirs, directory)
+ }
+ sort.Strings(operation.Dirs)
+ if err = writeDataImportJSON(filepath.Join(directory, "operation.json"), operation); err != nil {
+ return err
+ }
+ for _, entry := range operation.Files {
+ target, targetErr := dataImportTarget(entry.Path)
+ if targetErr == nil {
+ actual, readErr := dataImportFingerprint(target)
+ if entry.Exists && (readErr != nil || actual != entry.Before) || !entry.Exists && !os.IsNotExist(readErr) {
+ targetErr = errors.New(Conf.Language(422))
+ }
+ }
+ if targetErr == nil {
+ targetErr = write(filepath.Join(install, filepath.FromSlash(entry.Path)), target)
+ }
+ if targetErr != nil {
+ return errors.Join(targetErr, rollbackDataImport(directory, operation))
+ }
+ }
+ operation.State = "committed"
+ if err = writeDataImportJSON(filepath.Join(directory, "operation.json"), operation); err != nil {
+ operation.State = "committing"
+ return errors.Join(err, rollbackDataImport(directory, operation))
+ }
+ return nil
+}
+
+func rollbackDataImport(directory string, operation *dataImportOperation) error {
+ for _, entry := range slices.Backward(operation.Files) {
+ target, err := dataImportTarget(entry.Path)
+ if err != nil {
+ return err
+ }
+ actual, readErr := dataImportFingerprint(target)
+ if entry.Exists && readErr == nil && actual == entry.Before || !entry.Exists && os.IsNotExist(readErr) {
+ continue
+ }
+ if readErr != nil && !os.IsNotExist(readErr) || readErr == nil && actual != entry.After {
+ return errors.New(Conf.Language(424))
+ }
+ if entry.Exists {
+ backup := filepath.Join(directory, "rollback", filepath.FromSlash(entry.Path))
+ if original, backupErr := dataImportFingerprint(backup); backupErr != nil || original != entry.Before {
+ return errors.New(Conf.Language(424))
+ }
+ if err = copyDataImportFile(backup, target); err != nil {
+ return err
+ }
+ } else if err = os.Remove(target); err != nil && !os.IsNotExist(err) {
+ return err
+ }
+ }
+ for _, name := range slices.Backward(operation.Dirs) {
+ if !archiveRelativePath(name) {
+ return errors.New(Conf.Language(424))
+ }
+ target := filepath.Join(util.DataDir, filepath.FromSlash(name))
+ if err := validateEncryptedCleanupPath(util.DataDir, target); err != nil {
+ return err
+ }
+ // 仅移除本次创建的空目录,不递归删除后来出现的文件。
+ if entries, err := os.ReadDir(target); err == nil && len(entries) == 0 {
+ if err = os.Remove(target); err != nil {
+ return err
+ }
+ } else if err != nil && !os.IsNotExist(err) {
+ return err
+ }
+ }
+ operation.State = "rolledback"
+ return writeDataImportJSON(filepath.Join(directory, "operation.json"), operation)
+}
+
+// recoverDataImports 在挂载和同步前补偿未完成的批次,成功批次的原件和恢复材料继续保留。
+func recoverDataImports() error {
+ entries, err := os.ReadDir(dataImportBase())
+ if os.IsNotExist(err) {
+ return nil
+ }
+ if err != nil {
+ return err
+ }
+ for _, entry := range entries {
+ if !entry.IsDir() || !ast.IsNodeIDPattern(entry.Name()) {
+ return errors.New(Conf.Language(424))
+ }
+ directory, pathErr := dataImportDirectory(entry.Name())
+ if pathErr != nil {
+ return pathErr
+ }
+ data, readErr := os.ReadFile(filepath.Join(directory, "operation.json"))
+ if os.IsNotExist(readErr) {
+ continue
+ }
+ operation := &dataImportOperation{}
+ if readErr != nil || json.Unmarshal(data, operation) != nil || operation.Version != 1 ||
+ !slices.Contains([]string{"committing", "committed", "rolledback"}, operation.State) {
+ return errors.New(Conf.Language(424))
+ }
+ seen := map[string]bool{}
+ for _, file := range operation.Files {
+ if !archiveRelativePath(file.Path) || seen[strings.ToLower(file.Path)] || len(file.After.SHA256) != 64 ||
+ file.Exists && len(file.Before.SHA256) != 64 {
+ return errors.New(Conf.Language(424))
+ }
+ seen[strings.ToLower(file.Path)] = true
+ }
+ if operation.State == "committing" {
+ if err = rollbackDataImport(directory, operation); err != nil {
+ return fmt.Errorf("%s: %w", Conf.Language(424), err)
+ }
+ }
+ }
+ return nil
+}
diff --git a/kernel/model/session.go b/kernel/model/session.go
index 4d3925a6e2..284df2b006 100644
--- a/kernel/model/session.go
+++ b/kernel/model/session.go
@@ -194,6 +194,12 @@ func CheckReadonly(c *gin.Context) {
c.Abort()
return
}
+ // 导入提交期间暂停其他写接口,避免已确认的磁盘快照被并发请求修改。
+ if c.Request.URL.Path != "/api/import/commitDataImport" {
+ dataImportAccess.RLock()
+ defer dataImportAccess.RUnlock()
+ c.Next()
+ }
}
func CheckAuth(c *gin.Context) {