From 1e1286e3e2e8e4cb061ab62f82b7cef77a91d7a3 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Wed, 28 Oct 2026 15:37:01 +0700 Subject: [PATCH] security(core): patch driver IDOR, protect employee core role, harden XLSX parser, and fix timesheet concurrency race condition --- .../Admin/RolePermissionController.php | 2 +- .../Pg/GateInspectionController.php | 18 ++- .../Qma/SupportTimesheetController.php | 10 +- .../Requests/StoreVehicleActivityRequest.php | 14 +++ app/Models/UnitSupportTimesheet.php | 14 ++- app/Services/SimpleXlsxImporter.php | 4 +- resources/views/layouts/app.blade.php | 6 +- routes/web.php | 11 +- tests/Feature/SuperAdminRbacTest.php | 108 ++++++++++++++++++ 9 files changed, 155 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Admin/RolePermissionController.php b/app/Http/Controllers/Admin/RolePermissionController.php index 7c3ba57..7fd3b18 100644 --- a/app/Http/Controllers/Admin/RolePermissionController.php +++ b/app/Http/Controllers/Admin/RolePermissionController.php @@ -101,7 +101,7 @@ class RolePermissionController extends Controller $role = Role::findOrFail($roleId); // Proteksi role inti sistem - $coreRoles = ['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer']; + $coreRoles = ['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer', 'employee']; if (in_array($role->name, $coreRoles)) { return redirect()->route('admin.roles.index') ->with('error', "Aksi Ditolak: Role inti sistem [{$role->name}] tidak dapat dihapus."); diff --git a/app/Http/Controllers/Pg/GateInspectionController.php b/app/Http/Controllers/Pg/GateInspectionController.php index 3e21c5f..286d5c8 100644 --- a/app/Http/Controllers/Pg/GateInspectionController.php +++ b/app/Http/Controllers/Pg/GateInspectionController.php @@ -163,17 +163,13 @@ class GateInspectionController extends Controller $guardId = $request->input('security_guard_id') ?? ($currentGuard ? $currentGuard->id : null); if (!$guardId) { - $fallbackGuard = SecurityGuard::where('is_active', true)->first() ?? SecurityGuard::first(); - if ($fallbackGuard) { - $guardId = $fallbackGuard->id; - } else { - $request->validate([ - 'security_guard_id' => ['required', 'exists:security_guards,id'], - ], [ - 'security_guard_id.required' => 'Silakan pilih nama petugas Satpam yang melakukan pemeriksaan.', - ]); - $guardId = $request->input('security_guard_id'); - } + $request->validate([ + 'security_guard_id' => ['required', 'exists:security_guards,id'], + ], [ + 'security_guard_id.required' => 'Silakan pilih nama petugas Satpam yang melakukan pemeriksaan fisik.', + 'security_guard_id.exists' => 'Petugas Satpam yang dipilih tidak valid dalam sistem.', + ]); + $guardId = $request->input('security_guard_id'); } $activity = VehicleActivity::with(['vehicle', 'gate'])->findOrFail($id); diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 5c16753..841aabe 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -284,21 +284,23 @@ class SupportTimesheetController extends Controller : null; $operatingHours = $endMeter !== null ? max(0, $endMeter - $startMeter) : null; $shift = $validated['shift'] ?: 'Shift Siang'; - - $timesheetNo = UnitSupportTimesheet::generateTimesheetNo(Carbon::parse($validated['date'])); $updaterName = auth()->user()?->name ?? 'Admin QMA'; + $timesheetNo = null; DB::transaction(function () use ( $validated, $vehicle, $operator, - $timesheetNo, $startMeter, $endMeter, $operatingHours, $shift, - $updaterName + $updaterName, + &$timesheetNo ) { + // Generate nomor timesheet unik di dalam transaksi untuk meminimalkan bentrokan + $timesheetNo = UnitSupportTimesheet::generateTimesheetNo(Carbon::parse($validated['date'])); + // 1. Simpan Data Timesheet Heavy Equipment $timesheet = UnitSupportTimesheet::create([ 'timesheet_no' => $timesheetNo, diff --git a/app/Http/Requests/StoreVehicleActivityRequest.php b/app/Http/Requests/StoreVehicleActivityRequest.php index f101d7c..69c0bcb 100644 --- a/app/Http/Requests/StoreVehicleActivityRequest.php +++ b/app/Http/Requests/StoreVehicleActivityRequest.php @@ -67,6 +67,20 @@ class StoreVehicleActivityRequest extends FormRequest // 1. Validasi SIMPER Pengemudi (BR-01 & BR-02) $driver = Employee::find($this->input('driver_id')); if ($driver) { + // Proteksi IDOR: Karyawan biasa tidak boleh memalsukan perjalanan atas nama karyawan lain yang memiliki akun sendiri + $user = $this->user(); + if ($user) { + $userEmployee = $user->getOrCreateEmployee(); + $isStaffAdmin = $user->isSuperAdmin() || $user->isPgAdmin() || $user->isGateOfficer() || $user->isHseAdmin() || $user->isQmaAdmin(); + if (!$isStaffAdmin && $userEmployee && $driver->id !== $userEmployee->id && !empty($driver->user_id) && $driver->user_id !== $user->id) { + $validator->errors()->add( + 'driver_id', + "Akses Ditolak: Anda tidak diizinkan mencatatkan aktivitas kendaraan atas nama karyawan lain ({$driver->name}). Gunakan akun pribadi Anda." + ); + return; + } + } + if (!$driver->is_operator) { $validator->errors()->add( 'driver_id', diff --git a/app/Models/UnitSupportTimesheet.php b/app/Models/UnitSupportTimesheet.php index d811f06..169322a 100644 --- a/app/Models/UnitSupportTimesheet.php +++ b/app/Models/UnitSupportTimesheet.php @@ -62,6 +62,7 @@ class UnitSupportTimesheet extends Model /** * Generate nomor timesheet unik harian (Format: TS-US-YYYYMMDD-0001). + * Dilengkapi mitigasi tabrakan concurrency dan pengecekan soft deleted records. */ public static function generateTimesheetNo(?Carbon $date = null): string { @@ -69,7 +70,8 @@ class UnitSupportTimesheet extends Model $dateStr = $d->format('Ymd'); $prefix = "TS-US-{$dateStr}-"; - $last = self::where('timesheet_no', 'like', "{$prefix}%") + $last = self::withTrashed() + ->where('timesheet_no', 'like', "{$prefix}%") ->orderByDesc('id') ->first(); @@ -78,6 +80,14 @@ class UnitSupportTimesheet extends Model $seq = ((int) $matches[1]) + 1; } - return $prefix . str_pad((string) $seq, 4, '0', STR_PAD_LEFT); + $candidate = $prefix . str_pad((string) $seq, 4, '0', STR_PAD_LEFT); + + // Mitigasi bentrokan concurrency: cek apakah candidate sudah pernah digunakan (termasuk soft deletes) + while (self::withTrashed()->where('timesheet_no', $candidate)->exists()) { + $seq++; + $candidate = $prefix . str_pad((string) $seq, 4, '0', STR_PAD_LEFT); + } + + return $candidate; } } diff --git a/app/Services/SimpleXlsxImporter.php b/app/Services/SimpleXlsxImporter.php index 9f1ad8e..1a1dfa1 100644 --- a/app/Services/SimpleXlsxImporter.php +++ b/app/Services/SimpleXlsxImporter.php @@ -87,7 +87,7 @@ class SimpleXlsxImporter $sharedStrings = []; $sharedXmlContent = $zip->getFromName('xl/sharedStrings.xml'); if ($sharedXmlContent) { - $xml = @simplexml_load_string($sharedXmlContent); + $xml = @simplexml_load_string($sharedXmlContent, 'SimpleXMLElement', LIBXML_NONET); if ($xml && isset($xml->si)) { foreach ($xml->si as $si) { if (isset($si->t)) { @@ -112,7 +112,7 @@ class SimpleXlsxImporter return $rows; } - $xml = @simplexml_load_string($sheetXmlContent); + $xml = @simplexml_load_string($sheetXmlContent, 'SimpleXMLElement', LIBXML_NONET); $zip->close(); if (!$xml || !isset($xml->sheetData->row)) { diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index a0a2c56..fb1ff28 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -166,7 +166,7 @@