upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #56989 from nextcloud/backport/56982/stable26

Browse source 
[stable26] fix(comments): Check comment object
This commit is contained in:
Joas Schilling 2025-12-11 10:21:08 +01:00 committed by GitHub
commit be0be87eb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/Comments/EntityCollection.php
View file

@ -100,6 +100,10 @@ class EntityCollection extends RootCollection implements IProperties {
public function getChild($name) {
try {
$comment = $this->commentsManager->get($name);
if ($comment->getObjectType() !== $this->name
|| $comment->getObjectId() !== $this->id) {
throw new NotFound();
}
return new CommentNode(
$this->commentsManager,
$comment,
@ -153,8 +157,9 @@ class EntityCollection extends RootCollection implements IProperties {
*/
public function childExists($name) {
try {
$this->commentsManager->get($name);
return true;
$comment = $this->commentsManager->get($name);
return $comment->getObjectType() === $this->name
&& $comment->getObjectId() === $this->id;
} catch (NotFoundException $e) {
return false;
}

23
apps/dav/tests/unit/Comments/EntityCollectionTest.php
View file

@ -76,14 +76,16 @@ class EntityCollectionTest extends \Test\TestCase {
}
public function testGetChild(): void {
$comment = $this->createMock(IComment::class);
$comment->method('getObjectType')
->willReturn('files');
$comment->method('getObjectId')
->willReturn('19');
$this->commentsManager->expects($this->once())
->method('get')
->with('55')
->willReturn(
$this->getMockBuilder(IComment::class)
->disableOriginalConstructor()
->getMock()
);
->willReturn($comment);
$node = $this->collection->getChild('55');
$this->assertTrue($node instanceof \OCA\DAV\Comments\CommentNode);
@ -135,6 +137,17 @@ class EntityCollectionTest extends \Test\TestCase {
}
public function testChildExistsTrue(): void {
$comment = $this->createMock(IComment::class);
$comment->method('getObjectType')
->willReturn('files');
$comment->method('getObjectId')
->willReturn('19');
$this->commentsManager->expects($this->once())
->method('get')
->with('44')
->willReturn($comment);
$this->assertTrue($this->collection->childExists('44'));
}

8
lib/private/DB/QueryBuilder/QueryBuilder.php
View file

@ -1107,6 +1107,10 @@ class QueryBuilder implements IQueryBuilder {
* @return $this This QueryBuilder instance.
*/
public function orderBy($sort, $order = null) {
if ($order !== null && !in_array(strtoupper((string) $order), ['ASC', 'DESC'], true)) {
$order = null;
}
$this->queryBuilder->orderBy(
$this->helper->quoteColumnName($sort),
$order
@ -1124,6 +1128,10 @@ class QueryBuilder implements IQueryBuilder {
* @return $this This QueryBuilder instance.
*/
public function addOrderBy($sort, $order = null) {
if ($order !== null && !in_array(strtoupper((string) $order), ['ASC', 'DESC'], true)) {
$order = null;
}
$this->queryBuilder->addOrderBy(
$this->helper->quoteColumnName($sort),
$order