[stable26] fix: catch ManuallyLockedException and use app context #38043
Conversation
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
The files_lock app may throw ManuallyLockedExceptions when attempting to revert a file that is currently opened. This would prevent the user from rolling back a opened file. Text and Richdocuments handle changes of the file while editing. Allow reverting files even when they are locked by these apps and let the apps handle the conflict. Signed-off-by: Max <max@nextcloud.com>
backportbot-nextcloud
bot
requested review from
artonge,
juliushaertl and
max-nextcloud
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion Note
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion Note
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); | ||
| fclose($target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
backport of #37787