A free open source IT asset/license management system
Fixed FD-57366 - switch to fputcsv
snipe2104fcc58654
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex 69ee897bec..e74fdbb713 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -1590,8 +1590,6 @@ class ReportsController extends Controller->filter(fn ($unaccepted) => $this->currentUserCanAccessAcceptance($unaccepted))->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));- $rows = [];-$header = [trans('general.date'),trans('general.type'),@@ -1604,7 +1602,6 @@ class ReportsController extends Controller];$header = array_map('trim', $header);- $rows[] = implode(',', $header);// Formula-escape data rows using the same helper + setting as the// sibling exports in this file. Row values (company / category /@@ -1616,30 +1613,42 @@ class ReportsController extends Controller// by every other export in ReportsController.$formatter = new EscapeFormula('`');- foreach ($itemsForReport as $item) {-- if ($item != null) {+ // Build the CSV via fputcsv so cells containing commas, quotes,+ // or newlines get RFC 4180 quoted rather than concatenated into+ // the row/record stream. The prior implode(',') + implode("\n")+ // approach let a mid-cell newline become a real record break,+ // dropping the second half of the cell onto its own line where+ // EscapeFormula's leading-character check no longer applied.+ $handle = fopen('php://temp', 'r+');+ fputcsv($handle, $header);- $row = [];- $row[] = str_replace(',', '', $item->acceptance->created_at);- $row[] = str_replace(',', '', $item->type);- $row[] = str_replace(',', '', $item->plain_text_company);- $row[] = str_replace(',', '', $item->plain_text_category);- $row[] = str_replace(',', '', $item->plain_text_model);- $row[] = str_replace(',', '', $item->plain_text_name);- $row[] = str_replace(',', '', $item->asset_tag);- $row[] = str_replace(',', '', ($item->acceptance->assignedto) ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'));-- if (config('app.escape_formulas') !== false) {- $row = $formatter->escapeRecord($row);- }+ foreach ($itemsForReport as $item) {+ if ($item === null) {+ continue;+ }++ $row = [+ $item->acceptance->created_at,+ $item->type,+ $item->plain_text_company,+ $item->plain_text_category,+ $item->plain_text_model,+ $item->plain_text_name,+ $item->asset_tag,+ $item->acceptance->assignedto ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'),+ ];- $rows[] = implode(',', $row);+ if (config('app.escape_formulas') !== false) {+ $row = $formatter->escapeRecord($row);}++ fputcsv($handle, $row);}- // spit out a csv- $csv = implode("\n", $rows);+ rewind($handle);+ $csv = stream_get_contents($handle);+ fclose($handle);+$response = response()->make($csv, 200);$response->header('Content-Type', 'text/csv');$response->header('Content-disposition', 'attachment;filename=report.csv');diff --git a/tests/Feature/Reporting/AcceptanceReportCsvFormulaEscapeTest.php b/tests/Feature/Reporting/AcceptanceReportCsvFormulaEscapeTest.phpindex 86066b4e64..41da00cc89 100644--- a/tests/Feature/Reporting/AcceptanceReportCsvFormulaEscapeTest.php+++ b/tests/Feature/Reporting/AcceptanceReportCsvFormulaEscapeTest.php@@ -78,4 +78,30 @@ class AcceptanceReportCsvFormulaEscapeTest extends TestCase$this->assertStringContainsString('=SUM(A1:A9)', $body);$this->assertStringNotContainsString('`=SUM(A1:A9)', $body);}++ public function test_embedded_newline_in_cell_does_not_break_out_into_a_new_record()+ {+ // Reported by doanmanhducz as a bypass of the prior fix. Naming an+ // asset "ordinary label\n=1+1" passed the EscapeFormula check (cell+ // begins with 'o', not a formula prefix) and the manual+ // implode("\n", $rows) join then split the cell in half, dropping+ // "=1+1" onto its own line as the first field of a new record.+ $this->seedPendingAcceptanceWithAssetNamed("ordinary label\n=1+1");++ $body = $this->actingAs(User::factory()->superuser()->create())+ ->post(route('reports/export/unaccepted_assets'))+ ->assertOk()+ ->getContent();++ // Parse the response with fgetcsv (respects RFC 4180 quoting) and+ // walk every record. No first cell may be an unescaped formula.+ $handle = fopen('php://memory', 'r+');+ fwrite($handle, $body);+ rewind($handle);++ while (($record = fgetcsv($handle)) !== false) {+ $this->assertNotSame('=1+1', $record[0] ?? null, 'Formula leaked into a new record via embedded newline');+ }+ fclose($handle);+ }}