dillard
6cbc5d79d4
CI / unit (8.2) (push) Has been cancelled
CI / unit (8.3) (push) Has been cancelled
CI / unit (8.4) (push) Has been cancelled
CI / psalm (push) Has been cancelled
CI / integration (mariadb, 32) (push) Has been cancelled
CI / integration (mariadb, 33) (push) Has been cancelled
CI / integration (mariadb, 34) (push) Has been cancelled
CI / integration (mariadb, 35) (push) Has been cancelled
CI / integration (pgsql, 32) (push) Has been cancelled
CI / integration (pgsql, 33) (push) Has been cancelled
CI / integration (pgsql, 34) (push) Has been cancelled
CI / integration (pgsql, 35) (push) Has been cancelled
CI / integration (sqlite, 32) (push) Has been cancelled
CI / integration (sqlite, 33) (push) Has been cancelled
CI / integration (sqlite, 34) (push) Has been cancelled
CI / integration (sqlite, 35) (push) Has been cancelled
CI / integration-targets (push) Has been cancelled
CI / integration-user (push) Has been cancelled
Wires the existing RepositoryExportDestination/RepositoryImportSource (see lib/UserMigration/) into user_migration's own UserMigrationService, resolved on demand through a new UserMigrationServiceLocator since the app is an optional dependency (PLAN.md 3.8) -- without it, only this feature is unavailable, the full backup still works. New: UserBackupService::backupUser() (occ backup:backup:user) streams a user_migration export straight into the repository, under the same shared location lock as a regular backup. UserRestoreService::restoreUser() (occ backup:restore:user) never imports over a live account: --mode=replace safety-exports the current state first, then deletes and recreates the account from the backup under the same uid; --mode=as-backup restores into a new "<uid>-bak" account instead, since Nextcloud cannot rename a uid. The catalog now also tracks user export manifests (Repository::recordUserExport/ listUserExports/forgetUserExport/isRecordedUserExport), rollback-protected like a snapshot: listUserExports() verifies each one is still present on the location, and restore only ever reads a manifest the verified catalog actually recorded, never an arbitrary caller-supplied path. prune()'s existing raw users/ scan for blob retention is unchanged. A new short exclusive "catalog" lock (PruneService::catalogLockKey()) serializes the catalog write itself, so two concurrent per-user backups (or one alongside a full backup) can no longer race to write the same next generation and silently drop one of them -- the broader per-target shared lock only ever protected against a concurrent cleanup, not against other shared holders. Two real bugs found by testing this against a live Nextcloud instance, not by unit tests (RepositoryExportDestination/RepositoryImportSource implement OCP interfaces that plain PHPUnit can't load, see tests/Unit/Repository/UserExportTest.php's docblock; the new tests/integration/user-roundtrip.sh covers the real round trip instead): - RepositoryImportSource::copyToFolder() double-closed the stream it handed to putContent()/newFile() (both already close it themselves), which throws a TypeError on PHP 8 and broke every restored file with content. - A replace-mode restore failed on NotPermittedException: IRootFolder::getUserFolder() caches a Folder per uid for the process lifetime, so after delete+recreate of the same uid the import still got the deleted account's (now storage-less) folder. Fixed by dispatching FilesystemTornDownEvent, which Root already listens for to clear exactly that cache -- no internal OC\ classes needed. Local review (CodeRabbit + Codex) against this diff found three more real issues, all fixed: the catalog write race above, a failed as-backup import leaving a broken stub account behind (now deleted on failure), and an export stream leak on a read/backend failure in RepositoryExportDestination::copyFolder() (now closed in a finally). Deliberately left out: wiring per-user export into the automatic backup schedule (on-demand via occ only, for now) and retention/pruning of old user exports -- both open design questions, not yet decided. The lease covering a single export/import still has a fixed TTL (3600s) with no mid-call refresh, since UserMigrationService exposes no progress; a resumable, step-based per-user backup (like the main BackupService run) would remove that cap but is a bigger change than this pass.
58 lines
2.8 KiB
XML
58 lines
2.8 KiB
XML
<?xml version="1.0"?>
|
|
<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
|
|
<id>ng_backup</id>
|
|
<name>NG Backup</name>
|
|
<summary>Encrypted, incremental backups of your Nextcloud with restore from the web interface</summary>
|
|
<description><![CDATA[Alpha: feature-complete for scheduled, encrypted, incremental backups to
|
|
S3/SFTP/WebDAV/local, with restore of files and folders from the web interface and occ. Meant for
|
|
testing on a copy of production (dev, test, staging) -- not yet for production use, and full
|
|
disaster recovery is not implemented yet. See the recovery kit section of the README before
|
|
relying on this for anything.]]></description>
|
|
<version>0.1.0</version>
|
|
<licence>agpl</licence>
|
|
<author>Dillard Blom</author>
|
|
<namespace>NgBackup</namespace>
|
|
<category>tools</category>
|
|
<bugs>https://github.com/dillardblom/ng_backup/issues</bugs>
|
|
<dependencies>
|
|
<php min-version="8.1"/>
|
|
<lib>sodium</lib>
|
|
<nextcloud min-version="32" max-version="35"/>
|
|
</dependencies>
|
|
<background-jobs>
|
|
<job>OCA\NgBackup\BackgroundJob\BackupJob</job>
|
|
</background-jobs>
|
|
<commands>
|
|
<command>OCA\NgBackup\Command\KeyInit</command>
|
|
<command>OCA\NgBackup\Command\KeyKit</command>
|
|
<command>OCA\NgBackup\Command\KeyConfirm</command>
|
|
<command>OCA\NgBackup\Command\TargetBackends</command>
|
|
<command>OCA\NgBackup\Command\TargetAdd</command>
|
|
<command>OCA\NgBackup\Command\TargetList</command>
|
|
<command>OCA\NgBackup\Command\TargetRemove</command>
|
|
<command>OCA\NgBackup\Command\RunBackup</command>
|
|
<command>OCA\NgBackup\Command\Status</command>
|
|
<command>OCA\NgBackup\Command\ListSnapshots</command>
|
|
<command>OCA\NgBackup\Command\Browse</command>
|
|
<command>OCA\NgBackup\Command\Restore</command>
|
|
<command>OCA\NgBackup\Command\Prune</command>
|
|
<command>OCA\NgBackup\Command\Retention</command>
|
|
<command>OCA\NgBackup\Command\TargetAppendOnly</command>
|
|
<command>OCA\NgBackup\Command\TargetTrustCurrent</command>
|
|
<command>OCA\NgBackup\Command\TargetLimit</command>
|
|
<command>OCA\NgBackup\Command\Trash</command>
|
|
<command>OCA\NgBackup\Command\TrashRestore</command>
|
|
<command>OCA\NgBackup\Command\KeySlots</command>
|
|
<command>OCA\NgBackup\Command\KeySlotAdd</command>
|
|
<command>OCA\NgBackup\Command\KeySlotReplace</command>
|
|
<command>OCA\NgBackup\Command\KeySlotRemove</command>
|
|
<command>OCA\NgBackup\Command\BackupUser</command>
|
|
<command>OCA\NgBackup\Command\RestoreUser</command>
|
|
</commands>
|
|
<settings>
|
|
<admin>OCA\NgBackup\Settings\Admin</admin>
|
|
<admin-section>OCA\NgBackup\Settings\AdminSection</admin-section>
|
|
</settings>
|
|
</info>
|