A free open source IT asset/license management system
Fixed query scope on report templates
snipeae69e3767ee9
diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.phpindex db51070798..a0f393e80d 100644--- a/app/Http/Controllers/ReportTemplatesController.php+++ b/app/Http/Controllers/ReportTemplatesController.php@@ -34,6 +34,10 @@ class ReportTemplatesController extends Controller{$this->authorize('reports.view');+ if ($reportTemplate->created_by !== auth()->id() && ! $reportTemplate->is_shared) {+ abort(404, trans('general.generic_model_not_found', ['model' => trans('general.report_template')]));+ }+$customfields = CustomField::get();try {diff --git a/app/Models/ReportTemplate.php b/app/Models/ReportTemplate.phpindex eb6dfb5b5a..5bc1bb2b94 100644--- a/app/Models/ReportTemplate.php+++ b/app/Models/ReportTemplate.php@@ -54,13 +54,15 @@ class ReportTemplate extends Modelprotected static function booted(){- // Scope to current user or if template is shared+ // Scope to templates the current user owns OR that are marked+ // shared.static::addGlobalScope('current_user', function (Builder $builder) {-if (auth()->check()) {- $builder->where('created_by', auth()->id())- ->orWhere('is_shared', 1);+ $builder->where(function (Builder $inner) {+ $inner->where('created_by', auth()->id())+ ->orWhere('is_shared', 1);+ });}});diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex 40dcd03261..a339d98742 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -824,6 +824,7 @@ return ['select_all_none' => 'Select/Unselect All','generic_model_not_found' => 'That :model was not found or you do not have permission to access it','report_not_editable' => 'You do not have permission to edit this report template',+ 'report_template' => 'report template','deleted_models' => 'Deleted Asset Models','deleted_users' => 'Deleted Users','cost_each' => ':amount each',diff --git a/tests/Feature/Reporting/ReportTemplateShowAuthorizationTest.php b/tests/Feature/Reporting/ReportTemplateShowAuthorizationTest.phpnew file mode 100644index 0000000000..a7479246f4--- /dev/null+++ b/tests/Feature/Reporting/ReportTemplateShowAuthorizationTest.php@@ -0,0 +1,64 @@+<?php++namespace Tests\Feature\Reporting;++use App\Models\ReportTemplate;+use App\Models\User;+use Tests\TestCase;++class ReportTemplateShowAuthorizationTest extends TestCase+{+ public function test_non_creator_cannot_see_private_template_via_model_scope(): void+ {+ $creator = User::factory()->create();+ $intruder = User::factory()->canViewReports()->create();++ $private = ReportTemplate::factory()->for($creator, 'creator')->notShared()->create();++ $this->actingAs($intruder);+ $this->assertNull(+ ReportTemplate::find($private->id),+ 'Private template must not resolve via the global scope for a non-creator.',+ );+ }++ public function test_non_creator_gets_non_oracular_response_from_show_endpoint_for_private_template(): void+ {+ $creator = User::factory()->create();+ $intruder = User::factory()->canViewReports()->create();++ $private = ReportTemplate::factory()->for($creator, 'creator')->notShared()->create();++ $response = $this->actingAs($intruder)+ ->get(route('report-templates.show', $private->id));++ $response->assertRedirect(route('reports/custom'));+ $this->assertStringNotContainsString(+ $private->name,+ $response->getContent() ?: '',+ 'Response body must not contain the private template name for a non-creator.',+ );+ }++ public function test_creator_can_still_read_their_own_private_template(): void+ {+ $creator = User::factory()->canViewReports()->create();+ $private = ReportTemplate::factory()->for($creator, 'creator')->notShared()->create();++ $this->actingAs($creator)+ ->get(route('report-templates.show', $private->id))+ ->assertOk();+ }++ public function test_shared_templates_remain_readable_by_any_reports_viewer(): void+ {+ $creator = User::factory()->create();+ $viewer = User::factory()->canViewReports()->create();++ $shared = ReportTemplate::factory()->for($creator, 'creator')->shared()->create();++ $this->actingAs($viewer)+ ->get(route('report-templates.show', $shared->id))+ ->assertOk();+ }+}