Skip to content

fix(dav): finalize upload bookkeeping before downgrading lock #60453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −41
Open

fix(dav): finalize upload bookkeeping before downgrading lock #60453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 48 additions & 41 deletions apps/dav/lib/Connector/Sabre/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use OCP\Files\LockNotAcquiredException;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\Storage\IStorage;
use OCP\Files\Storage\IWriteStreamStorage;
use OCP\Files\StorageNotAvailableException;
use OCP\IConfig;
Expand Down Expand Up @@ -334,56 +335,62 @@ public function put($data) {
}
}

// since we skipped the view we need to scan and emit the hooks ourselves
$storage->getUpdater()->update($internalPath);

try {
$this->changeLock(ILockingProvider::LOCK_SHARED);
} catch (LockedException $e) {
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
}

// allow sync clients to send the mtime along in a header
$mtimeHeader = $this->request->getHeader('x-oc-mtime');
if ($mtimeHeader !== '') {
$mtime = $this->sanitizeMtime($mtimeHeader);
if ($this->fileView->touch($this->path, $mtime)) {
$this->header('X-OC-MTime: accepted');
}
}
$this->finalizeUpload($storage, $internalPath, $exists, $view);
} catch (StorageNotAvailableException $e) {
throw new ServiceUnavailable($this->l10n->t('Failed to check file size: %1$s', [$e->getMessage()]), 0, $e);
}

$fileInfoUpdate = [
'upload_time' => time()
];
return '"' . $this->info->getEtag() . '"';
}

// allow sync clients to send the creation time along in a header
$ctimeHeader = $this->request->getHeader('x-oc-ctime');
if ($ctimeHeader) {
$ctime = $this->sanitizeMtime($ctimeHeader);
$fileInfoUpdate['creation_time'] = $ctime;
$this->header('X-OC-CTime: accepted');
private function finalizeUpload(IStorage $storage, string $internalPath, bool $exists, ?View $view): void {
// Since we skipped the view for the final publish step, finalize the file
// state explicitly here: update cache/bookkeeping, persist metadata, emit
// post-write hooks, and only then downgrade the lock.
$storage->getUpdater()->update($internalPath);

$fileInfoUpdate = [
'upload_time' => time(),
];

// allow sync clients to send the mtime along in a header
$mtimeHeader = $this->request->getHeader('x-oc-mtime');
if ($mtimeHeader !== '') {
$mtime = $this->sanitizeMtime($mtimeHeader);
if ($this->fileView->touch($this->path, $mtime)) {
$this->header('X-OC-MTime: accepted');
}
}

$this->fileView->putFileInfo($this->path, $fileInfoUpdate);
// allow sync clients to send the creation time along in a header
$ctimeHeader = $this->request->getHeader('x-oc-ctime');
if ($ctimeHeader !== '') {
$ctime = $this->sanitizeMtime($ctimeHeader);
$fileInfoUpdate['creation_time'] = $ctime;
$this->header('X-OC-CTime: accepted');
}

if ($view) {
$this->emitPostHooks($exists);
}
// Persist checksum before post hooks so observers see fully finalized metadata.
$checksumHeader = $this->request->getHeader('oc-checksum');
if ($checksumHeader) {
$fileInfoUpdate['checksum'] = trim($checksumHeader);
} elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') {
$fileInfoUpdate['checksum'] = '';
}

$this->refreshInfo();
$this->fileView->putFileInfo($this->path, $fileInfoUpdate);
$this->refreshInfo();

$checksumHeader = $this->request->getHeader('oc-checksum');
if ($checksumHeader) {
$checksum = trim($checksumHeader);
$this->setChecksum($checksum);
} elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') {
$this->setChecksum('');
}
} catch (StorageNotAvailableException $e) {
throw new ServiceUnavailable($this->l10n->t('Failed to check file size: %1$s', [$e->getMessage()]), 0, $e);
if ($view) {
$this->emitPostHooks($exists);
}

return '"' . $this->info->getEtag() . '"';
// Keep the exclusive lock until all bookkeeping and metadata updates are complete.
try {
$this->changeLock(ILockingProvider::LOCK_SHARED);
} catch (LockedException $e) {
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
}
}

private function getPartFileBasePath($path) {
Expand Down
Loading