diff --git a/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue b/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue index b57d6a9fd5..bf9d672148 100644 --- a/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue +++ b/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue @@ -1,6 +1,7 @@ @@ -290,7 +341,7 @@ function confirmSelection() {
- + {{ t("settings.syncSelectionConnections") }} {{ selection.connections?.length ?? 0 }}/{{ catalog.connections.length }} @@ -311,7 +362,7 @@ function confirmSelection() {
- + {{ t("settings.syncSelectionTunnels") }} {{ selection.tunnelProfiles?.length ?? 0 }}/{{ catalog.tunnelProfiles.length }} @@ -365,10 +416,13 @@ function confirmSelection() {
- + {{ t("settings.syncSelectionEncrypted") }}
+
+
+
+
+

{{ t("settings.localBackupPathLabel") }}

+

+ {{ localExportPath || t("settings.localBackupPathUnset") }} +

+
+ +
+ +
+ diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index 6241613ea5..72f66daa24 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -24,6 +24,7 @@ import { Filter, Globe, GripVertical, + HardDrive, Loader2, Moon, PackageSearch, @@ -152,6 +153,9 @@ import { getAppSupportInfo, checkBackgroundImage, cloudSyncLocalCatalog, + localBackupExport, + localBackupImport, + localBackupInspect, clearBackgroundImage, saveBackgroundImage, loadMaxAgentTurns, @@ -4277,7 +4281,14 @@ const webdavAutoUploadIntervalMinutes = ref(Number(localStorage.getItem("dbx-web const webdavBusy = ref<"" | "test" | "upload" | "download">(""); const webdavMessage = ref(""); const webdavError = ref(false); -const syncMethodTab = ref<"webdav" | "snippet">("webdav"); +const localBackupSecretsPassphrase = ref(""); +const localBackupBusy = ref<"" | "export" | "import">(""); +const localBackupMessage = ref(""); +const localBackupError = ref(false); +const localBackupPath = ref(""); +const localBackupDirectoryStorageKey = "dbx-local-backup-directory"; +const localBackupDirectory = ref(localStorage.getItem(localBackupDirectoryStorageKey) || ""); +const syncMethodTab = ref<"webdav" | "snippet" | "local">("webdav"); const syncSelectionOpen = ref(false); const syncSelectionMode = ref<"upload" | "restore">("upload"); const syncSelectionCatalog = ref(null); @@ -4303,6 +4314,7 @@ const pendingLegacyCleanupId = ref(""); const snippetSyncSettingsLoading = ref(true); const webdavReady = computed(() => !!webdavEndpoint.value.trim() && !webdavBusy.value); +const localBackupCanIncludeSecrets = computed(() => !!localBackupSecretsPassphrase.value.trim()); const snippetReady = computed(() => !snippetSyncSettingsLoading.value && !snippetBusy.value && (snippetProvider.value !== "gitlab" || (!snippetInstanceError.value && snippetInstanceUrl.value === activeSnippetInstanceUrl.value)) && (!!snippetToken.value.trim() || snippetHasSavedToken.value)); const snippetUploadReady = computed(() => snippetReady.value && !!snippetPassphrase.value.trim()); // Legacy plaintext snippets have no outer encryption password. Let the @@ -4622,7 +4634,117 @@ async function downloadWebDavSnapshot() { }); } +async function runLocalBackupAction(kind: "export" | "import", action: () => Promise) { + localBackupBusy.value = kind; + localBackupMessage.value = ""; + localBackupError.value = false; + try { + localBackupMessage.value = await action(); + } catch (error: any) { + localBackupMessage.value = error?.message || String(error); + localBackupError.value = true; + } finally { + localBackupBusy.value = ""; + } +} + +function localBackupFileName() { + const now = new Date(); + const twoDigits = (value: number) => String(value).padStart(2, "0"); + const timestamp = `${now.getFullYear()}-${twoDigits(now.getMonth() + 1)}-${twoDigits(now.getDate())}_${twoDigits(now.getHours())}-${twoDigits(now.getMinutes())}-${twoDigits(now.getSeconds())}-${String(now.getMilliseconds()).padStart(3, "0")}`; + return `dbx-backup_${timestamp}.dbxbackup`; +} + +async function localBackupPathInDirectory(directory: string) { + const { join } = await import("@tauri-apps/api/path"); + return join(directory, localBackupFileName()); +} + +async function chooseLocalBackupExport() { + await runLocalBackupAction("export", async () => { + localBackupPath.value = localBackupDirectory.value ? await localBackupPathInDirectory(localBackupDirectory.value) : ""; + syncSelectionCatalog.value = await cloudSyncLocalCatalog(settingsStore.editorSettings); + syncSelectionMode.value = "upload"; + syncSelectionOpen.value = true; + return ""; + }); +} + +async function chooseLocalBackupPath() { + await runLocalBackupAction("export", async () => { + const { save } = await import("@tauri-apps/plugin-dialog"); + const path = await save({ + title: t("settings.localBackupExportTitle"), + defaultPath: localBackupPath.value || localBackupFileName(), + filters: [{ name: t("settings.localBackupFileType"), extensions: ["dbxbackup", "zip"] }], + }); + if (path) { + const { dirname } = await import("@tauri-apps/api/path"); + localBackupPath.value = path; + localBackupDirectory.value = await dirname(path); + localStorage.setItem(localBackupDirectoryStorageKey, localBackupDirectory.value); + } + return ""; + }); +} + +async function chooseLocalBackupImport() { + await runLocalBackupAction("import", async () => { + const { open } = await import("@tauri-apps/plugin-dialog"); + const selected = await open({ + title: t("settings.localBackupImportTitle"), + multiple: false, + filters: [{ name: t("settings.localBackupFileType"), extensions: ["dbxbackup", "zip"] }], + }); + if (typeof selected !== "string" || !selected) return ""; + localBackupPath.value = selected; + const catalog = await localBackupInspect(selected, localBackupSecretsPassphrase.value || undefined); + if (!localBackupCanIncludeSecrets.value && catalog.hasEncryptedSecrets) { + catalog.selection = { + ...(catalog.selection ?? {}), + connectionSecrets: [], + tunnelSecrets: [], + aiConfigs: [], + pluginUiStorage: [], + includeSecrets: false, + syncCredentials: false, + }; + } + syncSelectionCatalog.value = catalog; + syncSelectionMode.value = "restore"; + syncSelectionOpen.value = true; + return ""; + }); +} + async function confirmSyncSelection(selection: SyncSelection) { + if (syncMethodTab.value === "local") { + await nextTick(); + await runLocalBackupAction(syncSelectionMode.value === "upload" ? "export" : "import", async () => { + if (selection.includeSecrets && !localBackupCanIncludeSecrets.value) { + throw new Error(t("settings.localBackupPassphraseRequired")); + } + if (syncSelectionMode.value === "upload") { + if (!localBackupPath.value) throw new Error(t("settings.localBackupPathRequired")); + const summary = await localBackupExport(localBackupPath.value, settingsStore.editorSettings, selection.includeSecrets ? localBackupSecretsPassphrase.value : undefined, selection); + return t("settings.localBackupExportSuccess", { bytes: summary.bytes, path: localBackupPath.value }); + } + + const result = await localBackupImport(localBackupPath.value, selection.includeSecrets ? localBackupSecretsPassphrase.value : undefined, selection.includeSecrets, selection); + if (result.editorSettings && typeof result.editorSettings === "object") settingsStore.updateEditorSettings(result.editorSettings as any); + await settingsStore.updateDesktopSettings(result.desktopSettings); + await connectionStore.initFromDisk(); + await savedSqlStore.initFromStorage(); + await tunnelProfileStore.refresh(); + await settingsStore.reloadAiConfigs(); + let message = t("settings.localBackupImportSuccess", { path: localBackupPath.value }); + if (result.applySummary.encryptedSecretsPresent && !result.applySummary.secretsApplied) message += ` ${t("settings.syncSecretsSkipped")}`; + if (result.applySummary.secretsApplied) message += ` ${t("settings.syncSecretsApplied")}`; + return message; + }); + return; + } + if (syncMethodTab.value === "snippet") { if (syncSelectionMode.value === "upload") { snippetIncludeSecrets.value = selection.includeSecrets; @@ -9139,9 +9261,10 @@ LIMIT 100; - + WebDAV {{ t("settings.syncSnippetTitle") }} + {{ t("settings.localBackupTitle") }} @@ -9368,9 +9491,46 @@ LIMIT 100; + + +
+
+ + {{ t("settings.localBackupTitle") }} +
+

+ {{ t("settings.localBackupDescription") }} +

+
+ +
+
+ + +

+ {{ t("settings.localBackupPassphraseDescription") }} +

+
+
+ {{ localBackupMessage }} +
+
+ + +
+
+
-
+
@@ -9405,7 +9565,17 @@ LIMIT 100;
- + diff --git a/apps/desktop/src/i18n/__tests__/featureMessages.spec.ts b/apps/desktop/src/i18n/__tests__/featureMessages.spec.ts index 3773bbba93..b20ccbb8eb 100644 --- a/apps/desktop/src/i18n/__tests__/featureMessages.spec.ts +++ b/apps/desktop/src/i18n/__tests__/featureMessages.spec.ts @@ -75,6 +75,7 @@ const FEATURE_MESSAGES: FeatureMessages[] = [ { feature: "sidebar search skip hint", keys: ["sidebar.searchConnectionSkipped"] }, { feature: "PostgreSQL legacy TLS", keys: ["connection.postgresLegacyTls", "connection.postgresLegacyTlsHint"] }, { feature: "settings search sections", keys: ["settings.syncWebDavWebDescription", "settings.performanceSection"] }, + { feature: "local backup selection", keys: ["settings.localBackupSecretsPassphraseRequiredHint", "settings.localBackupPathLabel", "settings.localBackupPathUnset", "settings.localBackupChoosePath", "settings.localBackupPathRequired"], translated: true }, { feature: "SQL table completion schema qualification (#9219)", keys: ["settings.tableCompletionSchemaQualification*"], translated: true }, { feature: "Redis batch expiration", keys: under("redis", ["batchExpiry", "batchExpiryTitle", "batchExpirySelected", "batchExpiryApply", "batchExpirySuccess", "batchExpiryPartial"]) }, { diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts index 15aba9569b..2d241807e4 100644 --- a/apps/desktop/src/i18n/locales/az.ts +++ b/apps/desktop/src/i18n/locales/az.ts @@ -7622,6 +7622,22 @@ export default withEnglishFallback({ syncSecretsDescription: "Aktiv olduqda DBX verilənlər bazası parollarını, SSH parollarını, proksi parollarını, HTTP tunel tokenlərini və AI API açarlarını uzaq yaddaşa yükləməzdən əvvəl şifrələyir.", syncSecretsSharedDescription: "WebDAV üçün bu parol daxil edilmiş giriş məlumatlarını şifrələyir. GitHub Gist və Gitee kod parçaları müstəqil şifrələmə və giriş məlumatları idarəetməsindən istifadə edir.", syncSecretsPassphrase: "Sinxronlaşdırma parolu", + localBackupTitle: "Yerli ehtiyat nüsxə", + localBackupDescription: "Qoşulmaları, yadda saxlanmış SQL sorğularını və seçilmiş parametrləri DBX ehtiyat faylına ixrac edin, sonra ona baxıb seçilmiş məlumatları bərpa edin.", + localBackupImport: "Ehtiyat nüsxəni idxal et", + localBackupExport: "Ehtiyat nüsxəni ixrac et", + localBackupImportTitle: "DBX yerli ehtiyat nüsxəsini seçin", + localBackupExportTitle: "Yerli ehtiyat nüsxənin saxlanacağı yeri seçin", + localBackupFileType: "DBX yerli ehtiyat nüsxəsi", + localBackupPassphraseDescription: "Həssas məlumatlar bu parolla şifrələnir. Həssas məlumatları ixrac və ya bərpa etmək üçün parolu daxil edin; belə məlumatlar daxil edilmirsə, boş saxlaya bilərsiniz. Parol yadda saxlanmır.", + localBackupPassphraseRequired: "Həssas məlumatların ehtiyat nüsxə parolunu daxil edin və ya həssas məlumat seçimini ləğv edin.", + localBackupExportSuccess: "{bytes} bayt {path} ünvanına ixrac edildi.", + localBackupImportSuccess: "Seçilmiş məzmun {path} ünvanından bərpa edildi.", + localBackupPathLabel: "Yerli ehtiyat nüsxə faylının yolu", + localBackupPathUnset: "Saxlama yeri seçilməyib", + localBackupChoosePath: "Yol seçin", + localBackupPathRequired: "Əvvəlcə ehtiyat nüsxə faylının saxlanacağı yeri seçin.", + localBackupSecretsPassphraseRequiredHint: "Şifrələnmiş həssas məlumatları seçməzdən əvvəl sinxronlaşdırma parolunu daxil edin.", syncSecretsPassphraseDescription: "Bu parol yalnız həssas verilənləri şifrələmək və bərpa etmək üçün istifadə olunur. Cari DBX instansiyasında şifrələnir; digər instansiyalarda onu yenidən daxil edin.", syncTest: "Yoxla", syncUpload: "Yüklə", diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 9d370ea2ce..669c3cc951 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -8405,6 +8405,22 @@ export default { sqlShortcutsSelectLimitHint: "At run time, SQL is generated for the active connection dialect.", syncWebDavTitle: "WebDAV Sync", syncWebDavDescription: "Upload or restore a DBX snapshot, including saved SQL library entries, from a WebDAV-compatible storage service.", + localBackupTitle: "Local Backup", + localBackupDescription: "Export connections, saved SQL, and selected settings to a DBX backup file, then preview and selectively restore it.", + localBackupImport: "Import backup", + localBackupExport: "Export backup", + localBackupImportTitle: "Select a DBX local backup", + localBackupExportTitle: "Choose where to save the local backup", + localBackupFileType: "DBX local backup", + localBackupPathLabel: "Backup file path", + localBackupPathUnset: "No save location selected", + localBackupChoosePath: "Choose path", + localBackupPathRequired: "Choose a save location for the backup file first.", + localBackupPassphraseDescription: "Sensitive information is encrypted with this password. Enter it to export or restore sensitive information; leave it empty to exclude or skip it. The password is not saved.", + localBackupPassphraseRequired: "Enter the backup password or deselect sensitive information.", + localBackupSecretsPassphraseRequiredHint: "Enter the data sync password before selecting encrypted sensitive information.", + localBackupExportSuccess: "Exported {bytes} bytes to {path}.", + localBackupImportSuccess: "Restored selected content from {path}.", syncSelectionUploadTitle: "Select backup content", syncSelectionRestoreTitle: "Select restore content", syncSelectionBackupNote: "Sensitive credentials and plugin data are stored only in encrypted snapshots.", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index d4ab4e617e..fe2057300b 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -7697,6 +7697,22 @@ export default withEnglishFallback({ syncSecrets: "Sincronizar secretos cifrados", syncSecretsDescription: "Al activarlo, DBX cifra contraseñas de base de datos, contraseñas SSH y API keys de IA antes de subirlas a WebDAV.", syncSecretsPassphrase: "Contraseña de sync", + localBackupTitle: "Copia de seguridad local", + localBackupDescription: "Exporta conexiones, consultas SQL guardadas y ajustes seleccionados a un archivo de copia de seguridad de DBX; después, previsualízalo y restaura solo lo que necesites.", + localBackupImport: "Importar copia de seguridad", + localBackupExport: "Exportar copia de seguridad", + localBackupImportTitle: "Selecciona una copia de seguridad local de DBX", + localBackupExportTitle: "Elige dónde guardar la copia de seguridad local", + localBackupFileType: "Copia de seguridad local de DBX", + localBackupPassphraseDescription: "La información confidencial se cifra con esta contraseña. Introdúcela para exportar o restaurar información confidencial; déjala vacía para excluirla u omitirla. La contraseña no se guarda.", + localBackupPassphraseRequired: "Introduce la contraseña de copia de seguridad o desmarca la información confidencial.", + localBackupExportSuccess: "Se exportaron {bytes} bytes a {path}.", + localBackupImportSuccess: "Se restauró el contenido seleccionado desde {path}.", + localBackupPathLabel: "Ruta del archivo de copia de seguridad", + localBackupPathUnset: "No se ha elegido una ubicación para guardar", + localBackupChoosePath: "Elegir ubicación", + localBackupPathRequired: "Selecciona primero dónde guardar el archivo de copia de seguridad.", + localBackupSecretsPassphraseRequiredHint: "Introduce la contraseña de sincronización antes de seleccionar la información confidencial cifrada.", syncSecretsPassphraseDescription: "Esta contraseña solo se usa para cifrar y restaurar datos sensibles. Se cifra en la instancia DBX actual; vuelve a ingresarla en otras instancias.", syncTest: "Probar", syncUpload: "Subir", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index bf39775f98..cec9b86e6b 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -7621,6 +7621,22 @@ export default withEnglishFallback({ syncSecrets: "Sincronizza i segreti crittografati", syncSecretsDescription: "Se abilitato, DBX crittografa le password del database, le password SSH e le chiavi API AI prima di caricarle su WebDAV.", syncSecretsPassphrase: "Password di sincronizzazione", + localBackupTitle: "Backup locale", + localBackupDescription: "Esporta connessioni, SQL salvati e impostazioni selezionate in un file di backup DBX; poi visualizzalo in anteprima e ripristina solo ciò che serve.", + localBackupImport: "Importa backup", + localBackupExport: "Esporta backup", + localBackupImportTitle: "Seleziona un backup locale DBX", + localBackupExportTitle: "Scegli dove salvare il backup locale", + localBackupFileType: "Backup locale DBX", + localBackupPassphraseDescription: "Le informazioni sensibili vengono cifrate con questa password. Inseriscila per esportare o ripristinare informazioni sensibili; lasciala vuota per escluderle o ignorarle. La password non viene salvata.", + localBackupPassphraseRequired: "Inserisci la password di backup oppure deseleziona le informazioni sensibili.", + localBackupExportSuccess: "{bytes} byte esportati in {path}.", + localBackupImportSuccess: "Contenuto selezionato ripristinato da {path}.", + localBackupPathLabel: "Percorso del file di backup", + localBackupPathUnset: "Nessuna posizione di salvataggio selezionata", + localBackupChoosePath: "Scegli percorso", + localBackupPathRequired: "Scegli prima dove salvare il file di backup.", + localBackupSecretsPassphraseRequiredHint: "Inserisci la password di sincronizzazione prima di selezionare le informazioni sensibili crittografate.", syncSecretsPassphraseDescription: "Questa password viene utilizzata solo per crittografare e ripristinare i dati sensibili. È crittografata nell'istanza DBX corrente; inseriscila di nuovo nelle altre istanze.", syncTest: "Verifica", syncUpload: "Carica", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 4557e00eee..2c04c69878 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -7638,6 +7638,22 @@ export default withEnglishFallback({ syncSecrets: "暗号化されたシークレットを同期", syncSecretsDescription: "有効時、DBXはデータベースパスワード、SSHパスワード、AI APIキーを暗号化してからWebDAVにアップロードします。", syncSecretsPassphrase: "同期パスワード", + localBackupTitle: "ローカルバックアップ", + localBackupDescription: "接続情報、保存済み SQL、選択した設定を DBX バックアップファイルにエクスポートし、内容を確認して選択的に復元できます。", + localBackupImport: "バックアップをインポート", + localBackupExport: "バックアップをエクスポート", + localBackupImportTitle: "DBX ローカルバックアップを選択", + localBackupExportTitle: "ローカルバックアップの保存先を選択", + localBackupFileType: "DBX ローカルバックアップ", + localBackupPassphraseDescription: "機密情報はこのパスワードで暗号化されます。機密情報をエクスポートまたは復元するには入力してください。含めない場合は空欄にしてください。パスワードは保存されません。", + localBackupPassphraseRequired: "機密情報のバックアップパスワードを入力するか、機密情報の選択を解除してください。", + localBackupExportSuccess: "{bytes} バイトを {path} にエクスポートしました。", + localBackupImportSuccess: "{path} から選択した内容を復元しました。", + localBackupPathLabel: "バックアップファイルの保存先", + localBackupPathUnset: "保存先が選択されていません", + localBackupChoosePath: "保存先を選択", + localBackupPathRequired: "先にバックアップファイルの保存先を選択してください。", + localBackupSecretsPassphraseRequiredHint: "暗号化する機密情報を選択する前に、同期パスワードを入力してください。", syncSecretsPassphraseDescription: "このパスワードは機密データの暗号化と復元にのみ使用され、現在のDBXインスタンスに暗号化して保存されます。他のインスタンスでは再入力してください。", syncTest: "テスト", syncUpload: "アップロード", diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts index fc286d81c3..1235cad44c 100644 --- a/apps/desktop/src/i18n/locales/ko.ts +++ b/apps/desktop/src/i18n/locales/ko.ts @@ -7389,6 +7389,22 @@ export default withEnglishFallback({ syncSecretsDescription: "활성화하면 DBX가 데이터베이스 비밀번호, SSH 비밀번호, 프록시 비밀번호, HTTP 터널 토큰 및 AI API 키를 암호화하여 원격 저장소에 업로드합니다.", syncSecretsSharedDescription: "WebDAV에서는 이 비밀번호로 포함할 자격 증명을 암호화합니다. GitHub Gist 및 Gitee 스니펫은 별도의 암호화 및 자격 증명 설정을 사용합니다.", syncSecretsPassphrase: "동기화 비밀번호", + localBackupTitle: "로컬 백업", + localBackupDescription: "연결 정보, 저장된 SQL 및 선택한 설정을 DBX 백업 파일로 내보낸 다음 미리 보고 선택적으로 복원합니다.", + localBackupImport: "백업 가져오기", + localBackupExport: "백업 내보내기", + localBackupImportTitle: "DBX 로컬 백업 선택", + localBackupExportTitle: "로컬 백업 저장 위치 선택", + localBackupFileType: "DBX 로컬 백업", + localBackupPassphraseDescription: "민감한 정보는 이 비밀번호로 암호화됩니다. 민감한 정보를 내보내거나 복원하려면 입력하세요. 포함하지 않으려면 비워 두세요. 비밀번호는 저장되지 않습니다.", + localBackupPassphraseRequired: "민감한 정보 백업 비밀번호를 입력하거나 민감한 정보 선택을 해제하세요.", + localBackupExportSuccess: "{bytes}바이트를 {path}에 내보냈습니다.", + localBackupImportSuccess: "{path}에서 선택한 내용을 복원했습니다.", + localBackupPathLabel: "백업 파일 저장 경로", + localBackupPathUnset: "저장 위치를 선택하지 않았습니다", + localBackupChoosePath: "경로 선택", + localBackupPathRequired: "먼저 백업 파일을 저장할 위치를 선택하세요.", + localBackupSecretsPassphraseRequiredHint: "암호화된 민감 정보를 선택하기 전에 동기화 비밀번호를 입력하세요.", syncSecretsPassphraseDescription: "이 비밀번호는 민감한 데이터를 암호화하고 복원하는 데만 사용되며 현재 DBX 인스턴스에 암호화되어 저장됩니다. 다른 인스턴스에서는 다시 입력하세요.", syncTest: "테스트", syncUpload: "업로드", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index 85c36b3fb4..48661c689c 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -7623,6 +7623,22 @@ export default withEnglishFallback({ syncSecrets: "Sincronizar segredos criptografados", syncSecretsDescription: "Quando ativado, o DBX criptografa senhas de banco de dados, senhas SSH e chaves de API de IA antes de enviá-las para o WebDAV.", syncSecretsPassphrase: "Senha de sincronização", + localBackupTitle: "Backup local", + localBackupDescription: "Exporte conexões, consultas SQL salvas e configurações selecionadas para um arquivo de backup do DBX; depois, visualize e restaure apenas o conteúdo desejado.", + localBackupImport: "Importar backup", + localBackupExport: "Exportar backup", + localBackupImportTitle: "Selecionar um backup local do DBX", + localBackupExportTitle: "Escolher onde salvar o backup local", + localBackupFileType: "Backup local do DBX", + localBackupPassphraseDescription: "As informações confidenciais são criptografadas com esta senha. Informe-a para exportar ou restaurar informações confidenciais; deixe em branco para excluí-las ou ignorá-las. A senha não é salva.", + localBackupPassphraseRequired: "Informe a senha do backup ou desmarque as informações confidenciais.", + localBackupExportSuccess: "{bytes} bytes exportados para {path}.", + localBackupImportSuccess: "O conteúdo selecionado foi restaurado de {path}.", + localBackupPathLabel: "Caminho do arquivo de backup", + localBackupPathUnset: "Nenhum local de salvamento selecionado", + localBackupChoosePath: "Escolher local", + localBackupPathRequired: "Escolha primeiro onde salvar o arquivo de backup.", + localBackupSecretsPassphraseRequiredHint: "Digite a senha de sincronização antes de selecionar informações confidenciais criptografadas.", syncSecretsPassphraseDescription: "Esta senha é usada apenas para criptografar e restaurar dados sensíveis. Ela é criptografada na instância DBX atual; digite-a novamente em outras instâncias.", syncTest: "Testar", syncUpload: "Enviar", diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts index 8c0fd518f7..fabcda5613 100644 --- a/apps/desktop/src/i18n/locales/ru.ts +++ b/apps/desktop/src/i18n/locales/ru.ts @@ -8854,6 +8854,22 @@ export default withEnglishFallback({ syncSecretsDescription: "Если включено, DBX шифрует пароли баз данных, пароли SSH, пароли прокси, токены HTTP-туннелей и ключи AI API перед загрузкой в удалённое хранилище.", syncSecretsSharedDescription: "Для WebDAV этот пароль шифрует включаемые учётные данные. Сниппеты GitHub, Gitee и GitLab используют независимое шифрование и управление учётными данными.", syncSecretsPassphrase: "Пароль синхронизации", + localBackupTitle: "Локальная резервная копия", + localBackupDescription: "Экспортируйте подключения, сохранённые SQL-запросы и выбранные настройки в файл резервной копии DBX, затем просмотрите его и восстановите только нужные данные.", + localBackupImport: "Импорт резервной копии", + localBackupExport: "Экспорт резервной копии", + localBackupImportTitle: "Выберите локальную резервную копию DBX", + localBackupExportTitle: "Выберите место сохранения локальной резервной копии", + localBackupFileType: "Локальная резервная копия DBX", + localBackupPassphraseDescription: "Конфиденциальные данные шифруются этим паролем. Введите его, чтобы экспортировать или восстановить такие данные; оставьте поле пустым, чтобы исключить их или пропустить. Пароль не сохраняется.", + localBackupPassphraseRequired: "Введите пароль резервной копии или отмените выбор конфиденциальных данных.", + localBackupExportSuccess: "Экспортировано {bytes} байт в {path}.", + localBackupImportSuccess: "Выбранные данные восстановлены из {path}.", + localBackupPathLabel: "Путь к файлу резервной копии", + localBackupPathUnset: "Место сохранения не выбрано", + localBackupChoosePath: "Выбрать путь", + localBackupPathRequired: "Сначала выберите место сохранения файла резервной копии.", + localBackupSecretsPassphraseRequiredHint: "Сначала введите пароль синхронизации, затем выберите зашифрованные конфиденциальные данные.", syncSecretsPassphraseDescription: "Этот пароль используется только для шифрования и восстановления конфиденциальных данных. Он шифруется в текущем экземпляре DBX; в других экземплярах введите его снова.", syncTest: "Проверить", syncUpload: "Загрузить", diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts index 8688b736b6..72f0e73466 100644 --- a/apps/desktop/src/i18n/locales/tr.ts +++ b/apps/desktop/src/i18n/locales/tr.ts @@ -7518,6 +7518,22 @@ export default withEnglishFallback({ syncSecretsDescription: "Etkinleştirildiğinde DBX; veritabanı parolalarını, SSH parolalarını, proxy parolalarını, HTTP tünel belirteçlerini ve yapay zekâ API anahtarlarını uzak depolamaya yüklemeden önce şifreler.", syncSecretsSharedDescription: "WebDAV için bu parola, dâhil edilen kimlik bilgilerini şifreler. GitHub Gist ve Gitee parçacıkları bağımsız şifreleme ve kimlik bilgisi denetimleri kullanır.", syncSecretsPassphrase: "Eşitleme parolası", + localBackupTitle: "Yerel yedekleme", + localBackupDescription: "Bağlantıları, kaydedilmiş SQL sorgularını ve seçili ayarları DBX yedek dosyasına aktarın; ardından dosyayı önizleyip seçili içerikleri geri yükleyin.", + localBackupImport: "Yedeği içe aktar", + localBackupExport: "Yedeği dışa aktar", + localBackupImportTitle: "Bir DBX yerel yedeği seçin", + localBackupExportTitle: "Yerel yedeğin kaydedileceği konumu seçin", + localBackupFileType: "DBX yerel yedeği", + localBackupPassphraseDescription: "Hassas bilgiler bu parolayla şifrelenir. Hassas bilgileri dışa aktarmak veya geri yüklemek için parolayı girin; dahil etmeyecekseniz boş bırakın. Parola kaydedilmez.", + localBackupPassphraseRequired: "Yedekleme parolasını girin veya hassas bilgi seçimini kaldırın.", + localBackupExportSuccess: "{bytes} bayt {path} konumuna aktarıldı.", + localBackupImportSuccess: "Seçilen içerik {path} konumundan geri yüklendi.", + localBackupPathLabel: "Yedek dosyasının yolu", + localBackupPathUnset: "Kaydetme konumu seçilmedi", + localBackupChoosePath: "Yol seç", + localBackupPathRequired: "Önce yedek dosyasının kaydedileceği konumu seçin.", + localBackupSecretsPassphraseRequiredHint: "Şifrelenmiş hassas bilgileri seçmeden önce eşitleme parolasını girin.", syncSecretsPassphraseDescription: "Bu parola yalnızca hassas verileri şifrelemek ve geri yüklemek için kullanılır. Geçerli DBX örneğinde şifrelenir; diğer örneklerde yeniden girin.", syncTest: "Test Et", syncUpload: "Yükle", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index a94269e579..6d1e88c883 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -8370,6 +8370,22 @@ export default withEnglishFallback({ sqlShortcutsSelectLimitHint: "执行时会按当前连接的数据库类型生成 SQL。", syncWebDavTitle: "WebDAV 同步", syncWebDavDescription: "将包含 SQL 库的 DBX 快照上传到兼容 WebDAV 的存储服务,或从远端恢复。", + localBackupTitle: "本地备份", + localBackupDescription: "将连接信息、保存的 SQL 和所选设置导出为 DBX 备份文件,也可预览并选择性导入。", + localBackupImport: "导入备份", + localBackupExport: "导出备份", + localBackupImportTitle: "选择 DBX 本地备份", + localBackupExportTitle: "选择本地备份保存位置", + localBackupFileType: "DBX 本地备份", + localBackupPathLabel: "备份文件保存路径", + localBackupPathUnset: "尚未选择保存路径", + localBackupChoosePath: "选择路径", + localBackupPathRequired: "请先选择备份文件的保存路径。", + localBackupPassphraseDescription: "敏感信息会使用此密码加密。导出或恢复敏感信息时需要填写;不含敏感信息时可留空。密码不会保存。", + localBackupPassphraseRequired: "请先输入备份敏感信息密码,或取消选择敏感信息。", + localBackupSecretsPassphraseRequiredHint: "请先输入数据同步密码,再选择加密敏感信息。", + localBackupExportSuccess: "已导出 {bytes} 字节到 {path}。", + localBackupImportSuccess: "已从 {path} 恢复所选内容。", syncSelectionUploadTitle: "选择备份内容", syncSelectionRestoreTitle: "选择恢复内容", syncSelectionBackupNote: "敏感凭据和插件数据只会写入加密快照。", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index 5290220636..1e98da1112 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -6940,6 +6940,22 @@ export default withEnglishFallback({ syncSecrets: "同步加密後的敏感資訊", syncSecretsDescription: "開啟後,DBX 會先加密資料庫密碼、SSH 密碼和 AI API Key,再上傳到 WebDAV。", syncSecretsPassphrase: "同步密碼", + localBackupTitle: "本機備份", + localBackupDescription: "將連線、已儲存的 SQL 和所選設定匯出為 DBX 備份檔,之後可預覽並選擇性還原。", + localBackupImport: "匯入備份", + localBackupExport: "匯出備份", + localBackupImportTitle: "選取 DBX 本機備份", + localBackupExportTitle: "選擇本機備份的儲存位置", + localBackupFileType: "DBX 本機備份", + localBackupPassphraseDescription: "敏感資訊會使用此密碼加密。匯出或還原敏感資訊時需輸入密碼;若不包含敏感資訊可留空。密碼不會儲存。", + localBackupPassphraseRequired: "請輸入備份密碼,或取消選取敏感資訊。", + localBackupExportSuccess: "已將 {bytes} 位元組匯出至 {path}。", + localBackupImportSuccess: "已從 {path} 還原所選內容。", + localBackupPathLabel: "備份檔案儲存路徑", + localBackupPathUnset: "尚未選擇儲存位置", + localBackupChoosePath: "選擇位置", + localBackupPathRequired: "請先選擇備份檔案的儲存位置。", + localBackupSecretsPassphraseRequiredHint: "請先輸入同步密碼,再選擇加密敏感資訊。", syncSecretsPassphraseDescription: "此密碼只用於加密和還原敏感資料,並會加密儲存在目前 DBX 執行個體中;在其他執行個體還原時需要再次輸入。", syncTest: "測試", syncUpload: "上傳", diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.ts index cb3fc9807b..392ac2d337 100644 --- a/apps/desktop/src/lib/backend/api.ts +++ b/apps/desktop/src/lib/backend/api.ts @@ -421,6 +421,9 @@ export const webdavSyncSecretsStatus = forward("webdavSyncSecretsStatus"); export const saveWebdavSyncSecretsPreference = forward("saveWebdavSyncSecretsPreference"); export const forgetWebdavSyncSecretsPassphrase = forward("forgetWebdavSyncSecretsPassphrase"); export const cloudSyncLocalCatalog = forward("cloudSyncLocalCatalog"); +export const localBackupExport = forward("localBackupExport"); +export const localBackupInspect = forward("localBackupInspect"); +export const localBackupImport = forward("localBackupImport"); export const webdavSyncInspect = forward("webdavSyncInspect"); export const webdavSyncUpload = forward("webdavSyncUpload"); export const webdavSyncDownload = forward("webdavSyncDownload"); diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.ts index 9bc66e4051..792a5a8d86 100644 --- a/apps/desktop/src/lib/backend/http.ts +++ b/apps/desktop/src/lib/backend/http.ts @@ -2535,6 +2535,18 @@ export async function cloudSyncLocalCatalog(editorSettings?: unknown): Promise { + throw new Error("Local backup is available only in DBX Desktop."); +} + +export async function localBackupInspect(): Promise { + throw new Error("Local backup is available only in DBX Desktop."); +} + +export async function localBackupImport(): Promise { + throw new Error("Local backup is available only in DBX Desktop."); +} + export async function webdavSyncInspect(config: WebDavConfig, secretsPassphrase?: string): Promise { return post("/api/cloud-sync/webdav/inspect", { config, secretsPassphrase }); } diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts index 868ea6e2b7..bbb6daac84 100644 --- a/apps/desktop/src/lib/backend/tauri.ts +++ b/apps/desktop/src/lib/backend/tauri.ts @@ -448,6 +448,16 @@ export interface WebDavDownloadResult { }; } +export interface LocalBackupImportResult { + editorSettings?: unknown; + desktopSettings: DesktopSettings; + applySummary: WebDavDownloadResult["applySummary"]; +} + +export interface LocalBackupExportSummary { + bytes: number; +} + export interface WebDavPasswordStatus { hasSavedPassword: boolean; } @@ -1114,6 +1124,18 @@ export async function cloudSyncLocalCatalog(editorSettings?: unknown): Promise { + return invoke("local_backup_export", { path, editorSettings, secretsPassphrase, selection }); +} + +export async function localBackupInspect(path: string, secretsPassphrase?: string): Promise { + return invoke("local_backup_inspect", { path, secretsPassphrase }); +} + +export async function localBackupImport(path: string, secretsPassphrase: string | undefined, restoreSecrets: boolean, selection: SyncSelection): Promise { + return invoke("local_backup_import", { path, secretsPassphrase, restoreSecrets, selection }); +} + export async function webdavSyncInspect(config: WebDavConfig, secretsPassphrase?: string): Promise { return invoke("webdav_sync_inspect", { config, secretsPassphrase }); } diff --git a/apps/desktop/src/lib/settings/settingsSearch.ts b/apps/desktop/src/lib/settings/settingsSearch.ts index b52e4c9685..8a3b129d58 100644 --- a/apps/desktop/src/lib/settings/settingsSearch.ts +++ b/apps/desktop/src/lib/settings/settingsSearch.ts @@ -45,7 +45,7 @@ export interface SettingsSearchEntry { } export interface SettingsSearchRoute { - syncMethodTab?: "webdav" | "snippet"; + syncMethodTab?: "webdav" | "snippet" | "local"; } export type Translate = (key: string) => string; @@ -276,6 +276,7 @@ export const SETTINGS_SEARCH_DEFINITIONS: readonly SettingsSearchDefinition[] = { id: "sync-snippet-provider", category: "sync", titleKey: "settings.syncSnippetProvider", targetId: "sync-snippet", route: { syncMethodTab: "snippet" }, visible: desktopOnly }, { id: "sync-snippet-id", category: "sync", titleKey: "settings.syncSnippetId", targetId: "sync-snippet", route: { syncMethodTab: "snippet" }, visible: desktopOnly }, { id: "sync-snippet-token", category: "sync", titleKey: "settings.syncSnippetToken", targetId: "sync-snippet", route: { syncMethodTab: "snippet" }, visible: desktopOnly }, + { id: "sync-local-backup", category: "sync", titleKey: "settings.localBackupTitle", descriptionKey: "settings.localBackupDescription", targetId: "sync-local", route: { syncMethodTab: "local" }, visible: desktopOnly }, { id: "sync-secrets", category: "sync", titleKey: "settings.syncSecrets", targetId: "sync" }, { id: "sync-secrets-passphrase", category: "sync", titleKey: "settings.syncSecretsPassphrase", targetId: "sync" }, { id: "ai-config", category: "ai", titleKey: "ai.configList", targetId: "ai" }, diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5c4a0319d9..07bc8c20ce 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -95,4 +95,4 @@ objc2-foundation = { version = "0.3.2", default-features = false, features = ["N libloading = "0.8" [target.'cfg(target_os = "windows")'.dependencies] -windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Threading", "Win32_UI_WindowsAndMessaging"] } +windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_Threading", "Win32_UI_WindowsAndMessaging"] } diff --git a/src-tauri/src/commands/local_backup.rs b/src-tauri/src/commands/local_backup.rs new file mode 100644 index 0000000000..13b223d2df --- /dev/null +++ b/src-tauri/src/commands/local_backup.rs @@ -0,0 +1,263 @@ +use std::{ + collections::HashSet, + fs::{self, File, OpenOptions}, + io::{self, Read, Write}, + path::{Path, PathBuf}, + sync::Arc, +}; + +use dbx_core::cloud_sync::{ + apply_sync_snapshot_with_selection, build_sync_snapshot_with_selection, describe_sync_snapshot, + ApplySnapshotOptions, ApplySnapshotSummary, SyncExportOptions, SyncSelection, SyncSnapshot, SyncSnapshotCatalog, +}; +use dbx_core::connection::AppState; +use dbx_core::storage::DesktopSettings; +use serde::{Deserialize, Serialize}; +use tauri::State; +use zip::{write::SimpleFileOptions, CompressionMethod, ZipArchive, ZipWriter}; + +const LOCAL_BACKUP_FORMAT: &str = "dbx-local-backup"; +const LOCAL_BACKUP_FORMAT_VERSION: u32 = 1; +const MANIFEST_ENTRY: &str = "manifest.json"; +const SNAPSHOT_ENTRY: &str = "snapshot.json"; +const MAX_SNAPSHOT_BYTES: u64 = 128 * 1024 * 1024; + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +struct LocalBackupManifest { + format: String, + format_version: u32, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct LocalBackupExportSummary { + pub bytes: u64, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct LocalBackupImportResult { + pub editor_settings: Option, + pub desktop_settings: DesktopSettings, + pub apply_summary: ApplySnapshotSummary, +} + +#[tauri::command] +pub async fn local_backup_export( + state: State<'_, Arc>, + path: String, + editor_settings: Option, + secrets_passphrase: Option, + selection: SyncSelection, +) -> Result { + let include_secrets = selection.include_secrets; + let snapshot = build_sync_snapshot_with_selection( + &state.storage, + env!("CARGO_PKG_VERSION"), + editor_settings, + SyncExportOptions { + include_secrets, + sync_passphrase: secrets_passphrase.as_deref(), + include_ai_secrets: include_secrets, + include_tunnel_secrets: include_secrets, + include_plugin_secrets: include_secrets, + }, + Some(&selection), + Some(&state.plugins), + ) + .await?; + + tauri::async_runtime::spawn_blocking(move || write_local_backup(Path::new(&path), &snapshot)) + .await + .map_err(|error| error.to_string())? +} + +#[tauri::command] +pub async fn local_backup_inspect( + path: String, + secrets_passphrase: Option, +) -> Result { + let snapshot = tauri::async_runtime::spawn_blocking(move || read_local_backup(Path::new(&path))) + .await + .map_err(|error| error.to_string())??; + describe_sync_snapshot(&snapshot, secrets_passphrase.as_deref()) +} + +#[tauri::command] +pub async fn local_backup_import( + state: State<'_, Arc>, + path: String, + secrets_passphrase: Option, + restore_secrets: bool, + selection: SyncSelection, +) -> Result { + let snapshot = tauri::async_runtime::spawn_blocking(move || read_local_backup(Path::new(&path))) + .await + .map_err(|error| error.to_string())??; + let apply_summary = apply_sync_snapshot_with_selection( + &state.storage, + &snapshot, + ApplySnapshotOptions { secrets_passphrase: secrets_passphrase.as_deref(), restore_secrets }, + Some(&selection), + Some(&state.plugins), + ) + .await?; + + Ok(LocalBackupImportResult { + editor_settings: state.storage.load_editor_settings().await?, + desktop_settings: state.storage.load_desktop_settings().await?, + apply_summary, + }) +} + +fn write_local_backup(path: &Path, snapshot: &SyncSnapshot) -> Result { + let manifest = + LocalBackupManifest { format: LOCAL_BACKUP_FORMAT.to_string(), format_version: LOCAL_BACKUP_FORMAT_VERSION }; + let manifest_bytes = serde_json::to_vec(&manifest).map_err(|error| error.to_string())?; + let snapshot_bytes = serde_json::to_vec(snapshot).map_err(|error| error.to_string())?; + if snapshot_bytes.len() as u64 > MAX_SNAPSHOT_BYTES { + return Err("Local backup snapshot exceeds the 128 MiB limit.".to_string()); + } + + let temporary_path = temporary_backup_path(path)?; + let mut open_options = OpenOptions::new(); + open_options.write(true).create_new(true); + #[cfg(unix)] + { + use std::os::unix::fs::OpenOptionsExt; + open_options.mode(0o600); + } + let file = + open_options.open(&temporary_path).map_err(|error| format!("Cannot create temporary local backup: {error}"))?; + let bytes = match write_backup_archive(file, &manifest_bytes, &snapshot_bytes) { + Ok(bytes) => bytes, + Err(error) => { + let _ = fs::remove_file(&temporary_path); + return Err(error); + } + }; + if let Err(error) = replace_backup_file(&temporary_path, path) { + let _ = fs::remove_file(&temporary_path); + return Err(format!("Cannot finalize local backup: {error}")); + } + + Ok(LocalBackupExportSummary { bytes }) +} + +fn write_backup_archive(file: File, manifest_bytes: &[u8], snapshot_bytes: &[u8]) -> Result { + let mut archive = ZipWriter::new(file); + let options = SimpleFileOptions::default().compression_method(CompressionMethod::Deflated).unix_permissions(0o600); + archive.start_file(MANIFEST_ENTRY, options).map_err(|error| error.to_string())?; + archive.write_all(manifest_bytes).map_err(|error| error.to_string())?; + archive.start_file(SNAPSHOT_ENTRY, options).map_err(|error| error.to_string())?; + archive.write_all(snapshot_bytes).map_err(|error| error.to_string())?; + let file = archive.finish().map_err(|error| error.to_string())?; + file.sync_all().map_err(|error| error.to_string())?; + let bytes = file.metadata().map_err(|error| error.to_string())?.len(); + Ok(bytes) +} + +fn temporary_backup_path(path: &Path) -> Result { + let file_name = path.file_name().ok_or_else(|| "Local backup path has no filename.".to_string())?; + let mut temporary_name = std::ffi::OsString::from("."); + temporary_name.push(file_name); + temporary_name.push(format!(".{}.tmp", uuid::Uuid::new_v4())); + Ok(path.with_file_name(temporary_name)) +} + +#[cfg(not(target_os = "windows"))] +fn replace_backup_file(temporary_path: &Path, path: &Path) -> io::Result<()> { + fs::rename(temporary_path, path) +} + +#[cfg(target_os = "windows")] +fn replace_backup_file(temporary_path: &Path, path: &Path) -> io::Result<()> { + use std::os::windows::ffi::OsStrExt; + use windows_sys::Win32::Storage::FileSystem::{MoveFileExW, MOVEFILE_REPLACE_EXISTING, MOVEFILE_WRITE_THROUGH}; + + let temporary_path: Vec = temporary_path.as_os_str().encode_wide().chain(std::iter::once(0)).collect(); + let path: Vec = path.as_os_str().encode_wide().chain(std::iter::once(0)).collect(); + let result = unsafe { + MoveFileExW(temporary_path.as_ptr(), path.as_ptr(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH) + }; + if result == 0 { + Err(io::Error::last_os_error()) + } else { + Ok(()) + } +} + +fn read_local_backup(path: &Path) -> Result { + let file = File::open(path).map_err(|error| format!("Cannot open local backup: {error}"))?; + let mut archive = ZipArchive::new(file).map_err(|error| format!("Invalid DBX backup ZIP: {error}"))?; + if archive.len() != 2 { + return Err("Invalid DBX backup ZIP: expected exactly two entries.".to_string()); + } + + let mut names = HashSet::new(); + for index in 0..archive.len() { + let name = archive.by_index(index).map_err(|error| error.to_string())?.name().to_string(); + if !matches!(name.as_str(), MANIFEST_ENTRY | SNAPSHOT_ENTRY) || !names.insert(name) { + return Err("Invalid DBX backup ZIP: unexpected or duplicate entry.".to_string()); + } + } + + let manifest_bytes = read_bounded_entry(&mut archive, MANIFEST_ENTRY, 1024 * 1024)?; + let manifest: LocalBackupManifest = + serde_json::from_slice(&manifest_bytes).map_err(|error| format!("Invalid DBX backup manifest: {error}"))?; + if manifest.format != LOCAL_BACKUP_FORMAT || manifest.format_version != LOCAL_BACKUP_FORMAT_VERSION { + return Err("Unsupported DBX local backup format.".to_string()); + } + + let snapshot_bytes = read_bounded_entry(&mut archive, SNAPSHOT_ENTRY, MAX_SNAPSHOT_BYTES)?; + serde_json::from_slice(&snapshot_bytes).map_err(|error| format!("Invalid DBX backup snapshot: {error}")) +} + +fn read_bounded_entry( + archive: &mut ZipArchive, + name: &str, + max_bytes: u64, +) -> Result, String> { + let mut entry = archive.by_name(name).map_err(|error| error.to_string())?; + if entry.size() > max_bytes { + return Err(format!("DBX backup entry '{name}' exceeds its size limit.")); + } + let mut bytes = Vec::with_capacity(entry.size() as usize); + entry.by_ref().take(max_bytes + 1).read_to_end(&mut bytes).map_err(|error| error.to_string())?; + if bytes.len() as u64 > max_bytes { + return Err(format!("DBX backup entry '{name}' exceeds its size limit.")); + } + Ok(bytes) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn staged_backup_replaces_existing_file() { + let directory = tempfile::tempdir().unwrap(); + let destination = directory.path().join("backup.dbx-backup"); + let temporary = directory.path().join(".backup.dbx-backup.staged.tmp"); + fs::write(&destination, b"previous backup").unwrap(); + fs::write(&temporary, b"completed backup").unwrap(); + + replace_backup_file(&temporary, &destination).unwrap(); + + assert_eq!(fs::read(&destination).unwrap(), b"completed backup"); + assert!(!temporary.exists()); + } + + #[test] + fn failed_backup_replacement_preserves_existing_file() { + let directory = tempfile::tempdir().unwrap(); + let destination = directory.path().join("backup.dbx-backup"); + let missing_temporary = directory.path().join(".missing.staged.tmp"); + fs::write(&destination, b"previous backup").unwrap(); + + assert!(replace_backup_file(&missing_temporary, &destination).is_err()); + + assert_eq!(fs::read(&destination).unwrap(), b"previous backup"); + } +} diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 14e2761141..5f97efa5c6 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -26,6 +26,7 @@ pub mod history; pub mod keychain; pub mod launch_args; pub mod list_sql_files; +pub mod local_backup; pub mod mcp; pub mod mcp_bridge; pub mod mcp_http_server; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index a774902014..c445dfabcd 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1937,6 +1937,9 @@ pub fn run() { commands::cloud_sync::snippet_sync_upload, commands::cloud_sync::snippet_sync_download, commands::cloud_sync::snippet_sync_inspect, + commands::local_backup::local_backup_export, + commands::local_backup::local_backup_inspect, + commands::local_backup::local_backup_import, commands::connection::test_connection, commands::connection::test_connection_with_info, commands::connection::test_ssh_tunnel,