Skip to content

[stable25] Require token for local editing #34564

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

Jump to bottom
Merged
blizzz merged 6 commits into from
Oct 13, 2022
Merged

[stable25] Require token for local editing #34564

blizzz merged 6 commits into from
Oct 13, 2022

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Oct 12, 2022 •
edited by nickvergessen
Loading

  • ⚠️ This backport had conflicts and is incomplete

backport of #34559

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25 milestone Oct 12, 2022
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 12, 2022
View reviewed changes
apps/files/lib/Controller/OpenLocalEditorController.php
$pathHash = sha1($path);

$entity = new OpenLocalEditor();
$entity->setUserId($this->userId);

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of setUserId cannot be null, possibly null value provided
apps/files/lib/Controller/OpenLocalEditorController.php
$pathHash = sha1($path);

try {
$entity = $this->mapper->verifyToken($this->userId, $pathHash, $token);

Check notice

Code scanning / Psalm

PossiblyNullArgument

Argument 1 of OCA\Files\Db\OpenLocalEditorMapper::verifyToken cannot be null, possibly null value provided
apps/files/lib/Db/OpenLocalEditor.php
*/
class OpenLocalEditor extends Entity {
/** @var string */
protected $userId;

Check notice

Code scanning / Psalm

PropertyNotSetInConstructor

Property OCA\Files\Db\OpenLocalEditor::$userId is not defined in constructor of OCA\Files\Db\OpenLocalEditor or in any methods called in the constructor
apps/files/lib/Db/OpenLocalEditor.php
protected $userId;

/** @var string */
protected $pathHash;

Check notice

Code scanning / Psalm

PropertyNotSetInConstructor

Property OCA\Files\Db\OpenLocalEditor::$pathHash is not defined in constructor of OCA\Files\Db\OpenLocalEditor or in any methods called in the constructor
apps/files/lib/Db/OpenLocalEditor.php
protected $pathHash;

/** @var int */
protected $expirationTime;

Check notice

Code scanning / Psalm

PropertyNotSetInConstructor

Property OCA\Files\Db\OpenLocalEditor::$expirationTime is not defined in constructor of OCA\Files\Db\OpenLocalEditor or in any methods called in the constructor
apps/files/lib/Db/OpenLocalEditor.php
protected $expirationTime;

/** @var string */
protected $token;

Check notice

Code scanning / Psalm

PropertyNotSetInConstructor

Property OCA\Files\Db\OpenLocalEditor::$token is not defined in constructor of OCA\Files\Db\OpenLocalEditor or in any methods called in the constructor
apps/files/lib/Db/OpenLocalEditorMapper.php
* @throws MultipleObjectsReturnedException
* @throws Exception
*/
public function verifyToken(string $userId, string $pathHash, string $token): OpenLocalEditor {

Check notice

Code scanning / Psalm

MoreSpecificReturnType

The declared return type 'OCA\Files\Db\OpenLocalEditor' for OCA\Files\Db\OpenLocalEditorMapper::verifyToken is more specific than the inferred return type 'OCP\AppFramework\Db\Entity'
apps/files/lib/Db/OpenLocalEditorMapper.php
->andWhere($qb->expr()->eq('path_hash', $qb->createNamedParameter($pathHash)))
->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)));

return $this->findEntity($qb);

Check notice

Code scanning / Psalm

LessSpecificReturnStatement

The type 'OCP\AppFramework\Db\Entity' is more general than the declared return type 'OCA\Files\Db\OpenLocalEditor' for OCA\Files\Db\OpenLocalEditorMapper::verifyToken
@blizzz blizzz mentioned this pull request Oct 12, 2022
Merged
2 tasks
@blizzz
Copy link
Member

blizzz commented Oct 12, 2022

@nickvergessen backport incomplete

@blizzz blizzz added the 2. developing Work in progress label Oct 12, 2022
@nickvergessen
Bump version
7da8714 
Signed-off-by: Joas Schilling <[email protected]>
@nickvergessen
Copy link
Member

nickvergessen commented Oct 13, 2022

Version in info.xml was the issue, so bumped it manually.

@nickvergessen nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 13, 2022
PVince81
PVince81 approved these changes Oct 13, 2022
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@blizzz blizzz merged commit 2a42dd4 into stable25 Oct 13, 2022
@blizzz blizzz deleted the backport/34559/stable25 branch October 13, 2022 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81 PVince81 PVince81 approved these changes

@blizzz blizzz blizzz approved these changes

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug feature: files

Projects

None yet

Milestone

Nextcloud 25

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz @nickvergessen @PVince81