Skip to content

Move auth outside transaction #535

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

Merged
abnegate merged 4 commits into from
Mar 12, 2025
Merged

Move auth outside transaction #535

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba1acf5
Array merge
fogelito Mar 11, 2025
db4e801
new Queries
fogelito Mar 11, 2025
5ac075d
lint
fogelito Mar 11, 2025
8353f1e
deleteDocuments skip auth
fogelito Mar 12, 2025
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
87 changes: 48 additions & 39 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4052,6 +4052,15 @@ public function updateDocuments(string $collection, Document $updates, array $qu
throw new DatabaseException('Collection not found');
}

$documentSecurity = $collection->getAttribute('documentSecurity', false);

$authorization = new Authorization(self::PERMISSION_UPDATE);
$skipAuth = $authorization->isValid($collection->getUpdate());

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($authorization->getDescription());
}

$attributes = $collection->getAttribute('attributes', []);
$indexes = $collection->getAttribute('indexes', []);

Expand Down Expand Up @@ -4098,18 +4107,8 @@ public function updateDocuments(string $collection, Document $updates, array $qu
throw new StructureException($validator->getDescription());
}

$documents = $this->withTransaction(function () use ($collection, $queries, $batchSize, $updates, $limit, $cursor) {
$documents = $this->withTransaction(function () use ($collection, $queries, $batchSize, $updates, $limit, $cursor, $authorization, $skipAuth) {
$documents = [];

$documentSecurity = $collection->getAttribute('documentSecurity', false);

$authorization = new Authorization(self::PERMISSION_UPDATE);
$skipAuth = $authorization->isValid($collection->getUpdate());

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($authorization->getDescription());
}

$originalLimit = $limit;
$lastDocument = $cursor;

Expand All @@ -4121,15 +4120,19 @@ public function updateDocuments(string $collection, Document $updates, array $qu
$limit -= $batchSize;
}

$affectedDocuments = $this->silent(fn () => $this->find($collection->getId(), array_merge(
$queries,
empty($lastDocument) ? [
Query::limit($batchSize),
] : [
Query::limit($batchSize),
Query::cursorAfter($lastDocument),
]
), forPermission: Database::PERMISSION_UPDATE));
$new = [
Query::limit($batchSize)
];

if (! empty($lastDocument)) {
$new[] = Query::cursorAfter($lastDocument);
}

$affectedDocuments = $this->silent(fn () => $this->find(
$collection->getId(),
array_merge($new, $queries),
forPermission: Database::PERMISSION_UPDATE
));

if (empty($affectedDocuments)) {
break;
Expand Down Expand Up @@ -5359,6 +5362,14 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
throw new DatabaseException('Collection not found');
}

$documentSecurity = $collection->getAttribute('documentSecurity', false);
$authorization = new Authorization(self::PERMISSION_DELETE);
$skipAuth = $authorization->isValid($collection->getDelete());

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($authorization->getDescription());
}

$attributes = $collection->getAttribute('attributes', []);
$indexes = $collection->getAttribute('indexes', []);

Expand All @@ -5384,16 +5395,8 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
throw new DatabaseException("Cursor document must be from the same Collection.");
}

$documents = $this->withTransaction(function () use ($collection, $queries, $batchSize, $limit, $cursor) {
$documentSecurity = $collection->getAttribute('documentSecurity', false);
$authorization = new Authorization(self::PERMISSION_DELETE);
$skipAuth = $authorization->isValid($collection->getDelete());
$documents = $this->withTransaction(function () use ($collection, $queries, $batchSize, $limit, $cursor, $skipAuth, $authorization) {
$documents = [];

if (!$skipAuth && !$documentSecurity && $collection->getId() !== self::METADATA) {
throw new AuthorizationException($authorization->getDescription());
}

$originalLimit = $limit;
$lastDocument = $cursor;

Expand All @@ -5404,15 +5407,19 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
$limit -= $batchSize;
}

$affectedDocuments = $this->silent(fn () => $this->find($collection->getId(), array_merge(
$queries,
empty($lastDocument) ? [
Query::limit($batchSize),
] : [
Query::limit($batchSize),
Query::cursorAfter($lastDocument),
]
), forPermission: Database::PERMISSION_DELETE));
$new = [
Query::limit($batchSize)
];

if (! empty($lastDocument)) {
$new[] = Query::cursorAfter($lastDocument);
}

$affectedDocuments = $this->silent(fn () => $this->find(
$collection->getId(),
array_merge($new, $queries),
forPermission: Database::PERMISSION_DELETE
));

if (empty($affectedDocuments)) {
break;
Expand Down Expand Up @@ -5454,10 +5461,12 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
}

foreach (\array_chunk($documents, $batchSize) as $chunk) {
$this->adapter->deleteDocuments(
$callback = fn () => $this->adapter->deleteDocuments(
$collection->getId(),
array_map(fn ($document) => $document->getId(), $chunk)
);

$skipAuth ? $authorization->skip($callback) : $callback();
}

return $documents;
Expand Down