Skip to content

[stable23] Forbid tagging readonly files #44326

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
nickvergessen merged 6 commits into from
Mar 26, 2024
Merged

[stable23] Forbid tagging readonly files #44326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fafcac9
fix(systemtags): Forbid tagging of readonly files
come-nc Feb 27, 2024
1013d8b
chore: Break closure call on two lines to make it readable
come-nc Mar 4, 2024
b574861
fix(dav): Add missing use for OCP\Constants
come-nc Mar 19, 2024
a5ac6d9
chore: Remove PHP8 constructor property promotions
come-nc Mar 19, 2024
b4a166e
chore: Remove typed properties to support 7.3
come-nc Mar 19, 2024
a4473ce
chore(dav): Remove short function closure syntax not supported in PHP…
come-nc Mar 21, 2024
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
Prev Previous commit
Next Next commit
chore: Remove typed properties to support 7.3 
23 still supports PHP 7.3

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Mar 19, 2024
commit b4a166e1cc365d58ed63bc6e490fdb8ae8c7f566
21 changes: 14 additions & 7 deletions apps/dav/lib/SystemTag/SystemTagMappingNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,20 @@
* Mapping node for system tag to object id
*/
class SystemTagMappingNode implements \Sabre\DAV\INode {
private ISystemTag $tag;
private string $objectId;
private string $objectType;
private IUser $user;
private ISystemTagManager $tagManager;
private ISystemTagObjectMapper $tagMapper;
private \Closure $childWriteAccessFunction;
/** @var ISystemTag */
private $tag;
/** @var string */
private $objectId;
/** @var string */
private $objectType;
/** @var IUser */
private $user;
/** @var ISystemTagManager */
private $tagManager;
/** @var ISystemTagObjectMapper */
private $tagMapper;
/** @var \Closure */
private $childWriteAccessFunction;

public function __construct(
ISystemTag $tag,
Expand Down
18 changes: 12 additions & 6 deletions apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@
* Collection containing tags by object id
*/
class SystemTagsObjectMappingCollection implements ICollection {
private string $objectId;
private string $objectType;
private IUser $user;
private ISystemTagManager $tagManager;
private ISystemTagObjectMapper $tagMapper;
protected \Closure $childWriteAccessFunction;
/** @var string */
private $objectId;
/** @var string */
private $objectType;
/** @var IUser */
private $user;
/** @var ISystemTagManager */
private $tagManager;
/** @var ISystemTagObjectMapper */
private $tagMapper;
/** @var \Closure */
protected $childWriteAccessFunction;

public function __construct(
string $objectId,
Expand Down
21 changes: 14 additions & 7 deletions apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,20 @@
* Collection containing object ids by object type
*/
class SystemTagsObjectTypeCollection implements ICollection {
private string $objectType;
private ISystemTagManager $tagManager;
private ISystemTagObjectMapper $tagMapper;
private IUserSession $userSession;
private IGroupManager $groupManager;
protected \Closure $childExistsFunction;
protected \Closure $childWriteAccessFunction;
/** @var string */
private $objectType;
/** @var ISystemTagManager */
private $tagManager;
/** @var ISystemTagObjectMapper */
private $tagMapper;
/** @var IUserSession */
private $userSession;
/** @var IGroupManager */
private $groupManager;
/** @var \Closure */
protected $childExistsFunction;
/** @var \Closure */
protected $childWriteAccessFunction;

public function __construct(
string $objectType,
Expand Down
9 changes: 6 additions & 3 deletions apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@
use OCP\SystemTag\TagNotFoundException;

class SystemTagMappingNodeTest extends \Test\TestCase {
private ISystemTagManager $tagManager;
private ISystemTagObjectMapper $tagMapper;
private IUser $user;
/** @var ISystemTagManager */
private $tagManager;
/** @var ISystemTagObjectMapper */
private $tagMapper;
/** @var IUser */
private $user;

protected function setUp(): void {
parent::setUp();
Expand Down
9 changes: 6 additions & 3 deletions apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@
use OCP\SystemTag\TagNotFoundException;

class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
private ISystemTagManager $tagManager;
private ISystemTagObjectMapper $tagMapper;
private IUser $user;
/** @var ISystemTagManager */
private $tagManager;
/** @var ISystemTagObjectMapper */
private $tagMapper;
/** @var IUser */
private $user;

protected function setUp(): void {
parent::setUp();
Expand Down