Skip to content

A free open source IT asset/license management system

Floater Scoping: Fixed FD-56007 - prevent exposing all null-company users to any company-scoped actor

snipefbe05a8df474
diff --git a/app/Models/Company.php b/app/Models/Company.php
index c32dd3d222..b4a90341ea 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -416,15 +416,9 @@ final class Company extends SnipeModel
});
}
- // Floater: also include users with no company associations (they float). They all float down here, Georgie.).
- if ($floater) {
- return $query->where(function ($q) use ($companyIds) {
- $q->whereIn('users.id', function ($sub) use ($companyIds) {
- $sub->select('user_id')->from('company_user')->whereIn('company_id', $companyIds);
- })->orWhereDoesntHave('companies');
- });
- }
-
+ // Floater mode governs whether null-company users can *receive* items (canReceiveFromCompany),
+ // not whether company-scoped actors can *manage* them. A company-scoped actor must only
+ // ever see users who share at least one company via the pivot, regardless of floater mode.
return $query->whereIn('users.id', function ($sub) use ($companyIds) {
$sub->select('user_id')->from('company_user')->whereIn('company_id', $companyIds);
});
diff --git a/tests/Unit/CompanyScopingTest.php b/tests/Unit/CompanyScopingTest.php
index dea7588644..20debb554a 100644
--- a/tests/Unit/CompanyScopingTest.php
+++ b/tests/Unit/CompanyScopingTest.php
@@ -209,6 +209,30 @@ class CompanyScopingTest extends TestCase
$this->assertCanSee($companyItem);
}
+ public function test_company_scoped_user_cannot_see_null_company_users_in_floater_mode()
+ {
+ $company = Company::factory()->create();
+ $companyUser = $company->users()->save(User::factory()->make());
+ $nullCompanyUser = User::factory()->create(['company_id' => null]);
+
+ $this->settings->enableFloaterMode();
+
+ $this->actingAs($companyUser);
+ $this->assertCannotSee($nullCompanyUser);
+ }
+
+ public function test_company_scoped_user_cannot_see_null_company_users_in_strict_mode()
+ {
+ $company = Company::factory()->create();
+ $companyUser = $company->users()->save(User::factory()->make());
+ $nullCompanyUser = User::factory()->create(['company_id' => null]);
+
+ $this->settings->enableMultipleFullCompanySupport();
+
+ $this->actingAs($companyUser);
+ $this->assertCannotSee($nullCompanyUser);
+ }
+
private function assertCanSee(Model $model)
{
$this->assertTrue(