mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-07-15 05:41:37 +00:00
Respect the attachment max file size limit for attachment file downloads
Some checks failed
Build assets artifact / Build assets artifact (push) Has been cancelled
Docker Image Build / build (linux/amd64, amd64, ubuntu-latest) (push) Has been cancelled
Docker Image Build / build (linux/arm/v7, armv7, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build / build (linux/arm64, arm64, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/amd64, amd64, ubuntu-latest) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/arm/v7, armv7, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/arm64, arm64, ubuntu-24.04-arm) (push) Has been cancelled
Static analysis / Static analysis (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, sqlite) (push) Has been cancelled
Docker Image Build / merge (push) Has been cancelled
Docker Image Build (FrankenPHP) / merge (push) Has been cancelled
Some checks failed
Build assets artifact / Build assets artifact (push) Has been cancelled
Docker Image Build / build (linux/amd64, amd64, ubuntu-latest) (push) Has been cancelled
Docker Image Build / build (linux/arm/v7, armv7, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build / build (linux/arm64, arm64, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/amd64, amd64, ubuntu-latest) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/arm/v7, armv7, ubuntu-24.04-arm) (push) Has been cancelled
Docker Image Build (FrankenPHP) / build (linux/arm64, arm64, ubuntu-24.04-arm) (push) Has been cancelled
Static analysis / Static analysis (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, mysql) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, postgres) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.2, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.3, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.4, sqlite) (push) Has been cancelled
PHPUnit Tests / PHPUnit and coverage Test (PHP 8.5, sqlite) (push) Has been cancelled
Docker Image Build / merge (push) Has been cancelled
Docker Image Build (FrankenPHP) / merge (push) Has been cancelled
This commit is contained in:
parent
27afa013c1
commit
a356b94c34
3 changed files with 84 additions and 1 deletions
|
|
@ -78,6 +78,7 @@ class AttachmentSubmitHandler
|
||||||
protected FileTypeFilterTools $filterTools,
|
protected FileTypeFilterTools $filterTools,
|
||||||
protected AttachmentsSettings $settings,
|
protected AttachmentsSettings $settings,
|
||||||
protected readonly SVGSanitizer $SVGSanitizer,
|
protected readonly SVGSanitizer $SVGSanitizer,
|
||||||
|
private readonly AttachmentsSettings $attachmentsSettings,
|
||||||
#[Autowire(env: "bool:ALLOW_ATTACHMENT_DOWNLOADS_FROM_LOCALNETWORK")]
|
#[Autowire(env: "bool:ALLOW_ATTACHMENT_DOWNLOADS_FROM_LOCALNETWORK")]
|
||||||
private readonly bool $allow_local_network_downloads = false,
|
private readonly bool $allow_local_network_downloads = false,
|
||||||
)
|
)
|
||||||
|
|
@ -399,9 +400,30 @@ class AttachmentSubmitHandler
|
||||||
//Open a temporary file in the attachment folder
|
//Open a temporary file in the attachment folder
|
||||||
$fs->mkdir($attachment_folder);
|
$fs->mkdir($attachment_folder);
|
||||||
$fileHandler = fopen($tmp_path, 'wb');
|
$fileHandler = fopen($tmp_path, 'wb');
|
||||||
|
|
||||||
|
$bytesDownloaded = 0;
|
||||||
|
$maxSize = $this->attachmentsSettings->getMaxFileSizeInMegabytes() * 1024 * 1024; //Convert to bytes
|
||||||
|
|
||||||
//Write the downloaded data to file
|
//Write the downloaded data to file
|
||||||
foreach ($this->httpClient->stream($response) as $chunk) {
|
foreach ($this->httpClient->stream($response) as $chunk) {
|
||||||
fwrite($fileHandler, $chunk->getContent());
|
$content = $chunk->getContent();
|
||||||
|
$bytesDownloaded += strlen($content);
|
||||||
|
|
||||||
|
//Ensure the size does not get too large to avoid filling up the disk easily.
|
||||||
|
//If the file is too big, cancel the download and delete the temporary file.
|
||||||
|
if ($bytesDownloaded > $maxSize) {
|
||||||
|
$response->cancel();
|
||||||
|
fclose($fileHandler);
|
||||||
|
unlink($tmp_path); //Delete the temporary file, because it is too big
|
||||||
|
|
||||||
|
throw new AttachmentDownloadException(
|
||||||
|
sprintf(
|
||||||
|
'The downloaded file is too big! Maximum size is %d MB!',
|
||||||
|
$this->settings->getMaxFileSizeInMegabytes()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
fwrite($fileHandler, $content);
|
||||||
}
|
}
|
||||||
fclose($fileHandler);
|
fclose($fileHandler);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,4 +65,18 @@ class AttachmentsSettings
|
||||||
envVar: "bool:ATTACHMENT_SHOW_HTML_FILES", envVarMode: EnvVarMode::OVERWRITE
|
envVar: "bool:ATTACHMENT_SHOW_HTML_FILES", envVarMode: EnvVarMode::OVERWRITE
|
||||||
)]
|
)]
|
||||||
public bool $showHTMLAttachments = false;
|
public bool $showHTMLAttachments = false;
|
||||||
|
|
||||||
|
public function getMaxFileSizeInMegabytes(): int
|
||||||
|
{
|
||||||
|
$size = $this->maxFileSize;
|
||||||
|
$unit = strtoupper(substr($size, -1));
|
||||||
|
$value = (int) rtrim($size, 'KMG');
|
||||||
|
|
||||||
|
return match ($unit) {
|
||||||
|
'K' => (int) ceil($value / 1024),
|
||||||
|
'M' => $value,
|
||||||
|
'G' => $value * 1024,
|
||||||
|
default => $value, // No unit specified, assume megabytes
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
47
tests/Settings/SystemSettings/AttachmentsSettingsTest.php
Normal file
47
tests/Settings/SystemSettings/AttachmentsSettingsTest.php
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019 - 2026 Jan Böhmer (https://github.com/jbtronics)
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
|
* by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace App\Tests\Settings\SystemSettings;
|
||||||
|
|
||||||
|
use App\Settings\SystemSettings\AttachmentsSettings;
|
||||||
|
use App\Tests\SettingsTestHelper;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class AttachmentsSettingsTest extends TestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
public function testGetMaxFileSizeInMegabytes(): void
|
||||||
|
{
|
||||||
|
$settings = SettingsTestHelper::createSettingsDummy(AttachmentsSettings::class);
|
||||||
|
|
||||||
|
$settings->maxFileSize = '100M';
|
||||||
|
$this->assertEquals(100, $settings->getMaxFileSizeInMegabytes());
|
||||||
|
|
||||||
|
$settings->maxFileSize = '1G';
|
||||||
|
$this->assertEquals(1024, $settings->getMaxFileSizeInMegabytes());
|
||||||
|
|
||||||
|
//We round up to the next megabyte if the file size is smaller than 1 MB
|
||||||
|
$settings->maxFileSize = '500K';
|
||||||
|
$this->assertEquals(1, $settings->getMaxFileSizeInMegabytes());
|
||||||
|
|
||||||
|
$settings->maxFileSize = '13.5M';
|
||||||
|
$this->assertEquals(13, $settings->getMaxFileSizeInMegabytes());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue