From 0d50f4925b1211ee5f4b8ab16219d767dc12429f Mon Sep 17 00:00:00 2001 From: jp-Telus <86217312+jp-Telus@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:12:29 -0700 Subject: [PATCH 1/4] [jp-0241] Security update required -- 1 CRITICAL and 1 high vulnerability --- composer.lock | 14 +++++++------- package-lock.json | 28 ++++++++++++++++++---------- tests/Feature/ChallengePageTest.php | 2 ++ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/composer.lock b/composer.lock index a0ed8c64..a02fb9ff 100644 --- a/composer.lock +++ b/composer.lock @@ -5488,20 +5488,20 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.9", + "version": "1.30.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "ffb47b639649fc9c8a6fa67977a27b756592ed85" + "reference": "2f39286e0136673778b7a142b3f0d141e43d1714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/ffb47b639649fc9c8a6fa67977a27b756592ed85", - "reference": "ffb47b639649fc9c8a6fa67977a27b756592ed85", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/2f39286e0136673778b7a142b3f0d141e43d1714", + "reference": "2f39286e0136673778b7a142b3f0d141e43d1714", "shasum": "" }, "require": { - "composer/pcre": "^3.3", + "composer/pcre": "^1||^2||^3", "ext-ctype": "*", "ext-dom": "*", "ext-fileinfo": "*", @@ -5588,9 +5588,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.9" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.30.0" }, - "time": "2025-01-26T04:55:00+00:00" + "time": "2025-08-10T06:28:02+00:00" }, { "name": "phpoption/phpoption", diff --git a/package-lock.json b/package-lock.json index c2daab3c..bda51e17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8608,16 +8608,23 @@ "dev": true }, "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", "dev": true, "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" }, "bin": { "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/shallow-clone": { @@ -16405,13 +16412,14 @@ "dev": true }, "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" } }, "shallow-clone": { diff --git a/tests/Feature/ChallengePageTest.php b/tests/Feature/ChallengePageTest.php index 36e84634..145c3d36 100644 --- a/tests/Feature/ChallengePageTest.php +++ b/tests/Feature/ChallengePageTest.php @@ -253,6 +253,8 @@ public function test_authorized_user_download_daily_campaign_by_bu_report_succes $this->actingAs($this->user); $response = $this->get('/challenge/download?sort=region'); + $filename = 'Daily_Campaign_Update_Region_' . today()->format('Y-m-d') . '.xlsx'; + $setting = Setting::first(); if (today() > $setting->campaign_start_date && today() <= $setting->campaign_final_date) { From 1b1cf5b392c35606246f89a0802b4a543dbdee26 Mon Sep 17 00:00:00 2001 From: jp-Telus <86217312+jp-Telus@users.noreply.github.com> Date: Wed, 10 Sep 2025 08:21:26 -0700 Subject: [PATCH 2/4] [jp-0242] Error on DonationDataReportExport process --- app/Exports/DonationDataReportExport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Exports/DonationDataReportExport.php b/app/Exports/DonationDataReportExport.php index ba263ea1..c7bcbeec 100644 --- a/app/Exports/DonationDataReportExport.php +++ b/app/Exports/DonationDataReportExport.php @@ -112,9 +112,9 @@ public function map($row): array $row->process_history_id, $row->process_history->status, $row->process_history->end_at, - $row->process_history->created_by->name, + $row->process_history ? $row->process_history->created_by->name : '', $row->created_at, - $row->process_history->updated_by->name, + $row->process_history ? $row->process_history->updated_by->name : '', $row->updated_at ]; } From 307c03a46a6f13089774c458a605b048c33129e8 Mon Sep 17 00:00:00 2001 From: jp-Telus <86217312+jp-Telus@users.noreply.github.com> Date: Wed, 10 Sep 2025 09:48:50 -0700 Subject: [PATCH 3/4] [jp-0242] Error on DonationDataReportExport process (additional change) --- app/Exports/DonationDataReportExport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Exports/DonationDataReportExport.php b/app/Exports/DonationDataReportExport.php index c7bcbeec..305dfabf 100644 --- a/app/Exports/DonationDataReportExport.php +++ b/app/Exports/DonationDataReportExport.php @@ -112,9 +112,9 @@ public function map($row): array $row->process_history_id, $row->process_history->status, $row->process_history->end_at, - $row->process_history ? $row->process_history->created_by->name : '', + $row->process_history->created_by ? $row->process_history->created_by->name : '', $row->created_at, - $row->process_history ? $row->process_history->updated_by->name : '', + $row->process_history->updated_by ? $row->process_history->updated_by->name : '', $row->updated_at ]; } From ff05131daa9356635990d00d9e062dbfb54b004a Mon Sep 17 00:00:00 2001 From: jp-Telus <86217312+jp-Telus@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:02:01 -0700 Subject: [PATCH 4/4] [jp-0243] BCP 40c - correct error message to reflects the valid frequency options --- app/Imports/DonationsImportBCP.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Imports/DonationsImportBCP.php b/app/Imports/DonationsImportBCP.php index 24290253..d15bfd28 100644 --- a/app/Imports/DonationsImportBCP.php +++ b/app/Imports/DonationsImportBCP.php @@ -163,7 +163,7 @@ public function customValidationMessages() '1.max' => 'The 1 field must be 6 characters.', '2.numeric' => 'The 2 field must be a number', '3.date' => 'The 3 field is not a valid date', - '4.in' => 'The 4 field is invalid frequency (either Biweekly or One-Time Deduction)', + '4.in' => 'The 4 field is invalid frequency (either "Bi-Weekly" or "One-Time")', '5.numeric' => 'The 5 field must be a number', 'pledge.exists' => 'No pledge was setup for this pecsf_id.',