Skip to content

Use single stream to validate custom dashboard image #32817

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

Closed
Pytal wants to merge 1 commit into from
Closed

Use single stream to validate custom dashboard image #32817

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions apps/dashboard/lib/Service/BackgroundService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
use OCP\IConfig;
use OCP\Lock\LockedException;
use OCP\PreConditionNotMetException;
use Safe\Exceptions\FilesystemException;
use function Safe\rewind;

class BackgroundService {
// true when the background is bright and need dark icons
Expand Down Expand Up @@ -144,17 +146,20 @@ public function setDefaultBackground(): void {
* @throws LockedException
* @throws PreConditionNotMetException
* @throws NoUserException
* @throws FilesystemException
*/
public function setFileBackground($path): void {
$this->config->setUserValue($this->userId, 'dashboard', 'background', 'custom');
$userFolder = $this->rootFolder->getUserFolder($this->userId);
/** @var File $file */
$file = $userFolder->get($path);
$image = new \OCP\Image();
if ($image->loadFromFileHandle($file->fopen('r')) === false) {
$stream = $file->fopen('r');
if ($image->loadFromFileHandle($stream) === false) {
throw new InvalidArgumentException('Invalid image file');
}
$this->getAppDataFolder()->newFile('background.jpg', $file->fopen('r'));
rewind($stream);
Copy link
Member

@PVince81 PVince81 Jun 13, 2022

Choose a reason for hiding this comment

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

this needs to be tested with object store, rewind might not work on all stream types (not sure if a http stream can be rewinded)

now thinking again, I see that this endpoint is only for setting a background image, something that will not happen repeatedly, so having a little performance impact here for validation is probably ok

feel free to revert back to the former solution and sorry for the noise

$this->getAppDataFolder()->newFile('background.jpg', $stream);
}

public function setShippedBackground($fileName): void {
Expand Down