Files
nextcloud-ng_backup/lib/Service/RestoreService.php
T
dillard 2610c1ad2f
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 / 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
Expiring leases instead of long-held locks
A backup step killed by a time limit, OOM or kill -9 kept Nextcloud's
lock on its location for up to an hour, blocking every new start and the
run itself. Locations and runs are now guarded by leases in ngb_leases
with an expiry: a backup step holds them for its duration plus two
minutes, restores refresh theirs every minute, prune holds 30 minutes,
untrash 5. Nextcloud's lock is only used for the milliseconds in which a
lease is checked and written.

Also: starting a backup while one is already running simply continues
it (no exclusive lease needed), and running to completion waits instead
of spinning while a crashed step's lease has not expired.

Tested on NC34: a backup killed four times at random moments resumes on
its own after the lease expires (about two minutes), and restores
bit-identically.
2026-10-02 14:44:52 +02:00

252 lines
8.8 KiB
PHP

<?php
declare(strict_types=1);
// SPDX-FileCopyrightText: 2026 Dillard Blom
// SPDX-License-Identifier: AGPL-3.0-or-later
namespace OCA\NgBackup\Service;
use OCA\NgBackup\Db\Target;
use OCA\NgBackup\Repository\Repository;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
/**
* Restoring from a snapshot.
*
* User files (data/<uid>/files/...) are written through the Nextcloud Files API, so the file
* cache, versions and trash stay consistent: an overwritten file becomes a version and a
* removed file goes to the trash, which makes a restore itself reversible. Every file is
* written to a temporary name first and only renamed into place after all its blobs were
* decrypted and verified.
*
* Modes for user files:
* - new-folder (default): into "Restored <date>/<same path>", nothing existing is touched
* - merge: into the original place, existing files are overwritten (old content kept as a version)
* - replace: like merge, and files that are not in the snapshot are moved to the trash
*/
class RestoreService {
public const MODE_NEW_FOLDER = 'new-folder';
public const MODE_MERGE = 'merge';
public const MODE_REPLACE = 'replace';
public function __construct(
private TargetService $targets,
private IRootFolder $root,
private LeaseService $leases,
) {
}
/** Shared lock on the location while restoring: a cleanup (exclusive) must not delete what is being read. */
private function withSharedLock(Target $target, callable $fn, int $ttl = 600): mixed {
try {
return $this->leases->with(PruneService::lockKey($target), LeaseService::SHARED, $ttl, $fn);
} catch (\OCP\Lock\LockedException) {
throw new \RuntimeException('A cleanup of ' . $target->getName() . ' is running; try again later');
}
}
/**
* Direct children (files and folders) of a path in a snapshot.
*
* @return list<array{name:string, type:string, size:int, mtime:int|null, files:int}>
*/
public function browse(Target $target, string $snapshotId, string $path = ''): array {
$prefix = trim($path, '/');
$prefix = $prefix === '' ? '' : $prefix . '/';
$children = [];
foreach ($this->targets->repository($target)->entries($snapshotId) as $e) {
if ($prefix !== '' && !str_starts_with($e['p'], $prefix)) {
continue;
}
$rest = substr($e['p'], strlen($prefix));
[$name, $more] = array_pad(explode('/', $rest, 2), 2, null);
$c = $children[$name] ?? ['name' => $name, 'type' => $more === null ? 'file' : 'dir', 'size' => 0, 'mtime' => null, 'files' => 0];
$c['size'] += $e['s'];
$c['files']++;
if ($more === null) {
$c['mtime'] = $e['m'];
}
$children[$name] = $c;
}
ksort($children, SORT_STRING);
return array_values($children);
}
/**
* Restore user files from "data/<uid>/files[/<path>]" into that user's Nextcloud files.
*
* @return array{restored:int, trashed:int, target:string}
*/
public function restoreUserFiles(Target $target, string $snapshotId, string $logicalPath, string $mode = self::MODE_NEW_FOLDER, ?callable $progress = null): array {
return $this->withSharedLock($target, function (callable $refresh) use ($target, $snapshotId, $logicalPath, $mode, $progress) {
$last = time();
// Keep the lease alive while files are being written.
$beat = function (int $done, int $total, string $name) use ($refresh, $progress, &$last): void {
if (time() - $last >= 60) {
$refresh();
$last = time();
}
if ($progress !== null) {
$progress($done, $total, $name);
}
};
return $this->doRestoreUserFiles($target, $snapshotId, $logicalPath, $mode, $beat);
});
}
private function doRestoreUserFiles(Target $target, string $snapshotId, string $logicalPath, string $mode, ?callable $progress): array {
if (!Repository::isSafePath($logicalPath) || !preg_match('#^data/([^/]+)/files(?:/(.*))?$#', $logicalPath, $m)) {
throw new \InvalidArgumentException('Expected a path like data/<user>/files/<folder or file>');
}
[$uid, $rel] = [$m[1], trim($m[2] ?? '', '/')];
$userFolder = $this->root->getUserFolder($uid);
$repo = $this->targets->repository($target);
$source = 'data/' . $uid . '/files' . ($rel === '' ? '' : '/' . $rel);
$entries = [];
$single = false;
foreach ($repo->entries($snapshotId) as $e) {
if ($e['p'] === $source) {
$single = true;
$entries[''] = $e;
break;
}
if (str_starts_with($e['p'], $source . '/')) {
$entries[substr($e['p'], strlen($source) + 1)] = $e;
}
}
if ($entries === []) {
throw new NotFoundException("Nothing at $source in snapshot $snapshotId");
}
// Where to write. new-folder mirrors the path under "Restored <date>" in the user's root.
$parentRel = $single ? (dirname($rel) === '.' ? '' : dirname($rel)) : $rel;
if ($mode === self::MODE_NEW_FOLDER) {
$parentRel = trim('Restored ' . date('Y-m-d H.i') . '/' . $parentRel, '/');
} elseif ($mode !== self::MODE_MERGE && $mode !== self::MODE_REPLACE) {
throw new \InvalidArgumentException("Unknown mode $mode");
}
$dest = $this->ensureFolder($userFolder, $parentRel);
$names = $single ? [basename($rel) => $entries['']] : $entries;
$restored = 0;
foreach ($names as $relPath => $entry) {
$this->writeFile($repo, $dest, (string)$relPath, $entry);
$restored++;
if ($progress !== null) {
$progress($restored, count($names), (string)$relPath);
}
}
$trashed = 0;
if ($mode === self::MODE_REPLACE && !$single) {
$trashed = $this->trashExtras($dest, '', array_flip(array_keys($names)));
}
return ['restored' => $restored, 'trashed' => $trashed, 'target' => $uid . ':' . $userFolder->getRelativePath($dest->getPath())];
}
/** Raw restore of any snapshot path to a local directory (administrators, disaster recovery). */
public function restoreToDirectory(Target $target, string $snapshotId, string $prefix, string $directory): int {
if ($prefix !== '' && !Repository::isSafePath($prefix)) {
throw new \InvalidArgumentException('Invalid path: ' . $prefix);
}
if (!is_dir($directory) && !mkdir($directory, 0750, true) && !is_dir($directory)) {
throw new \RuntimeException("Cannot create $directory");
}
return $this->withSharedLock($target, fn () => $this->targets->repository($target)->restore($snapshotId, $directory, trim($prefix, '/') === '' ? '' : trim($prefix, '/') . '/'), 3600);
}
private function writeFile(Repository $repo, Folder $dest, string $relPath, array $entry): void {
$dir = dirname($relPath);
$folder = $dir === '.' ? $dest : $this->ensureFolder($dest, $dir);
$name = basename($relPath);
// Stage under a temporary name; only rename into place after every blob was verified.
$tmpName = '.' . $name . '.ngb-restore-' . bin2hex(random_bytes(3));
$tmp = $folder->newFile($tmpName);
try {
$out = $tmp->fopen('wb');
$written = 0;
foreach ($repo->readBlobs($entry['b']) as $data) { // each blob is verified on read
if (fwrite($out, $data) !== strlen($data)) {
throw new \RuntimeException('Write failed for ' . $relPath);
}
$written += strlen($data);
}
if (!fclose($out)) {
throw new \RuntimeException('Write failed for ' . $relPath);
}
if ($written !== $entry['s']) {
throw new \RuntimeException("Size mismatch restoring $relPath");
}
if ($folder->nodeExists($name)) {
$existing = $folder->get($name);
if (!$existing instanceof File) {
throw new \RuntimeException("$relPath exists and is not a file");
}
// Overwrite through the Files API: the current content becomes a version.
$in = $tmp->fopen('rb');
$existing->putContent($in);
if (is_resource($in)) {
fclose($in);
}
$tmp->delete();
$existing->touch($entry['m']);
} else {
$tmp->move($folder->getPath() . '/' . $name);
$folder->get($name)->touch($entry['m']);
}
} catch (\Throwable $e) {
try {
$tmp->delete();
} catch (\Throwable) {
}
throw $e;
}
}
private function trashExtras(Folder $folder, string $prefix, array $keep): int {
$count = 0;
foreach ($folder->getDirectoryListing() as $node) {
$rel = $prefix === '' ? $node->getName() : $prefix . '/' . $node->getName();
if ($node instanceof Folder) {
$hasKept = false;
foreach (array_keys($keep) as $k) {
if (str_starts_with((string)$k, $rel . '/')) {
$hasKept = true;
break;
}
}
if ($hasKept) {
$count += $this->trashExtras($node, $rel, $keep);
} else {
$node->delete(); // to the trash
$count++;
}
} elseif (!isset($keep[$rel])) {
$node->delete();
$count++;
}
}
return $count;
}
private function ensureFolder(Folder $base, string $path): Folder {
$path = trim($path, '/');
if ($path === '' || $path === '.') {
return $base;
}
if ($base->nodeExists($path)) {
$node = $base->get($path);
if (!$node instanceof Folder) {
throw new \RuntimeException("$path exists and is not a folder");
}
return $node;
}
return $base->newFolder($path);
}
}