Skip to content

perf: Try to prevalidate on part file upload if rules are only of a c… #585

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

Draft
nickvergessen wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

perf: Try to prevalidate on part file upload if rules are only of a c… #585

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
33 changes: 29 additions & 4 deletions lib/Operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ public function checkFileAccess(IStorage $storage, string $path, bool $isDir = f
return;
}

/**
* Optimization:
* When uploading part files we check all rules up front.
* If a rule matches that does not depend on:
* - FileMimeType
* - FileSystemTags
* we can already deny the upload and don't need to wait until the chunk assembly
*/
$partFileUpload = true; //$this->isPartFileUpload($path);

$this->nestingLevel++;

$filePath = $this->translatePath($storage, $path);
Expand All @@ -68,10 +78,17 @@ public function checkFileAccess(IStorage $storage, string $path, bool $isDir = f
$ruleMatcher->setEntitySubject($this->fileEntity, $node);
}
$ruleMatcher->setOperation($this);
$match = $ruleMatcher->getFlows();
$match = $ruleMatcher->getFlows(!$partFileUpload);

$this->nestingLevel--;

\OC::$server->getLogger()->error('json_encode(array_map(fn ($i) => get_class($i), $match))');
if ($partFileUpload) {
// [{"id":1,"class":"OCA\\FilesAccessControl\\Operation","name":"","checks":"[5,6,4]","operation":"deny","entity":"OCA\\WorkflowEngine\\Entity\\File","events":"[]","scope_type":0,"scope_actor_id":""}]
\OC::$server->getLogger()->error(json_encode($match));
// $match = array_filter($match, );
}

if (!empty($match)) {
$e = new \RuntimeException('Access denied for path ' . $path . ' that is ' . ($isDir ? '' : 'not ') . 'a directory and matches rules: ' . json_encode($match));
$this->logger->debug($e->getMessage(), ['exception' => $e]);
Expand All @@ -80,6 +97,10 @@ public function checkFileAccess(IStorage $storage, string $path, bool $isDir = f
}
}

protected function isPartFileUpload(string $path): bool {
return preg_match('/\.ocTransferId\d+\.part$/i', $path) === 1;
}

protected function isBlockablePath(IStorage $storage, string $path): bool {
if (property_exists($storage, 'mountPoint')) {
$hasMountPoint = $storage instanceof StorageWrapper;
Expand All @@ -103,9 +124,10 @@ protected function isBlockablePath(IStorage $storage, string $path): bool {
return false;
}

if (preg_match('/\.ocTransferId\d+\.part$/i', $path)) {
return false;
}
// FIXME check that uploads/ path does not break below
// if (preg_match('/\.ocTransferId\d+\.part$/i', $path)) {
// return false;
// }

// '', admin, 'files', 'path/to/file.txt'
$segment = explode('/', $fullPath, 4);
Expand All @@ -126,6 +148,9 @@ protected function isBlockablePath(IStorage $storage, string $path): bool {
* For thumbnails and versions we want to check the tags of the original file
*/
protected function translatePath(IStorage $storage, string $path): string {
// Cut of potential part file suffix
$path = preg_replace('/\.ocTransferId\d+\.part$/i', '', $path);

if (substr_count($path, '/') < 1) {
return $path;
}
Expand Down