A free open source IT asset/license management system
Piiiint
snipe13ffdda12e38
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex caeb56db6d..708c419a7f 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -182,7 +182,7 @@ class AcceptanceController extends Controller// This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable$encoded_logo = null;if (($settings->acceptance_pdf_logo) && (Storage::disk('public')->exists($settings->acceptance_pdf_logo))) {- $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . basename($settings->acceptance_pdf_logo)));+ $encoded_logo = base64_encode(file_get_contents(public_path().'/uploads/'.basename($settings->acceptance_pdf_logo)));}// Get the data array ready for the notifications and PDF generationdiff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.phpindex 03ba13f5d4..aab92cb810 100644--- a/app/Http/Controllers/ActionlogController.php+++ b/app/Http/Controllers/ActionlogController.php@@ -24,14 +24,13 @@ class ActionlogController extends Controller$disk = config('filesystems.default');switch (config("filesystems.disks.$disk.driver")) {-case 's3':- $file = 'private_uploads/signatures/' . $filename;+ $file = 'private_uploads/signatures/'.$filename;return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));default:$this->authorize('view', Asset::class);- $file = config('app.private_uploads') . '/signatures/' . $filename;+ $file = config('app.private_uploads').'/signatures/'.$filename;$filetype = Helper::checkUploadIsImage($file);$contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.phpindex cd772ee2ca..297e3fbc5c 100644--- a/app/Http/Controllers/Api/SettingsController.php+++ b/app/Http/Controllers/Api/SettingsController.php@@ -165,6 +165,7 @@ class SettingsController extends Controllerif (config('mail.reply_to.address') == '') {Log::debug('MAIL_REPLYTO_ADDR not set in env. Skipping mail test.');+return response()->json(['message' => trans('admin/settings/general.mail_test_no_email')], 403);}diff --git a/app/Http/Controllers/StorageProxyController.php b/app/Http/Controllers/StorageProxyController.phpindex b4ef12a9bf..b3d1eca316 100644--- a/app/Http/Controllers/StorageProxyController.php+++ b/app/Http/Controllers/StorageProxyController.php@@ -27,7 +27,7 @@ class StorageProxyController extends Controller// but Flysystem also prepends it internally on every operation.// Strip it here to avoid double-prefixing.$root = trim(config('filesystems.disks.public.root', ''), '/');- if ($root !== '' && str_starts_with($path, $root . '/')) {+ if ($root !== '' && str_starts_with($path, $root.'/')) {$path = substr($path, strlen($root) + 1);}@@ -37,12 +37,12 @@ class StorageProxyController extends Controller$mimeType = $disk->mimeType($path) ?: 'application/octet-stream';$lastModified = $disk->lastModified($path);- $etag = md5($path . $lastModified);+ $etag = md5($path.$lastModified);$size = $disk->size($path);if ($this->isNotModified($etag, $lastModified)) {return response('', 304)- ->header('ETag', '"' . $etag . '"')+ ->header('ETag', '"'.$etag.'"')->header('Cache-Control', 'public, max-age=86400');}@@ -55,8 +55,8 @@ class StorageProxyController extends Controller}, 200, ['Content-Type' => $mimeType,'Content-Length' => $size,- 'ETag' => '"' . $etag . '"',- 'Last-Modified' => gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',+ 'ETag' => '"'.$etag.'"',+ 'Last-Modified' => gmdate('D, d M Y H:i:s', $lastModified).' GMT','Cache-Control' => 'public, max-age=86400',]);}@@ -64,7 +64,7 @@ class StorageProxyController extends Controllerprivate function isNotModified(string $etag, int $lastModified): bool{$requestEtag = request()->header('If-None-Match');- if ($requestEtag && $requestEtag === '"' . $etag . '"') {+ if ($requestEtag && $requestEtag === '"'.$etag.'"') {return true;}diff --git a/app/View/Label.php b/app/View/Label.phpindex 5d0af29f68..294689ec6e 100644--- a/app/View/Label.php+++ b/app/View/Label.php@@ -110,7 +110,7 @@ class Label implements View$logo = Storage::disk('public')->path('companies/'.e($asset->company->image));} elseif (! empty($settings->label_logo)) {// Use the general site label logo, if available- $logo = Storage::disk('public')->path('/' . e(basename($settings->label_logo)));+ $logo = Storage::disk('public')->path('/'.e(basename($settings->label_logo)));} elseif (! empty($asset->is_label_preview)) {$logo = public_path('img/label-preview-logo.png');}diff --git a/tests/Feature/Security/FilenameTraversalMitigationTest.php b/tests/Feature/Security/FilenameTraversalMitigationTest.phpindex 4c624bade8..9a7fc1d041 100644--- a/tests/Feature/Security/FilenameTraversalMitigationTest.php+++ b/tests/Feature/Security/FilenameTraversalMitigationTest.php@@ -61,4 +61,3 @@ class FilenameTraversalMitigationTest extends TestCase$this->assertStringContainsString('ok', $response->streamedContent());}}-