feat: enforce Filament RBAC via UiEnforcement v2
This commit is contained in:
parent
a53bb3f708
commit
95ccc3008c
@ -1056,9 +1056,9 @@ ### Replaced Utilities
|
||||
</laravel-boost-guidelines>
|
||||
|
||||
## Active Technologies
|
||||
- PHP 8.4.15 (Laravel 12) + Filament v4, Livewire v3 (054-unify-runs-suitewide-session-1768601416)
|
||||
- PostgreSQL (`operation_runs` + JSONB for summary/failures/context; partial unique index for active-run dedupe) (054-unify-runs-suitewide-session-1768601416)
|
||||
- PHP 8.4.15 (Laravel 12) + Filament v5 + Livewire v4 (059-unified-badges)
|
||||
- PHP 8.4 (Laravel 12) + Filament v5 + Livewire v4
|
||||
- PostgreSQL (Sail)
|
||||
- Tailwind CSS v4
|
||||
|
||||
## Recent Changes
|
||||
- 054-unify-runs-suitewide-session-1768601416: Added PHP 8.4.15 (Laravel 12) + Filament v4, Livewire v3
|
||||
- 066-rbac-ui-enforcement-helper-v2-session-1769732329: Planned UiEnforcement v2 (spec + plan + design artifacts)
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
use App\Services\OperationRunService;
|
||||
use App\Services\Operations\BulkSelectionIdentity;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\OperationRunLinks;
|
||||
@ -34,7 +35,6 @@
|
||||
use Filament\Tables\Filters\TrashedFilter;
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use UnitEnum;
|
||||
|
||||
class BackupSetResource extends Resource
|
||||
@ -47,8 +47,7 @@ class BackupSetResource extends Resource
|
||||
|
||||
public static function canCreate(): bool
|
||||
{
|
||||
return ($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_SYNC, $tenant);
|
||||
return UiEnforcement::for(Capabilities::TENANT_SYNC)->isAllowed();
|
||||
}
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
@ -90,18 +89,16 @@ public static function table(Table $table): Table
|
||||
->url(fn (BackupSet $record) => static::getUrl('view', ['record' => $record]))
|
||||
->openUrlInNewTab(false),
|
||||
ActionGroup::make([
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->andVisibleWhen(fn (?BackupSet $record): bool => $record?->trashed() ?? false)
|
||||
->apply(
|
||||
Actions\Action::make('restore')
|
||||
->label('Restore')
|
||||
->color('success')
|
||||
->icon('heroicon-o-arrow-uturn-left')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (BackupSet $record): bool => $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->action(function (BackupSet $record, AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$record->restore();
|
||||
$record->items()->withTrashed()->restore();
|
||||
@ -122,18 +119,18 @@ public static function table(Table $table): Table
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->andVisibleWhen(fn (?BackupSet $record): bool => $record ? ! $record->trashed() : false)
|
||||
->apply(
|
||||
Actions\Action::make('archive')
|
||||
->label('Archive')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (BackupSet $record): bool => ! $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->action(function (BackupSet $record, AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$record->delete();
|
||||
|
||||
@ -153,18 +150,18 @@ public static function table(Table $table): Table
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->andVisibleWhen(fn (?BackupSet $record): bool => $record?->trashed() ?? false)
|
||||
->apply(
|
||||
Actions\Action::make('forceDelete')
|
||||
->label('Force delete')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-trash')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (BackupSet $record): bool => $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_DELETE, $tenant)))
|
||||
->action(function (BackupSet $record, AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_DELETE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->authorizeOrAbort();
|
||||
|
||||
if ($record->restoreRuns()->withTrashed()->exists()) {
|
||||
Notification::make()
|
||||
@ -195,18 +192,13 @@ public static function table(Table $table): Table
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
])->icon('heroicon-o-ellipsis-vertical'),
|
||||
])
|
||||
->bulkActions([
|
||||
BulkActionGroup::make([
|
||||
BulkAction::make('bulk_delete')
|
||||
->label('Archive Backup Sets')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->andHiddenWhen(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
|
||||
@ -214,6 +206,12 @@ public static function table(Table $table): Table
|
||||
|
||||
return $isOnlyTrashed;
|
||||
})
|
||||
->apply(
|
||||
BulkAction::make('bulk_delete')
|
||||
->label('Archive Backup Sets')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->modalDescription('This archives backup sets (soft delete). Already archived backup sets will be skipped.')
|
||||
->form(function (Collection $records) {
|
||||
if ($records->count() >= 10) {
|
||||
@ -231,17 +229,13 @@ public static function table(Table $table): Table
|
||||
return [];
|
||||
})
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -282,15 +276,10 @@ public static function table(Table $table): Table
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
),
|
||||
|
||||
BulkAction::make('bulk_restore')
|
||||
->label('Restore Backup Sets')
|
||||
->icon('heroicon-o-arrow-uturn-left')
|
||||
->color('success')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->andHiddenWhen(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
|
||||
@ -298,20 +287,22 @@ public static function table(Table $table): Table
|
||||
|
||||
return ! $isOnlyTrashed;
|
||||
})
|
||||
->apply(
|
||||
BulkAction::make('bulk_restore')
|
||||
->label('Restore Backup Sets')
|
||||
->icon('heroicon-o-arrow-uturn-left')
|
||||
->color('success')
|
||||
->requiresConfirmation()
|
||||
->modalHeading(fn (Collection $records) => "Restore {$records->count()} backup sets?")
|
||||
->modalDescription('Archived backup sets will be restored back to the active list. Active backup sets will be skipped.')
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -352,15 +343,10 @@ public static function table(Table $table): Table
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
),
|
||||
|
||||
BulkAction::make('bulk_force_delete')
|
||||
->label('Force Delete Backup Sets')
|
||||
->icon('heroicon-o-trash')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_DELETE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->andHiddenWhen(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
|
||||
@ -368,6 +354,12 @@ public static function table(Table $table): Table
|
||||
|
||||
return ! $isOnlyTrashed;
|
||||
})
|
||||
->apply(
|
||||
BulkAction::make('bulk_force_delete')
|
||||
->label('Force Delete Backup Sets')
|
||||
->icon('heroicon-o-trash')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->modalHeading(fn (Collection $records) => "Force delete {$records->count()} backup sets?")
|
||||
->modalDescription('This is permanent. Only archived backup sets will be permanently deleted; active backup sets will be skipped.')
|
||||
->form(function (Collection $records) {
|
||||
@ -386,17 +378,13 @@ public static function table(Table $table): Table
|
||||
return [];
|
||||
})
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_DELETE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -437,6 +425,7 @@ public static function table(Table $table): Table
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
namespace App\Filament\Resources\BackupSetResource\Pages;
|
||||
|
||||
use App\Filament\Resources\BackupSetResource;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
|
||||
@ -13,9 +15,7 @@ class ListBackupSets extends ListRecords
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
Actions\CreateAction::make()
|
||||
->disabled(fn (): bool => ! BackupSetResource::canCreate())
|
||||
->tooltip(fn (): ?string => BackupSetResource::canCreate() ? null : 'You do not have permission to create backup sets.'),
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(Actions\CreateAction::make()),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
use App\Models\User;
|
||||
use App\Services\OperationRunService;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\Badges\TagBadgeDomain;
|
||||
@ -24,7 +25,6 @@
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class BackupItemsRelationManager extends RelationManager
|
||||
{
|
||||
@ -131,13 +131,10 @@ public function table(Table $table): Table
|
||||
->action(function (): void {
|
||||
$this->resetTable();
|
||||
}),
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(
|
||||
Actions\Action::make('addPolicies')
|
||||
->label('Add Policies')
|
||||
->icon('heroicon-o-plus')
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_SYNC, $tenant)))
|
||||
->tooltip(fn (): ?string => (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_SYNC, $tenant)) ? null : 'You do not have permission to add policies.')
|
||||
->modalHeading('Add Policies')
|
||||
->modalSubmitAction(false)
|
||||
->modalCancelActionLabel('Close')
|
||||
@ -148,6 +145,7 @@ public function table(Table $table): Table
|
||||
'backupSetId' => $backupSet->getKey(),
|
||||
]);
|
||||
}),
|
||||
),
|
||||
])
|
||||
->actions([
|
||||
Actions\ActionGroup::make([
|
||||
@ -164,6 +162,7 @@ public function table(Table $table): Table
|
||||
})
|
||||
->hidden(fn (BackupItem $record) => ! $record->policy_id)
|
||||
->openUrlInNewTab(true),
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(
|
||||
Actions\Action::make('remove')
|
||||
->label('Remove')
|
||||
->color('danger')
|
||||
@ -171,25 +170,14 @@ public function table(Table $table): Table
|
||||
->requiresConfirmation()
|
||||
->action(function (BackupItem $record): void {
|
||||
$backupSet = $this->getOwnerRecord();
|
||||
$tenant = $backupSet->tenant;
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($tenant);
|
||||
|
||||
/** @var User $user */
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$tenant = $backupSet->tenant ?? Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant)) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if ((int) $tenant->getKey() !== (int) $backupSet->tenant_id) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$backupItemIds = [(int) $record->getKey()];
|
||||
|
||||
@ -238,10 +226,12 @@ public function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
])->icon('heroicon-o-ellipsis-vertical'),
|
||||
])
|
||||
->bulkActions([
|
||||
Actions\BulkActionGroup::make([
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(
|
||||
Actions\BulkAction::make('bulk_remove')
|
||||
->label('Remove selected')
|
||||
->icon('heroicon-o-x-mark')
|
||||
@ -254,25 +244,14 @@ public function table(Table $table): Table
|
||||
}
|
||||
|
||||
$backupSet = $this->getOwnerRecord();
|
||||
$tenant = $backupSet->tenant;
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($tenant);
|
||||
|
||||
/** @var User $user */
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$tenant = $backupSet->tenant ?? Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant)) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if ((int) $tenant->getKey() !== (int) $backupSet->tenant_id) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$backupItemIds = $records
|
||||
->pluck('id')
|
||||
@ -332,6 +311,7 @@ public function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
use App\Services\Directory\EntraGroupSelection;
|
||||
use App\Services\OperationRunService;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\OperationRunLinks;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class ListEntraGroups extends ListRecords
|
||||
{
|
||||
@ -30,80 +30,20 @@ protected function getHeaderActions(): array
|
||||
->url(fn (): string => EntraGroupSyncRunResource::getUrl('index', tenant: Tenant::current()))
|
||||
->visible(fn (): bool => (bool) Tenant::current()),
|
||||
|
||||
Action::make('sync_groups')
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(Action::make('sync_groups')
|
||||
->label('Sync Groups')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('warning')
|
||||
->visible(function (): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! $user->canAccessTenant($tenant)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to sync groups.';
|
||||
})
|
||||
->action(function (): void {
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->authorizeOrAbort();
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant) {
|
||||
abort(403);
|
||||
if (! $user instanceof User || ! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (! $user->canAccessTenant($tenant)) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant), 403);
|
||||
|
||||
$selectionKey = EntraGroupSelection::allGroupsV1();
|
||||
|
||||
// --- Phase 3: Canonical Operation Run Start ---
|
||||
@ -182,7 +122,7 @@ protected function getHeaderActions(): array
|
||||
])
|
||||
->sendToDatabase($user)
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
use App\Notifications\RunStatusChangedNotification;
|
||||
use App\Services\Directory\EntraGroupSelection;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class ListEntraGroupSyncRuns extends ListRecords
|
||||
{
|
||||
@ -21,48 +21,21 @@ class ListEntraGroupSyncRuns extends ListRecords
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(
|
||||
Action::make('sync_groups')
|
||||
->label('Sync Groups')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('warning')
|
||||
->visible(function (): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! $user->canAccessTenant($tenant)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant);
|
||||
})
|
||||
->action(function (): void {
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->authorizeOrAbort();
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant) {
|
||||
abort(403);
|
||||
if (! $user instanceof User || ! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (! $user->canAccessTenant($tenant)) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant), 403);
|
||||
|
||||
$selectionKey = EntraGroupSelection::allGroupsV1();
|
||||
|
||||
$existing = EntraGroupSyncRun::query()
|
||||
@ -107,6 +80,7 @@ protected function getHeaderActions(): array
|
||||
'status' => 'queued',
|
||||
]));
|
||||
}),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
use App\Services\Inventory\DependencyQueryService;
|
||||
use App\Services\Inventory\DependencyTargets\DependencyTargetResolver;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\Badges\TagBadgeDomain;
|
||||
@ -17,6 +18,7 @@
|
||||
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
||||
use BackedEnum;
|
||||
use Filament\Actions;
|
||||
use Filament\Facades\Filament;
|
||||
use Filament\Infolists\Components\TextEntry;
|
||||
use Filament\Infolists\Components\ViewEntry;
|
||||
use Filament\Resources\Resource;
|
||||
@ -26,7 +28,6 @@
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use UnitEnum;
|
||||
|
||||
class InventoryItemResource extends Resource
|
||||
@ -43,21 +44,18 @@ class InventoryItemResource extends Resource
|
||||
|
||||
public static function canViewAny(): bool
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_VIEW, $tenant);
|
||||
return UiEnforcement::for(Capabilities::TENANT_VIEW)->isAllowed();
|
||||
}
|
||||
|
||||
public static function canView(Model $record): bool
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
$tenant = Filament::getTenant();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! Gate::allows(Capabilities::TENANT_VIEW, $tenant)) {
|
||||
if (! UiEnforcement::for(Capabilities::TENANT_VIEW)->isAllowed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
use App\Services\Inventory\InventorySyncService;
|
||||
use App\Services\OperationRunService;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
||||
use App\Support\OperationRunLinks;
|
||||
use App\Support\OpsUx\OperationUxPresenter;
|
||||
@ -24,7 +25,6 @@
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
use Filament\Support\Enums\Size;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class ListInventoryItems extends ListRecords
|
||||
{
|
||||
@ -40,6 +40,7 @@ protected function getHeaderWidgets(): array
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->apply(
|
||||
Action::make('run_inventory_sync')
|
||||
->label('Run Inventory Sync')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
@ -105,64 +106,14 @@ protected function getHeaderActions(): array
|
||||
->default(fn (): ?string => Tenant::current()?->getKey())
|
||||
->dehydrated(),
|
||||
])
|
||||
->visible(function (): bool {
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->canAccessTenant($tenant);
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to start inventory sync.';
|
||||
})
|
||||
->action(function (array $data, self $livewire, InventorySyncService $inventorySyncService, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
if (! $tenant instanceof Tenant) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$user = auth()->user();
|
||||
if (! $user instanceof User) {
|
||||
abort(403, 'Not allowed');
|
||||
}
|
||||
|
||||
if (! $user->canAccessTenant($tenant)) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant)) {
|
||||
abort(403, 'Not allowed');
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$requestedTenantId = $data['tenant_id'] ?? null;
|
||||
@ -172,7 +123,7 @@ protected function getHeaderActions(): array
|
||||
->danger()
|
||||
->send();
|
||||
|
||||
abort(403, 'Not allowed');
|
||||
throw new \Symfony\Component\HttpKernel\Exception\HttpException(403, 'Not allowed');
|
||||
}
|
||||
|
||||
$selectionPayload = $inventorySyncService->defaultSelectionPayload();
|
||||
@ -278,6 +229,7 @@ protected function getHeaderActions(): array
|
||||
|
||||
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
||||
}),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,11 +7,13 @@
|
||||
use App\Models\InventorySyncRun;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\OperationRunLinks;
|
||||
use BackedEnum;
|
||||
use Filament\Actions;
|
||||
use Filament\Facades\Filament;
|
||||
use Filament\Infolists\Components\TextEntry;
|
||||
use Filament\Infolists\Components\ViewEntry;
|
||||
use Filament\Resources\Resource;
|
||||
@ -21,7 +23,6 @@
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use UnitEnum;
|
||||
|
||||
class InventorySyncRunResource extends Resource
|
||||
@ -40,21 +41,18 @@ class InventorySyncRunResource extends Resource
|
||||
|
||||
public static function canViewAny(): bool
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_VIEW, $tenant);
|
||||
return UiEnforcement::for(Capabilities::TENANT_VIEW)->isAllowed();
|
||||
}
|
||||
|
||||
public static function canView(Model $record): bool
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
$tenant = Filament::getTenant();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! Gate::allows(Capabilities::TENANT_VIEW, $tenant)) {
|
||||
if (! UiEnforcement::for(Capabilities::TENANT_VIEW)->isAllowed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
use App\Services\Providers\CredentialManager;
|
||||
use App\Services\Providers\ProviderOperationStartGate;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\OperationRunLinks;
|
||||
@ -29,7 +30,6 @@
|
||||
use Filament\Tables\Filters\SelectFilter;
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use UnitEnum;
|
||||
|
||||
class ProviderConnectionResource extends Resource
|
||||
@ -55,17 +55,17 @@ public static function form(Schema $schema): Schema
|
||||
TextInput::make('display_name')
|
||||
->label('Display name')
|
||||
->required()
|
||||
->disabled(fn (): bool => ! Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current()))
|
||||
->disabled(fn (): bool => ! UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->isAllowed())
|
||||
->maxLength(255),
|
||||
TextInput::make('entra_tenant_id')
|
||||
->label('Entra tenant ID')
|
||||
->required()
|
||||
->maxLength(255)
|
||||
->disabled(fn (): bool => ! Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current()))
|
||||
->disabled(fn (): bool => ! UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->isAllowed())
|
||||
->rules(['uuid']),
|
||||
Toggle::make('is_default')
|
||||
->label('Default connection')
|
||||
->disabled(fn (): bool => ! Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current()))
|
||||
->disabled(fn (): bool => ! UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->isAllowed())
|
||||
->helperText('Exactly one default connection is required per tenant/provider.'),
|
||||
TextInput::make('status')
|
||||
->label('Status')
|
||||
@ -146,55 +146,25 @@ public static function table(Table $table): Table
|
||||
])
|
||||
->actions([
|
||||
Actions\ActionGroup::make([
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(
|
||||
Actions\EditAction::make(),
|
||||
),
|
||||
|
||||
Actions\Action::make('check_connection')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->apply(Actions\Action::make('check_connection')
|
||||
->label('Check connection')
|
||||
->icon('heroicon-o-check-badge')
|
||||
->color('success')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->canAccessTenant($tenant) && $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -252,55 +222,23 @@ public static function table(Table $table): Table
|
||||
->url(OperationRunLinks::view($result->run, $tenant)),
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('inventory_sync')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->apply(Actions\Action::make('inventory_sync')
|
||||
->label('Inventory sync')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('info')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->canAccessTenant($tenant) && $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -358,55 +296,23 @@ public static function table(Table $table): Table
|
||||
->url(OperationRunLinks::view($result->run, $tenant)),
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('compliance_snapshot')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->apply(Actions\Action::make('compliance_snapshot')
|
||||
->label('Compliance snapshot')
|
||||
->icon('heroicon-o-shield-check')
|
||||
->color('info')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->canAccessTenant($tenant) && $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -464,19 +370,21 @@ public static function table(Table $table): Table
|
||||
->url(OperationRunLinks::view($result->run, $tenant)),
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('set_default')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(Actions\Action::make('set_default')
|
||||
->label('Set as default')
|
||||
->icon('heroicon-o-star')
|
||||
->color('primary')
|
||||
->visible(fn (ProviderConnection $record): bool => Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current())
|
||||
&& $record->status !== 'disabled'
|
||||
&& ! $record->is_default)
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status !== 'disabled' && ! $record->is_default)
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$record->makeDefault();
|
||||
|
||||
@ -506,14 +414,13 @@ public static function table(Table $table): Table
|
||||
->title('Default connection updated')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('update_credentials')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(Actions\Action::make('update_credentials')
|
||||
->label('Update credentials')
|
||||
->icon('heroicon-o-key')
|
||||
->color('primary')
|
||||
->modalDescription('Client secret is stored encrypted and will never be shown again.')
|
||||
->visible(fn (): bool => Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current()))
|
||||
->form([
|
||||
TextInput::make('client_id')
|
||||
->label('Client ID')
|
||||
@ -526,9 +433,13 @@ public static function table(Table $table): Table
|
||||
->maxLength(255),
|
||||
])
|
||||
->action(function (array $data, ProviderConnection $record, CredentialManager $credentials, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$credentials->upsertClientSecretCredential(
|
||||
connection: $record,
|
||||
@ -562,18 +473,21 @@ public static function table(Table $table): Table
|
||||
->title('Credentials updated')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('enable_connection')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(Actions\Action::make('enable_connection')
|
||||
->label('Enable connection')
|
||||
->icon('heroicon-o-play')
|
||||
->color('success')
|
||||
->visible(fn (ProviderConnection $record): bool => Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current())
|
||||
&& $record->status === 'disabled')
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status === 'disabled')
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$hadCredentials = $record->credential()->exists();
|
||||
$status = $hadCredentials ? 'connected' : 'needs_consent';
|
||||
@ -626,19 +540,22 @@ public static function table(Table $table): Table
|
||||
->title('Provider connection enabled')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
|
||||
Actions\Action::make('disable_connection')
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(Actions\Action::make('disable_connection')
|
||||
->label('Disable connection')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (ProviderConnection $record): bool => Gate::allows(Capabilities::PROVIDER_MANAGE, Tenant::current())
|
||||
&& $record->status !== 'disabled')
|
||||
->visible(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$previousStatus = (string) $record->status;
|
||||
|
||||
@ -673,7 +590,7 @@ public static function table(Table $table): Table
|
||||
->title('Provider connection disabled')
|
||||
->warning()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
])
|
||||
->label('Actions')
|
||||
->icon('heroicon-o-ellipsis-vertical')
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
use App\Services\Providers\CredentialManager;
|
||||
use App\Services\Providers\ProviderOperationStartGate;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\OperationRunLinks;
|
||||
use Filament\Actions;
|
||||
use Filament\Actions\Action;
|
||||
@ -21,7 +22,6 @@
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\Pages\EditRecord;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class EditProviderConnection extends EditRecord
|
||||
{
|
||||
@ -108,24 +108,27 @@ protected function afterSave(): void
|
||||
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
return [
|
||||
Actions\DeleteAction::make()
|
||||
->visible(false),
|
||||
|
||||
Actions\ActionGroup::make([
|
||||
Action::make('view_last_check_run')
|
||||
->label('View last check run')
|
||||
->icon('heroicon-o-eye')
|
||||
->color('gray')
|
||||
->visible(fn (ProviderConnection $record): bool => $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::PROVIDER_VIEW, $tenant)
|
||||
UiEnforcement::for(Capabilities::PROVIDER_VIEW)
|
||||
->andVisibleWhen(function (ProviderConnection $record): bool {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& OperationRun::query()
|
||||
->where('tenant_id', $tenant->getKey())
|
||||
->where('type', 'provider.connection.check')
|
||||
->where('context->provider_connection_id', (int) $record->getKey())
|
||||
->exists())
|
||||
->exists();
|
||||
})
|
||||
->apply(
|
||||
Action::make('view_last_check_run')
|
||||
->label('View last check run')
|
||||
->icon('heroicon-o-eye')
|
||||
->color('gray')
|
||||
->url(function (ProviderConnection $record): ?string {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
@ -146,50 +149,25 @@ protected function getHeaderActions(): array
|
||||
|
||||
return OperationRunLinks::view($run, $tenant);
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)
|
||||
->andVisibleWhen(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->apply(
|
||||
Action::make('check_connection')
|
||||
->label('Check connection')
|
||||
->icon('heroicon-o-check-badge')
|
||||
->color('success')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& $user instanceof User
|
||||
&& $user->canAccessTenant($tenant)
|
||||
&& $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -248,13 +226,14 @@ protected function getHeaderActions(): array
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(
|
||||
Action::make('update_credentials')
|
||||
->label('Update credentials')
|
||||
->icon('heroicon-o-key')
|
||||
->color('primary')
|
||||
->modalDescription('Client secret is stored encrypted and will never be shown again.')
|
||||
->visible(fn (): bool => $tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant))
|
||||
->form([
|
||||
TextInput::make('client_id')
|
||||
->label('Client ID')
|
||||
@ -267,9 +246,13 @@ protected function getHeaderActions(): array
|
||||
->maxLength(255),
|
||||
])
|
||||
->action(function (array $data, ProviderConnection $record, CredentialManager $credentials, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$credentials->upsertClientSecretCredential(
|
||||
connection: $record,
|
||||
@ -304,23 +287,33 @@ protected function getHeaderActions(): array
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)
|
||||
->andVisibleWhen(function (ProviderConnection $record): bool {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
return $record->status !== 'disabled'
|
||||
&& ! $record->is_default
|
||||
&& $tenant instanceof Tenant
|
||||
&& ProviderConnection::query()
|
||||
->where('tenant_id', $tenant->getKey())
|
||||
->where('provider', $record->provider)
|
||||
->count() > 1;
|
||||
})
|
||||
->apply(
|
||||
Action::make('set_default')
|
||||
->label('Set as default')
|
||||
->icon('heroicon-o-star')
|
||||
->color('primary')
|
||||
->visible(fn (ProviderConnection $record): bool => $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant)
|
||||
&& $record->status !== 'disabled'
|
||||
&& ! $record->is_default
|
||||
&& ProviderConnection::query()
|
||||
->where('tenant_id', $tenant->getKey())
|
||||
->where('provider', $record->provider)
|
||||
->count() > 1)
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$record->makeDefault();
|
||||
|
||||
@ -351,50 +344,25 @@ protected function getHeaderActions(): array
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)
|
||||
->andVisibleWhen(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->apply(
|
||||
Action::make('inventory_sync')
|
||||
->label('Inventory sync')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('info')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& $user instanceof User
|
||||
&& $user->canAccessTenant($tenant)
|
||||
&& $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -453,50 +421,25 @@ protected function getHeaderActions(): array
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)
|
||||
->andVisibleWhen(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->apply(
|
||||
Action::make('compliance_snapshot')
|
||||
->label('Compliance snapshot')
|
||||
->icon('heroicon-o-shield-check')
|
||||
->color('info')
|
||||
->visible(function (ProviderConnection $record): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
return $tenant instanceof Tenant
|
||||
&& $user instanceof User
|
||||
&& $user->canAccessTenant($tenant)
|
||||
&& $record->status !== 'disabled';
|
||||
})
|
||||
->disabled(function (): bool {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to run provider operations.';
|
||||
})
|
||||
->action(function (ProviderConnection $record, ProviderOperationStartGate $gate): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_RUN)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant, 404);
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($tenant), 404);
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::PROVIDER_RUN, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
|
||||
$initiator = $user;
|
||||
|
||||
$result = $gate->start(
|
||||
@ -555,18 +498,23 @@ protected function getHeaderActions(): array
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)
|
||||
->andVisibleWhen(fn (ProviderConnection $record): bool => $record->status === 'disabled')
|
||||
->apply(
|
||||
Action::make('enable_connection')
|
||||
->label('Enable connection')
|
||||
->icon('heroicon-o-play')
|
||||
->color('success')
|
||||
->visible(fn (ProviderConnection $record): bool => $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant)
|
||||
&& $record->status === 'disabled')
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$hadCredentials = $record->credential()->exists();
|
||||
$status = $hadCredentials ? 'connected' : 'needs_consent';
|
||||
@ -620,19 +568,24 @@ protected function getHeaderActions(): array
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)
|
||||
->andVisibleWhen(fn (ProviderConnection $record): bool => $record->status !== 'disabled')
|
||||
->apply(
|
||||
Action::make('disable_connection')
|
||||
->label('Disable connection')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (ProviderConnection $record): bool => $tenant instanceof Tenant
|
||||
&& Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant)
|
||||
&& $record->status !== 'disabled')
|
||||
->action(function (ProviderConnection $record, AuditLogger $auditLogger): void {
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
$previousStatus = (string) $record->status;
|
||||
|
||||
@ -668,6 +621,7 @@ protected function getHeaderActions(): array
|
||||
->warning()
|
||||
->send();
|
||||
}),
|
||||
),
|
||||
])
|
||||
->label('Actions')
|
||||
->icon('heroicon-o-ellipsis-vertical')
|
||||
@ -677,9 +631,7 @@ protected function getHeaderActions(): array
|
||||
|
||||
protected function getFormActions(): array
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
if ($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant)) {
|
||||
if (UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->isAllowed()) {
|
||||
return parent::getFormActions();
|
||||
}
|
||||
|
||||
@ -690,9 +642,7 @@ protected function getFormActions(): array
|
||||
|
||||
protected function handleRecordUpdate(Model $record, array $data): Model
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::PROVIDER_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->authorizeOrAbort();
|
||||
|
||||
return parent::handleRecordUpdate($record, $data);
|
||||
}
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
namespace App\Filament\Resources\ProviderConnectionResource\Pages;
|
||||
|
||||
use App\Filament\Resources\ProviderConnectionResource;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
|
||||
@ -13,11 +15,9 @@ class ListProviderConnections extends ListRecords
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
Actions\CreateAction::make()
|
||||
->disabled(fn (): bool => ! \Illuminate\Support\Facades\Gate::allows(\App\Support\Auth\Capabilities::PROVIDER_MANAGE, \App\Models\Tenant::current()))
|
||||
->tooltip(fn (): ?string => \Illuminate\Support\Facades\Gate::allows(\App\Support\Auth\Capabilities::PROVIDER_MANAGE, \App\Models\Tenant::current())
|
||||
? null
|
||||
: 'You do not have permission to create provider connections.'),
|
||||
UiEnforcement::for(Capabilities::PROVIDER_MANAGE)->apply(
|
||||
Actions\CreateAction::make(),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
use App\Services\OperationRunService;
|
||||
use App\Services\Operations\BulkSelectionIdentity;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\OperationRunLinks;
|
||||
@ -50,7 +51,6 @@
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Database\QueryException;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use UnitEnum;
|
||||
@ -65,8 +65,7 @@ class RestoreRunResource extends Resource
|
||||
|
||||
public static function canCreate(): bool
|
||||
{
|
||||
return ($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant);
|
||||
return UiEnforcement::for(Capabilities::TENANT_MANAGE)->isAllowed();
|
||||
}
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
@ -748,7 +747,7 @@ public static function table(Table $table): Table
|
||||
->actions([
|
||||
Actions\ViewAction::make(),
|
||||
ActionGroup::make([
|
||||
Actions\Action::make('rerun')
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->preserveVisibility()->apply(Actions\Action::make('rerun')
|
||||
->label('Rerun')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('primary')
|
||||
@ -761,17 +760,13 @@ public static function table(Table $table): Table
|
||||
&& $backupSet !== null
|
||||
&& ! $backupSet->trashed();
|
||||
})
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->action(function (
|
||||
RestoreRun $record,
|
||||
RestoreService $restoreService,
|
||||
\App\Services\Intune\AuditLogger $auditLogger,
|
||||
HasTable $livewire
|
||||
) {
|
||||
$currentTenant = Tenant::current();
|
||||
|
||||
abort_unless($currentTenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $currentTenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = $record->tenant;
|
||||
$backupSet = $record->backupSet;
|
||||
@ -932,19 +927,15 @@ public static function table(Table $table): Table
|
||||
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
||||
OperationUxPresenter::queuedToast('restore.execute')
|
||||
->send();
|
||||
}),
|
||||
Actions\Action::make('restore')
|
||||
})),
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->preserveVisibility()->apply(Actions\Action::make('restore')
|
||||
->label('Restore')
|
||||
->color('success')
|
||||
->icon('heroicon-o-arrow-uturn-left')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (RestoreRun $record): bool => $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->action(function (RestoreRun $record, \App\Services\Intune\AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$record->restore();
|
||||
|
||||
@ -963,19 +954,15 @@ public static function table(Table $table): Table
|
||||
->title('Restore run restored')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
Actions\Action::make('archive')
|
||||
})),
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->preserveVisibility()->apply(Actions\Action::make('archive')
|
||||
->label('Archive')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (RestoreRun $record): bool => ! $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->action(function (RestoreRun $record, \App\Services\Intune\AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
if (! $record->isDeletable()) {
|
||||
Notification::make()
|
||||
@ -1004,19 +991,15 @@ public static function table(Table $table): Table
|
||||
->title('Restore run archived')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
Actions\Action::make('forceDelete')
|
||||
})),
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->preserveVisibility()->apply(Actions\Action::make('forceDelete')
|
||||
->label('Force delete')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-trash')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (RestoreRun $record): bool => $record->trashed())
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_DELETE, $tenant)))
|
||||
->action(function (RestoreRun $record, \App\Services\Intune\AuditLogger $auditLogger) {
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_DELETE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->authorizeOrAbort();
|
||||
|
||||
if ($record->tenant) {
|
||||
$auditLogger->log(
|
||||
@ -1035,18 +1018,16 @@ public static function table(Table $table): Table
|
||||
->title('Restore run permanently deleted')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
])->icon('heroicon-o-ellipsis-vertical'),
|
||||
])
|
||||
->bulkActions([
|
||||
BulkActionGroup::make([
|
||||
BulkAction::make('bulk_delete')
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->preserveVisibility()->apply(BulkAction::make('bulk_delete')
|
||||
->label('Archive Restore Runs')
|
||||
->icon('heroicon-o-trash')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
@ -1071,17 +1052,13 @@ public static function table(Table $table): Table
|
||||
return [];
|
||||
})
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -1121,15 +1098,13 @@ public static function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
->deselectRecordsAfterCompletion()),
|
||||
|
||||
BulkAction::make('bulk_restore')
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->preserveVisibility()->apply(BulkAction::make('bulk_restore')
|
||||
->label('Restore Restore Runs')
|
||||
->icon('heroicon-o-arrow-uturn-left')
|
||||
->color('success')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_MANAGE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
@ -1141,17 +1116,13 @@ public static function table(Table $table): Table
|
||||
->modalHeading(fn (Collection $records) => "Restore {$records->count()} restore runs?")
|
||||
->modalDescription('Archived runs will be restored back to the active list. Active runs will be skipped.')
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -1202,15 +1173,13 @@ public static function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
->deselectRecordsAfterCompletion()),
|
||||
|
||||
BulkAction::make('bulk_force_delete')
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->preserveVisibility()->apply(BulkAction::make('bulk_force_delete')
|
||||
->label('Force Delete Restore Runs')
|
||||
->icon('heroicon-o-trash')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->disabled(fn (): bool => ! (($tenant = Tenant::current()) instanceof Tenant
|
||||
&& Gate::allows(Capabilities::TENANT_DELETE, $tenant)))
|
||||
->hidden(function (HasTable $livewire): bool {
|
||||
$trashedFilterState = $livewire->getTableFilterState(TrashedFilter::class) ?? [];
|
||||
$value = $trashedFilterState['value'] ?? null;
|
||||
@ -1231,17 +1200,13 @@ public static function table(Table $table): Table
|
||||
]),
|
||||
])
|
||||
->action(function (Collection $records) {
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->authorizeOrAbort();
|
||||
|
||||
$tenant = Tenant::current();
|
||||
$user = auth()->user();
|
||||
$count = $records->count();
|
||||
$ids = $records->pluck('id')->toArray();
|
||||
|
||||
if (! $tenant instanceof Tenant) {
|
||||
return;
|
||||
}
|
||||
|
||||
abort_unless(Gate::allows(Capabilities::TENANT_DELETE, $tenant), 403);
|
||||
|
||||
$initiator = $user instanceof User ? $user : null;
|
||||
|
||||
/** @var BulkSelectionIdentity $selection */
|
||||
@ -1292,7 +1257,7 @@ public static function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
->deselectRecordsAfterCompletion()),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
@ -1491,17 +1456,15 @@ private static function restoreItemGroupedOptions(?int $backupSetId): array
|
||||
|
||||
public static function createRestoreRun(array $data): RestoreRun
|
||||
{
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
|
||||
/** @var Tenant $tenant */
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
|
||||
/** @var BackupSet $backupSet */
|
||||
$backupSet = BackupSet::findOrFail($data['backup_set_id']);
|
||||
|
||||
if ($backupSet->tenant_id !== $tenant->id) {
|
||||
abort(403, 'Backup set does not belong to the active tenant.');
|
||||
}
|
||||
$backupSet = BackupSet::query()
|
||||
->where('tenant_id', $tenant->getKey())
|
||||
->findOrFail($data['backup_set_id']);
|
||||
|
||||
/** @var RestoreService $service */
|
||||
$service = app(RestoreService::class);
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
use App\Models\BackupSet;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Resources\Pages\Concerns\HasWizard;
|
||||
use Filament\Resources\Pages\CreateRecord;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Livewire\Attributes\On;
|
||||
|
||||
class CreateRestoreRun extends CreateRecord
|
||||
@ -21,9 +21,7 @@ class CreateRestoreRun extends CreateRecord
|
||||
|
||||
protected function authorizeAccess(): void
|
||||
{
|
||||
$tenant = Tenant::current();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && Gate::allows(Capabilities::TENANT_MANAGE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->authorizeOrAbort();
|
||||
}
|
||||
|
||||
public function getSteps(): array
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
namespace App\Filament\Resources\RestoreRunResource\Pages;
|
||||
|
||||
use App\Filament\Resources\RestoreRunResource;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
|
||||
@ -13,9 +15,7 @@ class ListRestoreRuns extends ListRecords
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
Actions\CreateAction::make()
|
||||
->disabled(fn (): bool => ! RestoreRunResource::canCreate())
|
||||
->tooltip(fn (): ?string => RestoreRunResource::canCreate() ? null : 'You do not have permission to create restore runs.'),
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->apply(Actions\CreateAction::make()),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
use App\Services\OperationRunService;
|
||||
use App\Services\Operations\BulkSelectionIdentity;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Badges\BadgeDomain;
|
||||
use App\Support\Badges\BadgeRenderer;
|
||||
use App\Support\Badges\TagBadgeDomain;
|
||||
@ -43,7 +44,6 @@
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Str;
|
||||
use Throwable;
|
||||
@ -73,24 +73,16 @@ public static function canCreate(): bool
|
||||
|
||||
public static function canEdit(Model $record): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record);
|
||||
return UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->tenantFromRecord()
|
||||
->isAllowed($record);
|
||||
}
|
||||
|
||||
public static function canDelete(Model $record): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record);
|
||||
return UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->isAllowed($record);
|
||||
}
|
||||
|
||||
public static function canDeleteAny(): bool
|
||||
@ -106,36 +98,30 @@ public static function canDeleteAny(): bool
|
||||
|
||||
private static function userCanManageAnyTenant(User $user): bool
|
||||
{
|
||||
$tenantIds = $user->tenants()->withTrashed()->pluck('tenants.id');
|
||||
$roles = RoleCapabilityMap::rolesWithCapability(Capabilities::TENANT_MANAGE);
|
||||
|
||||
if ($tenantIds->isEmpty()) {
|
||||
if ($roles === []) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (Tenant::query()->whereIn('id', $tenantIds)->cursor() as $tenant) {
|
||||
if (Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $tenant)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return $user->tenants()
|
||||
->withTrashed()
|
||||
->wherePivotIn('role', $roles)
|
||||
->exists();
|
||||
}
|
||||
|
||||
private static function userCanDeleteAnyTenant(User $user): bool
|
||||
{
|
||||
$tenantIds = $user->tenants()->withTrashed()->pluck('tenants.id');
|
||||
$roles = RoleCapabilityMap::rolesWithCapability(Capabilities::TENANT_DELETE);
|
||||
|
||||
if ($tenantIds->isEmpty()) {
|
||||
if ($roles === []) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (Tenant::query()->whereIn('id', $tenantIds)->cursor() as $tenant) {
|
||||
if (Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $tenant)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return $user->tenants()
|
||||
->withTrashed()
|
||||
->wherePivotIn('role', $roles)
|
||||
->exists();
|
||||
}
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
@ -274,49 +260,19 @@ public static function table(Table $table): Table
|
||||
->label('View')
|
||||
->icon('heroicon-o-eye')
|
||||
->url(fn (Tenant $record) => static::getUrl('view', ['record' => $record], tenant: $record)),
|
||||
Actions\Action::make('syncTenant')
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)->tenantFromRecord()->apply(Actions\Action::make('syncTenant')
|
||||
->label('Sync')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('warning')
|
||||
->requiresConfirmation()
|
||||
->visible(function (Tenant $record): bool {
|
||||
if (! $record->isActive()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->canAccessTenant($record);
|
||||
})
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $record);
|
||||
})
|
||||
->tooltip(function (Tenant $record): ?string {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $record)
|
||||
? null
|
||||
: 'You do not have permission to sync this tenant.';
|
||||
})
|
||||
->visible(fn (Tenant $record): bool => $record->isActive())
|
||||
->action(function (Tenant $record, AuditLogger $auditLogger, \Filament\Tables\Contracts\HasTable $livewire): void {
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
/** @var User $user */
|
||||
$user = auth()->user();
|
||||
abort_unless($user instanceof User, 403);
|
||||
abort_unless($user->canAccessTenant($record), 404);
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $record), 403);
|
||||
|
||||
/** @var OperationRunService $opService */
|
||||
$opService = app(OperationRunService::class);
|
||||
@ -337,7 +293,7 @@ public static function table(Table $table): Table
|
||||
tenant: $record,
|
||||
type: 'policy.sync',
|
||||
inputs: $inputs,
|
||||
initiator: auth()->user()
|
||||
initiator: $user
|
||||
);
|
||||
|
||||
if (! $opRun->wasRecentlyCreated && $opService->isStaleQueuedRun($opRun)) {
|
||||
@ -350,7 +306,7 @@ public static function table(Table $table): Table
|
||||
tenant: $record,
|
||||
type: 'policy.sync',
|
||||
inputs: $inputs,
|
||||
initiator: auth()->user()
|
||||
initiator: $user
|
||||
);
|
||||
}
|
||||
|
||||
@ -390,44 +346,29 @@ public static function table(Table $table): Table
|
||||
->url(OperationRunLinks::view($opRun, $record)),
|
||||
])
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
Actions\Action::make('openTenant')
|
||||
->label('Open')
|
||||
->icon('heroicon-o-arrow-right')
|
||||
->color('primary')
|
||||
->url(fn (Tenant $record) => \App\Filament\Resources\PolicyResource::getUrl('index', tenant: $record))
|
||||
->visible(fn (Tenant $record) => $record->isActive()),
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->tenantFromRecord()->apply(
|
||||
Actions\Action::make('edit')
|
||||
->label('Edit')
|
||||
->icon('heroicon-o-pencil-square')
|
||||
->url(fn (Tenant $record) => static::getUrl('edit', ['record' => $record], tenant: $record))
|
||||
->disabled(fn (Tenant $record): bool => ! static::canEdit($record))
|
||||
->tooltip(fn (Tenant $record): ?string => static::canEdit($record) ? null : 'You do not have permission to edit this tenant.'),
|
||||
Actions\Action::make('restore')
|
||||
->url(fn (Tenant $record) => static::getUrl('edit', ['record' => $record], tenant: $record)),
|
||||
),
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->tenantFromRecord()->apply(Actions\Action::make('restore')
|
||||
->label('Restore')
|
||||
->color('success')
|
||||
->successNotificationTitle('Tenant reactivated')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (Tenant $record): bool => $record->trashed())
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record);
|
||||
})
|
||||
->action(function (Tenant $record, AuditLogger $auditLogger): void {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record)) {
|
||||
abort(403);
|
||||
}
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
$record->restore();
|
||||
|
||||
@ -439,54 +380,25 @@ public static function table(Table $table): Table
|
||||
status: 'success',
|
||||
context: ['metadata' => ['tenant_id' => $record->tenant_id]]
|
||||
);
|
||||
}),
|
||||
Actions\Action::make('admin_consent')
|
||||
})),
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->tenantFromRecord()->apply(Actions\Action::make('admin_consent')
|
||||
->label('Admin consent')
|
||||
->icon('heroicon-o-clipboard-document')
|
||||
->url(fn (Tenant $record) => static::adminConsentUrl($record))
|
||||
->visible(fn (Tenant $record) => static::adminConsentUrl($record) !== null)
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record);
|
||||
})
|
||||
->tooltip(function (Tenant $record): ?string {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record)
|
||||
? null
|
||||
: 'You do not have permission to manage tenant consent.';
|
||||
})
|
||||
->openUrlInNewTab(),
|
||||
->openUrlInNewTab()),
|
||||
Actions\Action::make('open_in_entra')
|
||||
->label('Open in Entra')
|
||||
->icon('heroicon-o-arrow-top-right-on-square')
|
||||
->url(fn (Tenant $record) => static::entraUrl($record))
|
||||
->visible(fn (Tenant $record) => static::entraUrl($record) !== null)
|
||||
->openUrlInNewTab(),
|
||||
Actions\Action::make('verify')
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)->tenantFromRecord()->apply(Actions\Action::make('verify')
|
||||
->label('Verify configuration')
|
||||
->icon('heroicon-o-check-badge')
|
||||
->color('primary')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (Tenant $record): bool => $record->isActive())
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record);
|
||||
})
|
||||
->action(function (
|
||||
Tenant $record,
|
||||
TenantConfigService $configService,
|
||||
@ -494,44 +406,23 @@ public static function table(Table $table): Table
|
||||
RbacHealthService $rbacHealthService,
|
||||
AuditLogger $auditLogger
|
||||
) {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record)) {
|
||||
abort(403);
|
||||
}
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
static::verifyTenant($record, $configService, $permissionService, $rbacHealthService, $auditLogger);
|
||||
}),
|
||||
})),
|
||||
static::rbacAction(),
|
||||
Actions\Action::make('archive')
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->tenantFromRecord()->apply(Actions\Action::make('archive')
|
||||
->label('Deactivate')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-archive-box-x-mark')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (Tenant $record): bool => ! $record->trashed())
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record);
|
||||
})
|
||||
->action(function (Tenant $record, AuditLogger $auditLogger) {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record)) {
|
||||
abort(403);
|
||||
}
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
$record->delete();
|
||||
|
||||
@ -549,40 +440,21 @@ public static function table(Table $table): Table
|
||||
->body('The tenant has been archived and hidden from lists.')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
Actions\Action::make('forceDelete')
|
||||
})),
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)->tenantFromRecord()->apply(Actions\Action::make('forceDelete')
|
||||
->label('Force delete')
|
||||
->color('danger')
|
||||
->icon('heroicon-o-trash')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (?Tenant $record): bool => (bool) $record?->trashed())
|
||||
->disabled(function (?Tenant $record): bool {
|
||||
if (! $record instanceof Tenant) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record);
|
||||
})
|
||||
->action(function (?Tenant $record, AuditLogger $auditLogger) {
|
||||
if ($record === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $record)) {
|
||||
abort(403);
|
||||
}
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
$tenant = Tenant::withTrashed()->find($record->id);
|
||||
|
||||
@ -610,47 +482,28 @@ public static function table(Table $table): Table
|
||||
->title('Tenant permanently deleted')
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
})),
|
||||
]),
|
||||
])
|
||||
->bulkActions([
|
||||
Actions\BulkAction::make('syncSelected')
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->preflightByCapability()
|
||||
->apply(Actions\BulkAction::make('syncSelected')
|
||||
->label('Sync selected')
|
||||
->icon('heroicon-o-arrow-path')
|
||||
->color('warning')
|
||||
->requiresConfirmation()
|
||||
->visible(function (): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->tenants()
|
||||
->whereIn('role', RoleCapabilityMap::rolesWithCapability(Capabilities::TENANT_SYNC))
|
||||
->exists();
|
||||
})
|
||||
->authorize(function (): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $user->tenants()
|
||||
->whereIn('role', RoleCapabilityMap::rolesWithCapability(Capabilities::TENANT_SYNC))
|
||||
->exists();
|
||||
})
|
||||
->action(function (Collection $records, AuditLogger $auditLogger): void {
|
||||
$user = auth()->user();
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->authorizeBulkSelectionOrAbort($records);
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return;
|
||||
}
|
||||
/** @var User $user */
|
||||
$user = auth()->user();
|
||||
|
||||
$eligible = $records
|
||||
->filter(fn ($record) => $record instanceof Tenant && $record->isActive())
|
||||
->filter(fn (Tenant $tenant) => Gate::forUser($user)->allows(Capabilities::TENANT_SYNC, $tenant));
|
||||
->filter(fn ($record) => $record instanceof Tenant && $record->isActive());
|
||||
|
||||
if ($eligible->isEmpty()) {
|
||||
Notification::make()
|
||||
@ -664,6 +517,18 @@ public static function table(Table $table): Table
|
||||
return;
|
||||
}
|
||||
|
||||
if ($eligible->count() !== $records->count()) {
|
||||
$skipped = $records->count() - $eligible->count();
|
||||
$total = $records->count();
|
||||
|
||||
Notification::make()
|
||||
->title('Some tenants were skipped')
|
||||
->body("Skipped {$skipped} of {$total} selected tenants (inactive).")
|
||||
->warning()
|
||||
->sendToDatabase($user)
|
||||
->send();
|
||||
}
|
||||
|
||||
$tenantContext = Tenant::current() ?? $eligible->first();
|
||||
|
||||
if (! $tenantContext) {
|
||||
@ -710,7 +575,7 @@ public static function table(Table $table): Table
|
||||
])
|
||||
->send();
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
->deselectRecordsAfterCompletion()),
|
||||
])
|
||||
->headerActions([]);
|
||||
}
|
||||
@ -803,7 +668,7 @@ public static function getRelations(): array
|
||||
public static function rbacAction(): Actions\Action
|
||||
{
|
||||
// ... [RBAC Action Omitted - No Change] ...
|
||||
return Actions\Action::make('setup_rbac')
|
||||
return UiEnforcement::for(Capabilities::TENANT_MANAGE)->tenantFromRecord()->apply(Actions\Action::make('setup_rbac')
|
||||
->label('Setup Intune RBAC')
|
||||
->icon('heroicon-o-shield-check')
|
||||
->color('primary')
|
||||
@ -886,15 +751,6 @@ public static function rbacAction(): Actions\Action
|
||||
->loadingMessage('Searching groups...'),
|
||||
])
|
||||
->visible(fn (Tenant $record): bool => $record->isActive())
|
||||
->disabled(function (Tenant $record): bool {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record);
|
||||
})
|
||||
->requiresConfirmation()
|
||||
->action(function (
|
||||
array $data,
|
||||
@ -902,15 +758,9 @@ public static function rbacAction(): Actions\Action
|
||||
RbacOnboardingService $service,
|
||||
AuditLogger $auditLogger
|
||||
) {
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $user instanceof User) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
if (! Gate::forUser($user)->allows(Capabilities::TENANT_MANAGE, $record)) {
|
||||
abort(403);
|
||||
}
|
||||
UiEnforcement::for(Capabilities::TENANT_MANAGE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($record);
|
||||
|
||||
$cacheKey = RbacDelegatedAuthController::cacheKey($record, auth()->id(), session()->getId());
|
||||
$token = Cache::get($cacheKey);
|
||||
@ -989,7 +839,7 @@ public static function rbacAction(): Actions\Action
|
||||
->body($result['message'] ?? 'Unknown error')
|
||||
->danger()
|
||||
->send();
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
||||
public static function adminConsentUrl(Tenant $tenant): ?string
|
||||
|
||||
@ -4,11 +4,10 @@
|
||||
|
||||
use App\Filament\Resources\TenantResource;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Filament\Actions;
|
||||
use Filament\Resources\Pages\EditRecord;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class EditTenant extends EditRecord
|
||||
{
|
||||
@ -18,42 +17,24 @@ protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
Actions\ViewAction::make(),
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->apply(
|
||||
Actions\Action::make('archive')
|
||||
->label('Archive')
|
||||
->color('danger')
|
||||
->requiresConfirmation()
|
||||
->visible(fn (): bool => $this->record instanceof Tenant && ! $this->record->trashed())
|
||||
->disabled(function (): bool {
|
||||
$tenant = $this->record;
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->denies(Capabilities::TENANT_DELETE, $tenant);
|
||||
})
|
||||
->tooltip(function (): ?string {
|
||||
$tenant = $this->record;
|
||||
$user = auth()->user();
|
||||
|
||||
if (! $tenant instanceof Tenant || ! $user instanceof User) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $tenant)
|
||||
? null
|
||||
: 'You do not have permission to archive tenants.';
|
||||
})
|
||||
->action(function (): void {
|
||||
$tenant = $this->record;
|
||||
$user = auth()->user();
|
||||
|
||||
abort_unless($tenant instanceof Tenant && $user instanceof User, 403);
|
||||
abort_unless(Gate::forUser($user)->allows(Capabilities::TENANT_DELETE, $tenant), 403);
|
||||
UiEnforcement::for(Capabilities::TENANT_DELETE)
|
||||
->tenantFromRecord()
|
||||
->authorizeOrAbort($tenant);
|
||||
|
||||
$tenant->delete();
|
||||
}),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
526
app/Support/Auth/UiEnforcement.php
Normal file
526
app/Support/Auth/UiEnforcement.php
Normal file
@ -0,0 +1,526 @@
|
||||
<?php
|
||||
|
||||
namespace App\Support\Auth;
|
||||
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Services\Auth\RoleCapabilityMap;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use LogicException;
|
||||
|
||||
class UiEnforcement
|
||||
{
|
||||
private const TENANT_RESOLVER_FILAMENT = 'filament';
|
||||
|
||||
private const TENANT_RESOLVER_RECORD = 'record';
|
||||
|
||||
private const TENANT_RESOLVER_CUSTOM = 'custom';
|
||||
|
||||
private const BULK_PREFLIGHT_CAPABILITY = 'capability';
|
||||
|
||||
private const BULK_PREFLIGHT_TENANT_MEMBERSHIP = 'tenant_membership';
|
||||
|
||||
private const BULK_PREFLIGHT_CUSTOM = 'custom';
|
||||
|
||||
private bool $preserveVisibility = false;
|
||||
|
||||
private ?\Closure $businessVisible = null;
|
||||
|
||||
private ?\Closure $businessHidden = null;
|
||||
|
||||
private string $tenantResolverMode = self::TENANT_RESOLVER_FILAMENT;
|
||||
|
||||
private ?\Closure $customTenantResolver = null;
|
||||
|
||||
private string $bulkPreflightMode = self::BULK_PREFLIGHT_CAPABILITY;
|
||||
|
||||
/**
|
||||
* @var \Closure(Collection<int, Model>): bool|null
|
||||
*/
|
||||
private ?\Closure $bulkPreflight = null;
|
||||
|
||||
public function __construct(private string $capability)
|
||||
{
|
||||
}
|
||||
|
||||
public static function for(string $capability): self
|
||||
{
|
||||
return new self($capability);
|
||||
}
|
||||
|
||||
public function preserveVisibility(): self
|
||||
{
|
||||
if ($this->tenantResolverMode !== self::TENANT_RESOLVER_FILAMENT) {
|
||||
throw new LogicException('preserveVisibility() is allowed only for tenant-scoped (tenantFromFilament) surfaces.');
|
||||
}
|
||||
|
||||
$this->preserveVisibility = true;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function andVisibleWhen(callable $businessVisible): self
|
||||
{
|
||||
$this->businessVisible = \Closure::fromCallable($businessVisible);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function andHiddenWhen(callable $businessHidden): self
|
||||
{
|
||||
$this->businessHidden = \Closure::fromCallable($businessHidden);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function tenantFromFilament(): self
|
||||
{
|
||||
$this->tenantResolverMode = self::TENANT_RESOLVER_FILAMENT;
|
||||
$this->customTenantResolver = null;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function tenantFromRecord(): self
|
||||
{
|
||||
if ($this->preserveVisibility) {
|
||||
throw new LogicException('preserveVisibility() is forbidden for record-scoped surfaces.');
|
||||
}
|
||||
|
||||
$this->tenantResolverMode = self::TENANT_RESOLVER_RECORD;
|
||||
$this->customTenantResolver = null;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function tenantFrom(callable $resolver): self
|
||||
{
|
||||
if ($this->preserveVisibility) {
|
||||
throw new LogicException('preserveVisibility() is forbidden for record-scoped surfaces.');
|
||||
}
|
||||
|
||||
$this->tenantResolverMode = self::TENANT_RESOLVER_CUSTOM;
|
||||
$this->customTenantResolver = \Closure::fromCallable($resolver);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Custom bulk authorization preflight for selection.
|
||||
*
|
||||
* Signature: fn (Collection<int, Model> $records): bool
|
||||
*/
|
||||
public function preflightSelection(callable $preflight): self
|
||||
{
|
||||
$this->bulkPreflightMode = self::BULK_PREFLIGHT_CUSTOM;
|
||||
$this->bulkPreflight = \Closure::fromCallable($preflight);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function preflightByTenantMembership(): self
|
||||
{
|
||||
$this->bulkPreflightMode = self::BULK_PREFLIGHT_TENANT_MEMBERSHIP;
|
||||
$this->bulkPreflight = null;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function preflightByCapability(): self
|
||||
{
|
||||
$this->bulkPreflightMode = self::BULK_PREFLIGHT_CAPABILITY;
|
||||
$this->bulkPreflight = null;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function apply(Action $action): Action
|
||||
{
|
||||
$this->assertMixedVisibilityConfigIsValid();
|
||||
|
||||
if (! $this->preserveVisibility) {
|
||||
$this->applyVisibility($action);
|
||||
}
|
||||
|
||||
if ($action->isBulk()) {
|
||||
$action->disabled(function () use ($action): bool {
|
||||
/** @var Collection<int, Model> $records */
|
||||
$records = collect($action->getSelectedRecords());
|
||||
|
||||
return $this->bulkIsDisabled($records);
|
||||
});
|
||||
|
||||
$action->tooltip(function () use ($action): ?string {
|
||||
/** @var Collection<int, Model> $records */
|
||||
$records = collect($action->getSelectedRecords());
|
||||
|
||||
return $this->bulkDisabledTooltip($records);
|
||||
});
|
||||
} else {
|
||||
$action->disabled(fn (?Model $record = null): bool => $this->isDisabled($record));
|
||||
$action->tooltip(fn (?Model $record = null): ?string => $this->disabledTooltip($record));
|
||||
}
|
||||
|
||||
return $action;
|
||||
}
|
||||
|
||||
public function isAllowed(?Model $record = null): bool
|
||||
{
|
||||
return ! $this->isDisabled($record);
|
||||
}
|
||||
|
||||
public function authorizeOrAbort(?Model $record = null): void
|
||||
{
|
||||
$user = auth()->user();
|
||||
abort_unless($user instanceof User, 403);
|
||||
|
||||
$tenant = $this->resolveTenant($record);
|
||||
|
||||
if (! ($tenant instanceof Tenant)) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
abort_unless($this->isMemberOfTenant($user, $tenant), 404);
|
||||
abort_unless(Gate::forUser($user)->allows($this->capability, $tenant), 403);
|
||||
}
|
||||
|
||||
/**
|
||||
* Server-side enforcement for bulk selections.
|
||||
*
|
||||
* - If any selected tenant is not a membership: 404 (deny-as-not-found).
|
||||
* - If all are memberships but any lacks capability: 403.
|
||||
*
|
||||
* @param Collection<int, Model> $records
|
||||
*/
|
||||
public function authorizeBulkSelectionOrAbort(Collection $records): void
|
||||
{
|
||||
$user = auth()->user();
|
||||
abort_unless($user instanceof User, 403);
|
||||
|
||||
$tenantIds = $this->resolveTenantIdsForRecords($records);
|
||||
|
||||
if ($tenantIds === []) {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$membershipTenantIds = $this->membershipTenantIds($user, $tenantIds);
|
||||
|
||||
if (count($membershipTenantIds) !== count($tenantIds)) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$allowedTenantIds = $this->capabilityTenantIds($user, $tenantIds);
|
||||
|
||||
if (count($allowedTenantIds) !== count($tenantIds)) {
|
||||
abort(403);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Public helper for evaluating bulk selection authorization decisions.
|
||||
*
|
||||
* @param Collection<int, Model> $records
|
||||
*/
|
||||
public function bulkSelectionIsAuthorized(User $user, Collection $records): bool
|
||||
{
|
||||
return $this->bulkSelectionIsAuthorizedInternal($user, $records);
|
||||
}
|
||||
|
||||
private function applyVisibility(Action $action): void
|
||||
{
|
||||
$canApplyMemberVisibility = ! ($action->isBulk() && $this->tenantResolverMode !== self::TENANT_RESOLVER_FILAMENT);
|
||||
|
||||
$businessVisible = $this->businessVisible;
|
||||
$businessHidden = $this->businessHidden;
|
||||
|
||||
if ($businessVisible instanceof \Closure) {
|
||||
$action->visible(function () use ($action, $businessVisible, $canApplyMemberVisibility): bool {
|
||||
if (! (bool) $action->evaluate($businessVisible)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! $canApplyMemberVisibility) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$record = $action->getRecord();
|
||||
|
||||
return $this->isMember($record instanceof Model ? $record : null);
|
||||
});
|
||||
}
|
||||
|
||||
if ($businessHidden instanceof \Closure) {
|
||||
$action->hidden(function () use ($action, $businessHidden, $canApplyMemberVisibility): bool {
|
||||
if ($canApplyMemberVisibility) {
|
||||
$record = $action->getRecord();
|
||||
|
||||
if (! $this->isMember($record instanceof Model ? $record : null)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return (bool) $action->evaluate($businessHidden);
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (! $canApplyMemberVisibility) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (! ($businessVisible instanceof \Closure)) {
|
||||
$action->hidden(function () use ($action): bool {
|
||||
$record = $action->getRecord();
|
||||
|
||||
return ! $this->isMember($record instanceof Model ? $record : null);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private function assertMixedVisibilityConfigIsValid(): void
|
||||
{
|
||||
if ($this->preserveVisibility && ($this->businessVisible instanceof \Closure || $this->businessHidden instanceof \Closure)) {
|
||||
throw new LogicException('preserveVisibility() cannot be combined with andVisibleWhen()/andHiddenWhen().');
|
||||
}
|
||||
|
||||
if ($this->preserveVisibility && $this->tenantResolverMode !== self::TENANT_RESOLVER_FILAMENT) {
|
||||
throw new LogicException('preserveVisibility() is allowed only for tenant-scoped (tenantFromFilament) surfaces.');
|
||||
}
|
||||
}
|
||||
|
||||
private function isDisabled(?Model $record = null): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! ($user instanceof User)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$tenant = $this->resolveTenant($record);
|
||||
|
||||
if (! ($tenant instanceof Tenant)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (! $this->isMemberOfTenant($user, $tenant)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! Gate::forUser($user)->allows($this->capability, $tenant);
|
||||
}
|
||||
|
||||
private function disabledTooltip(?Model $record = null): ?string
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! ($user instanceof User)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$tenant = $this->resolveTenant($record);
|
||||
|
||||
if (! ($tenant instanceof Tenant)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! $this->isMemberOfTenant($user, $tenant)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (Gate::forUser($user)->allows($this->capability, $tenant)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return UiTooltips::insufficientPermission();
|
||||
}
|
||||
|
||||
private function bulkIsDisabled(Collection $records): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! ($user instanceof User)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return ! $this->bulkSelectionIsAuthorizedInternal($user, $records);
|
||||
}
|
||||
|
||||
private function bulkDisabledTooltip(Collection $records): ?string
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! ($user instanceof User)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($this->bulkSelectionIsAuthorizedInternal($user, $records)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return UiTooltips::insufficientPermission();
|
||||
}
|
||||
|
||||
private function bulkSelectionIsAuthorizedInternal(User $user, Collection $records): bool
|
||||
{
|
||||
if ($this->bulkPreflightMode === self::BULK_PREFLIGHT_CUSTOM && $this->bulkPreflight instanceof \Closure) {
|
||||
return (bool) ($this->bulkPreflight)($records);
|
||||
}
|
||||
|
||||
$tenantIds = $this->resolveTenantIdsForRecords($records);
|
||||
|
||||
if ($tenantIds === []) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return match ($this->bulkPreflightMode) {
|
||||
self::BULK_PREFLIGHT_TENANT_MEMBERSHIP => count($this->membershipTenantIds($user, $tenantIds)) === count($tenantIds),
|
||||
self::BULK_PREFLIGHT_CAPABILITY => count($this->capabilityTenantIds($user, $tenantIds)) === count($tenantIds),
|
||||
default => false,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Collection<int, Model> $records
|
||||
* @return array<int>
|
||||
*/
|
||||
private function resolveTenantIdsForRecords(Collection $records): array
|
||||
{
|
||||
if ($this->tenantResolverMode === self::TENANT_RESOLVER_FILAMENT) {
|
||||
$tenant = Filament::getTenant();
|
||||
|
||||
return $tenant instanceof Tenant ? [(int) $tenant->getKey()] : [];
|
||||
}
|
||||
|
||||
if ($this->tenantResolverMode === self::TENANT_RESOLVER_RECORD) {
|
||||
$ids = $records
|
||||
->filter(fn (Model $record): bool => $record instanceof Tenant)
|
||||
->map(fn (Tenant $tenant): int => (int) $tenant->getKey())
|
||||
->all();
|
||||
|
||||
return array_values(array_unique($ids));
|
||||
}
|
||||
|
||||
if ($this->tenantResolverMode === self::TENANT_RESOLVER_CUSTOM && $this->customTenantResolver instanceof \Closure) {
|
||||
$ids = [];
|
||||
|
||||
foreach ($records as $record) {
|
||||
if (! ($record instanceof Model)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$resolved = ($this->customTenantResolver)($record);
|
||||
|
||||
if ($resolved instanceof Tenant) {
|
||||
$ids[] = (int) $resolved->getKey();
|
||||
continue;
|
||||
}
|
||||
|
||||
if (is_int($resolved)) {
|
||||
$ids[] = $resolved;
|
||||
}
|
||||
}
|
||||
|
||||
return array_values(array_unique($ids));
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
private function isMember(?Model $record = null): bool
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
if (! ($user instanceof User)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tenant = $this->resolveTenant($record);
|
||||
|
||||
if (! ($tenant instanceof Tenant)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $this->isMemberOfTenant($user, $tenant);
|
||||
}
|
||||
|
||||
private function isMemberOfTenant(User $user, Tenant $tenant): bool
|
||||
{
|
||||
return Gate::forUser($user)->allows(Capabilities::TENANT_VIEW, $tenant);
|
||||
}
|
||||
|
||||
private function resolveTenant(?Model $record = null): ?Tenant
|
||||
{
|
||||
return match ($this->tenantResolverMode) {
|
||||
self::TENANT_RESOLVER_FILAMENT => Filament::getTenant() instanceof Tenant ? Filament::getTenant() : null,
|
||||
self::TENANT_RESOLVER_RECORD => $record instanceof Tenant ? $record : null,
|
||||
self::TENANT_RESOLVER_CUSTOM => $this->resolveTenantViaCustomResolver($record),
|
||||
default => null,
|
||||
};
|
||||
}
|
||||
|
||||
private function resolveTenantViaCustomResolver(?Model $record): ?Tenant
|
||||
{
|
||||
if (! ($this->customTenantResolver instanceof \Closure)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! ($record instanceof Model)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$resolved = ($this->customTenantResolver)($record);
|
||||
|
||||
if ($resolved instanceof Tenant) {
|
||||
return $resolved;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int> $tenantIds
|
||||
* @return array<int>
|
||||
*/
|
||||
private function membershipTenantIds(User $user, array $tenantIds): array
|
||||
{
|
||||
/** @var array<int> $ids */
|
||||
$ids = DB::table('tenant_memberships')
|
||||
->where('user_id', (int) $user->getKey())
|
||||
->whereIn('tenant_id', $tenantIds)
|
||||
->pluck('tenant_id')
|
||||
->map(fn ($id): int => (int) $id)
|
||||
->all();
|
||||
|
||||
return array_values(array_unique($ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int> $tenantIds
|
||||
* @return array<int>
|
||||
*/
|
||||
private function capabilityTenantIds(User $user, array $tenantIds): array
|
||||
{
|
||||
$roles = RoleCapabilityMap::rolesWithCapability($this->capability);
|
||||
|
||||
if ($roles === []) {
|
||||
return [];
|
||||
}
|
||||
|
||||
/** @var array<int> $ids */
|
||||
$ids = DB::table('tenant_memberships')
|
||||
->where('user_id', (int) $user->getKey())
|
||||
->whereIn('tenant_id', $tenantIds)
|
||||
->whereIn('role', $roles)
|
||||
->pluck('tenant_id')
|
||||
->map(fn ($id): int => (int) $id)
|
||||
->all();
|
||||
|
||||
return array_values(array_unique($ids));
|
||||
}
|
||||
}
|
||||
14
app/Support/Auth/UiTooltips.php
Normal file
14
app/Support/Auth/UiTooltips.php
Normal file
@ -0,0 +1,14 @@
|
||||
<?php
|
||||
|
||||
namespace App\Support\Auth;
|
||||
|
||||
class UiTooltips
|
||||
{
|
||||
public const INSUFFICIENT_PERMISSION_ASK_OWNER = 'Insufficient permission — ask a tenant Owner.';
|
||||
|
||||
public static function insufficientPermission(): string
|
||||
{
|
||||
return self::INSUFFICIENT_PERMISSION_ASK_OWNER;
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
use App\Models\Policy;
|
||||
use App\Models\Tenant;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Support\Facades\Queue;
|
||||
use Livewire\Livewire;
|
||||
|
||||
@ -18,6 +19,7 @@
|
||||
|
||||
$tenant = Tenant::factory()->create();
|
||||
$tenant->makeCurrent();
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
[$user] = createUserWithTenant(tenant: $tenant, role: 'owner');
|
||||
|
||||
|
||||
71
tests/Feature/Filament/BackupSetUiEnforcementTest.php
Normal file
71
tests/Feature/Filament/BackupSetUiEnforcementTest.php
Normal file
@ -0,0 +1,71 @@
|
||||
<?php
|
||||
|
||||
use App\Filament\Resources\BackupSetResource;
|
||||
use App\Filament\Resources\BackupSetResource\Pages\ListBackupSets;
|
||||
use App\Models\BackupSet;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('non-members are denied access to BackupSet tenant routes (404)', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($otherTenant, role: 'owner');
|
||||
|
||||
$this->actingAs($user)
|
||||
->get(BackupSetResource::getUrl('index', tenant: $tenant))
|
||||
->assertStatus(404);
|
||||
});
|
||||
|
||||
test('members without capability see BackupSet actions disabled with standard tooltip and cannot execute', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'readonly');
|
||||
|
||||
$backupSet = BackupSet::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'completed',
|
||||
'deleted_at' => null,
|
||||
]);
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListBackupSets::class)
|
||||
->assertTableActionDisabled('archive', $backupSet)
|
||||
->assertTableActionExists('archive', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $backupSet)
|
||||
->callTableAction('archive', $backupSet);
|
||||
|
||||
expect($backupSet->fresh()->trashed())->toBeFalse();
|
||||
});
|
||||
|
||||
test('members with capability can execute BackupSet actions', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
$backupSet = BackupSet::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'completed',
|
||||
'deleted_at' => null,
|
||||
]);
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListBackupSets::class)
|
||||
->assertTableActionEnabled('archive', $backupSet)
|
||||
->callTableAction('archive', $backupSet);
|
||||
|
||||
expect($backupSet->fresh()->trashed())->toBeTrue();
|
||||
});
|
||||
|
||||
@ -7,13 +7,19 @@
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Notifications\RunStatusChangedNotification;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Queue;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('entra group sync runs are listed for the active tenant', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
@ -96,3 +102,22 @@
|
||||
expect($notification->data['actions'][0]['url'] ?? null)
|
||||
->toBe(EntraGroupSyncRunResource::getUrl('view', ['record' => $run->getKey()], tenant: $tenant));
|
||||
});
|
||||
|
||||
test('sync groups action is disabled for readonly users with standard tooltip', function () {
|
||||
Queue::fake();
|
||||
|
||||
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
||||
|
||||
$this->actingAs($user);
|
||||
|
||||
$tenant->makeCurrent();
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListEntraGroupSyncRuns::class)
|
||||
->assertActionVisible('sync_groups')
|
||||
->assertActionDisabled('sync_groups')
|
||||
->assertActionExists('sync_groups', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission());
|
||||
|
||||
Queue::assertNothingPushed();
|
||||
});
|
||||
|
||||
@ -1,12 +1,21 @@
|
||||
<?php
|
||||
|
||||
use App\Filament\Resources\InventoryItemResource;
|
||||
use App\Filament\Resources\InventoryItemResource\Pages\ListInventoryItems;
|
||||
use App\Models\InventoryItem;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('inventory items are listed for the active tenant', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
@ -39,3 +48,28 @@
|
||||
->assertSee('Item A')
|
||||
->assertDontSee('Item B');
|
||||
});
|
||||
|
||||
test('non-members are denied access to inventory item tenant routes (404)', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($otherTenant, role: 'owner');
|
||||
|
||||
$this->actingAs($user)
|
||||
->get(InventoryItemResource::getUrl('index', tenant: $tenant))
|
||||
->assertStatus(404);
|
||||
});
|
||||
|
||||
test('members without capability see inventory sync action disabled with standard tooltip', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'readonly');
|
||||
|
||||
$tenant->makeCurrent();
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListInventoryItems::class)
|
||||
->assertActionVisible('run_inventory_sync')
|
||||
->assertActionDisabled('run_inventory_sync')
|
||||
->assertActionExists('run_inventory_sync', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission());
|
||||
});
|
||||
|
||||
@ -4,9 +4,14 @@
|
||||
use App\Models\InventorySyncRun;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
||||
uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('inventory sync runs are listed for the active tenant', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
@ -35,3 +40,14 @@
|
||||
->assertSee(str_repeat('a', 12))
|
||||
->assertDontSee(str_repeat('b', 12));
|
||||
});
|
||||
|
||||
test('non-members are denied access to inventory sync run tenant routes (404)', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($otherTenant, role: 'owner');
|
||||
|
||||
$this->actingAs($user)
|
||||
->get(InventorySyncRunResource::getUrl('index', tenant: $tenant))
|
||||
->assertStatus(404);
|
||||
});
|
||||
|
||||
@ -0,0 +1,77 @@
|
||||
<?php
|
||||
|
||||
use App\Filament\Resources\ProviderConnectionResource;
|
||||
use App\Filament\Resources\ProviderConnectionResource\Pages\EditProviderConnection;
|
||||
use App\Filament\Resources\ProviderConnectionResource\Pages\ListProviderConnections;
|
||||
use App\Models\ProviderConnection;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('non-members are denied access to provider connection tenant routes (404)', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($otherTenant, role: 'owner');
|
||||
|
||||
$this->actingAs($user)
|
||||
->get(ProviderConnectionResource::getUrl('index', tenant: $tenant))
|
||||
->assertStatus(404);
|
||||
});
|
||||
|
||||
test('members without capability see provider connection actions disabled with standard tooltip', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'readonly');
|
||||
|
||||
$connection = ProviderConnection::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'needs_consent',
|
||||
]);
|
||||
|
||||
$tenant->makeCurrent();
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListProviderConnections::class)
|
||||
->assertTableActionVisible('check_connection', $connection)
|
||||
->assertTableActionDisabled('check_connection', $connection)
|
||||
->assertTableActionExists('check_connection', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $connection);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(EditProviderConnection::class, ['record' => $connection->getKey()])
|
||||
->assertActionVisible('check_connection')
|
||||
->assertActionDisabled('check_connection')
|
||||
->assertActionExists('check_connection', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission());
|
||||
});
|
||||
|
||||
test('members with capability can see provider connection actions enabled', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
$connection = ProviderConnection::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'needs_consent',
|
||||
]);
|
||||
|
||||
$tenant->makeCurrent();
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListProviderConnections::class)
|
||||
->assertTableActionVisible('check_connection', $connection)
|
||||
->assertTableActionEnabled('check_connection', $connection);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(EditProviderConnection::class, ['record' => $connection->getKey()])
|
||||
->assertActionVisible('check_connection')
|
||||
->assertActionEnabled('check_connection');
|
||||
});
|
||||
83
tests/Feature/Filament/RestoreRunUiEnforcementTest.php
Normal file
83
tests/Feature/Filament/RestoreRunUiEnforcementTest.php
Normal file
@ -0,0 +1,83 @@
|
||||
<?php
|
||||
|
||||
use App\Filament\Resources\RestoreRunResource;
|
||||
use App\Filament\Resources\RestoreRunResource\Pages\ListRestoreRuns;
|
||||
use App\Models\BackupSet;
|
||||
use App\Models\RestoreRun;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('non-members are denied access to RestoreRun tenant routes (404)', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
$otherTenant = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($otherTenant, role: 'owner');
|
||||
|
||||
$this->actingAs($user)
|
||||
->get(RestoreRunResource::getUrl('index', tenant: $tenant))
|
||||
->assertStatus(404);
|
||||
});
|
||||
|
||||
test('members without capability see RestoreRun actions disabled with standard tooltip and cannot execute', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'readonly');
|
||||
|
||||
$backupSet = BackupSet::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'completed',
|
||||
]);
|
||||
|
||||
$restoreRun = RestoreRun::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'backup_set_id' => $backupSet->getKey(),
|
||||
'status' => 'completed',
|
||||
'deleted_at' => null,
|
||||
]);
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListRestoreRuns::class)
|
||||
->assertTableActionDisabled('archive', $restoreRun)
|
||||
->assertTableActionExists('archive', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $restoreRun)
|
||||
->callTableAction('archive', $restoreRun);
|
||||
|
||||
expect($restoreRun->fresh()->trashed())->toBeFalse();
|
||||
});
|
||||
|
||||
test('members with capability can execute RestoreRun actions', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
$backupSet = BackupSet::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'status' => 'completed',
|
||||
]);
|
||||
|
||||
$restoreRun = RestoreRun::factory()->create([
|
||||
'tenant_id' => $tenant->getKey(),
|
||||
'backup_set_id' => $backupSet->getKey(),
|
||||
'status' => 'completed',
|
||||
'deleted_at' => null,
|
||||
]);
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListRestoreRuns::class)
|
||||
->assertTableActionEnabled('archive', $restoreRun)
|
||||
->callTableAction('archive', $restoreRun);
|
||||
|
||||
expect($restoreRun->fresh()->trashed())->toBeTrue();
|
||||
});
|
||||
|
||||
@ -4,13 +4,19 @@
|
||||
use App\Filament\Pages\TenantDashboard;
|
||||
use App\Filament\Resources\TenantResource\Pages\ListTenants;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('readonly users may switch current tenant via ChooseTenant', function () {
|
||||
[$user, $tenantA] = createUserWithTenant(role: 'readonly');
|
||||
|
||||
@ -57,6 +63,7 @@
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('archive', $tenant)
|
||||
->assertTableActionExists('archive', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant)
|
||||
->callTableAction('archive', $tenant);
|
||||
|
||||
expect($tenant->fresh()->trashed())->toBeFalse();
|
||||
@ -74,6 +81,7 @@
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('forceDelete', $tenant)
|
||||
->assertTableActionExists('forceDelete', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant)
|
||||
->callTableAction('forceDelete', $tenant);
|
||||
|
||||
expect(Tenant::withTrashed()->find($tenant->getKey()))->not->toBeNull();
|
||||
@ -89,6 +97,7 @@
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('verify', $tenant)
|
||||
->assertTableActionExists('verify', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant)
|
||||
->callTableAction('verify', $tenant);
|
||||
});
|
||||
|
||||
@ -113,7 +122,8 @@
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('edit', $tenant);
|
||||
->assertTableActionDisabled('edit', $tenant)
|
||||
->assertTableActionExists('edit', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant);
|
||||
});
|
||||
|
||||
test('readonly users cannot open admin consent', function () {
|
||||
@ -126,7 +136,8 @@
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('admin_consent', $tenant);
|
||||
->assertTableActionDisabled('admin_consent', $tenant)
|
||||
->assertTableActionExists('admin_consent', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant);
|
||||
});
|
||||
|
||||
test('readonly users cannot start tenant sync from tenant menu', function () {
|
||||
@ -138,5 +149,6 @@
|
||||
|
||||
Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->assertTableActionDisabled('syncTenant', $tenant);
|
||||
->assertTableActionDisabled('syncTenant', $tenant)
|
||||
->assertTableActionExists('syncTenant', fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission(), $tenant);
|
||||
});
|
||||
|
||||
@ -4,14 +4,20 @@
|
||||
use App\Jobs\BulkTenantSyncJob;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Events\TenantSet;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Bus;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Livewire\Livewire;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
beforeEach(function (): void {
|
||||
Http::preventStrayRequests();
|
||||
});
|
||||
|
||||
test('tenant-scoped pages return 404 for unauthorized tenant', function () {
|
||||
[$user, $authorizedTenant] = createUserWithTenant();
|
||||
$unauthorizedTenant = Tenant::factory()->create();
|
||||
@ -21,6 +27,40 @@
|
||||
->assertNotFound();
|
||||
});
|
||||
|
||||
test('tenant portfolio tenant view returns 404 for non-member tenant record', function () {
|
||||
$user = User::factory()->create();
|
||||
$this->actingAs($user);
|
||||
|
||||
$authorizedTenant = Tenant::factory()->create(['tenant_id' => 'tenant-portfolio-authorized-view']);
|
||||
$unauthorizedTenant = Tenant::factory()->create(['tenant_id' => 'tenant-portfolio-unauthorized-view']);
|
||||
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$authorizedTenant->getKey() => ['role' => 'owner'],
|
||||
]);
|
||||
|
||||
$this->get(route('filament.admin.resources.tenants.view', array_merge(
|
||||
filamentTenantRouteParams($unauthorizedTenant),
|
||||
['record' => $unauthorizedTenant],
|
||||
)))->assertNotFound();
|
||||
});
|
||||
|
||||
test('tenant portfolio tenant edit returns 404 for non-member tenant record', function () {
|
||||
$user = User::factory()->create();
|
||||
$this->actingAs($user);
|
||||
|
||||
$authorizedTenant = Tenant::factory()->create(['tenant_id' => 'tenant-portfolio-authorized-edit']);
|
||||
$unauthorizedTenant = Tenant::factory()->create(['tenant_id' => 'tenant-portfolio-unauthorized-edit']);
|
||||
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$authorizedTenant->getKey() => ['role' => 'owner'],
|
||||
]);
|
||||
|
||||
$this->get(route('filament.admin.resources.tenants.edit', array_merge(
|
||||
filamentTenantRouteParams($unauthorizedTenant),
|
||||
['record' => $unauthorizedTenant],
|
||||
)))->assertNotFound();
|
||||
});
|
||||
|
||||
test('tenant portfolio lists only tenants the user can access', function () {
|
||||
$user = User::factory()->create();
|
||||
$this->actingAs($user);
|
||||
@ -75,7 +115,9 @@
|
||||
]);
|
||||
});
|
||||
|
||||
test('tenant portfolio bulk sync is hidden for readonly users', function () {
|
||||
test('tenant portfolio bulk sync is disabled for readonly users', function () {
|
||||
Bus::fake();
|
||||
|
||||
$user = User::factory()->create();
|
||||
$this->actingAs($user);
|
||||
|
||||
@ -87,8 +129,48 @@
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
Livewire::test(ListTenants::class)
|
||||
->assertTableBulkActionHidden('syncSelected');
|
||||
$livewire = Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->selectTableRecords([$tenant])
|
||||
->assertTableBulkActionVisible('syncSelected')
|
||||
->assertTableBulkActionDisabled('syncSelected');
|
||||
|
||||
$actions = $livewire->parseNestedTableBulkActions('syncSelected');
|
||||
$livewire->assertActionExists($actions, fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission());
|
||||
|
||||
$livewire->callTableBulkAction('syncSelected', collect([$tenant]));
|
||||
|
||||
Bus::assertNotDispatched(BulkTenantSyncJob::class);
|
||||
});
|
||||
|
||||
test('tenant portfolio bulk sync is disabled when selection includes unauthorized tenants', function () {
|
||||
Bus::fake();
|
||||
|
||||
$user = User::factory()->create();
|
||||
$this->actingAs($user);
|
||||
|
||||
$tenantA = Tenant::factory()->create(['tenant_id' => 'tenant-bulk-mixed-a']);
|
||||
$tenantB = Tenant::factory()->create(['tenant_id' => 'tenant-bulk-mixed-b']);
|
||||
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$tenantA->getKey() => ['role' => 'owner'],
|
||||
$tenantB->getKey() => ['role' => 'readonly'],
|
||||
]);
|
||||
|
||||
Filament::setTenant($tenantA, true);
|
||||
|
||||
$livewire = Livewire::actingAs($user)
|
||||
->test(ListTenants::class)
|
||||
->selectTableRecords([$tenantA, $tenantB])
|
||||
->assertTableBulkActionVisible('syncSelected')
|
||||
->assertTableBulkActionDisabled('syncSelected');
|
||||
|
||||
$actions = $livewire->parseNestedTableBulkActions('syncSelected');
|
||||
$livewire->assertActionExists($actions, fn ($action): bool => $action->getTooltip() === UiTooltips::insufficientPermission());
|
||||
|
||||
$livewire->callTableBulkAction('syncSelected', collect([$tenantA, $tenantB]));
|
||||
|
||||
Bus::assertNotDispatched(BulkTenantSyncJob::class);
|
||||
});
|
||||
|
||||
test('tenant set event updates user tenant preference last used timestamp', function () {
|
||||
|
||||
118
tests/Feature/Guards/NoAdHocFilamentAuthPatternsTest.php
Normal file
118
tests/Feature/Guards/NoAdHocFilamentAuthPatternsTest.php
Normal file
@ -0,0 +1,118 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
it('does not introduce ad-hoc authorization patterns in app/Filament (allowlist-driven)', function () {
|
||||
$root = base_path();
|
||||
$self = realpath(__FILE__);
|
||||
|
||||
$directories = [
|
||||
$root.'/app/Filament',
|
||||
];
|
||||
|
||||
$excludedPaths = [
|
||||
$root.'/vendor',
|
||||
$root.'/storage',
|
||||
$root.'/specs',
|
||||
$root.'/spechistory',
|
||||
$root.'/references',
|
||||
$root.'/public/build',
|
||||
];
|
||||
|
||||
$allowlist = [
|
||||
// NOTE: Shrink this list as files are migrated to UiEnforcement (Feature 066b).
|
||||
'app/Filament/Pages/ChooseTenant.php',
|
||||
'app/Filament/Pages/DriftLanding.php',
|
||||
'app/Filament/Pages/Tenancy/RegisterTenant.php',
|
||||
'app/Filament/Resources/BackupScheduleResource.php',
|
||||
'app/Filament/Resources/FindingResource.php',
|
||||
'app/Filament/Resources/FindingResource/Pages/ListFindings.php',
|
||||
'app/Filament/Resources/PolicyResource.php',
|
||||
'app/Filament/Resources/PolicyResource/Pages/ListPolicies.php',
|
||||
'app/Filament/Resources/PolicyResource/RelationManagers/VersionsRelationManager.php',
|
||||
'app/Filament/Resources/PolicyVersionResource.php',
|
||||
'app/Filament/Resources/TenantResource/RelationManagers/TenantMembershipsRelationManager.php',
|
||||
'app/Filament/System/Pages/Dashboard.php',
|
||||
];
|
||||
|
||||
$forbiddenPatterns = [
|
||||
'/\\bGate::\\b/',
|
||||
'/\\babort\\s*\\(/',
|
||||
'/\\babort_(?:if|unless)\\b/',
|
||||
];
|
||||
|
||||
/** @var Collection<int, string> $files */
|
||||
$files = collect($directories)
|
||||
->filter(fn (string $dir): bool => is_dir($dir))
|
||||
->flatMap(function (string $dir): array {
|
||||
$iterator = new RecursiveIteratorIterator(
|
||||
new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS)
|
||||
);
|
||||
|
||||
$paths = [];
|
||||
|
||||
foreach ($iterator as $file) {
|
||||
if (! $file->isFile()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$path = $file->getPathname();
|
||||
|
||||
if (! str_ends_with($path, '.php')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$paths[] = $path;
|
||||
}
|
||||
|
||||
return $paths;
|
||||
})
|
||||
->filter(function (string $path) use ($excludedPaths, $self): bool {
|
||||
if ($self && realpath($path) === $self) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach ($excludedPaths as $excluded) {
|
||||
if (str_starts_with($path, $excluded)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
})
|
||||
->values();
|
||||
|
||||
$hits = [];
|
||||
|
||||
foreach ($files as $path) {
|
||||
$relative = str_replace($root.'/', '', $path);
|
||||
|
||||
if (in_array($relative, $allowlist, true)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$contents = file_get_contents($path);
|
||||
|
||||
if (! is_string($contents) || $contents === '') {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($forbiddenPatterns as $pattern) {
|
||||
if (! preg_match($pattern, $contents)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$lines = preg_split('/\R/', $contents) ?: [];
|
||||
|
||||
foreach ($lines as $index => $line) {
|
||||
if (preg_match($pattern, $line)) {
|
||||
$hits[] = $relative.':'.($index + 1).' -> '.trim($line);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
expect($hits)->toBeEmpty(
|
||||
"Ad-hoc Filament auth patterns found (remove allowlist entries as you migrate):\n".implode("\n", $hits)
|
||||
);
|
||||
});
|
||||
36
tests/Unit/Auth/UiEnforcementBulkPreflightQueryCountTest.php
Normal file
36
tests/Unit/Auth/UiEnforcementBulkPreflightQueryCountTest.php
Normal file
@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
it('preflights bulk selections with a set-based tenant_memberships query (no N+1)', function () {
|
||||
$tenants = Tenant::factory()->count(25)->create();
|
||||
[$user] = createUserWithTenant($tenants->first(), role: 'owner');
|
||||
|
||||
foreach ($tenants->slice(1) as $tenant) {
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$tenant->getKey() => ['role' => 'owner'],
|
||||
]);
|
||||
}
|
||||
|
||||
$enforcement = UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->preflightByCapability();
|
||||
|
||||
$membershipQueries = 0;
|
||||
|
||||
DB::listen(function ($query) use (&$membershipQueries): void {
|
||||
if (str_contains($query->sql, 'tenant_memberships')) {
|
||||
$membershipQueries++;
|
||||
}
|
||||
});
|
||||
|
||||
expect($enforcement->bulkSelectionIsAuthorized($user, $tenants))->toBeTrue();
|
||||
expect($membershipQueries)->toBe(1);
|
||||
});
|
||||
|
||||
128
tests/Unit/Auth/UiEnforcementTest.php
Normal file
128
tests/Unit/Auth/UiEnforcementTest.php
Normal file
@ -0,0 +1,128 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Auth\Capabilities;
|
||||
use App\Support\Auth\UiEnforcement;
|
||||
use App\Support\Auth\UiTooltips;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Facades\Filament;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
|
||||
uses(RefreshDatabase::class);
|
||||
|
||||
it('forbids preserveVisibility on record-scoped tenant resolution', function () {
|
||||
expect(fn () => UiEnforcement::for(Capabilities::TENANT_VIEW)->tenantFromRecord()->preserveVisibility())
|
||||
->toThrow(LogicException::class);
|
||||
|
||||
expect(fn () => UiEnforcement::for(Capabilities::TENANT_VIEW)->preserveVisibility()->tenantFromRecord())
|
||||
->toThrow(LogicException::class);
|
||||
});
|
||||
|
||||
it('hides actions for non-members on record-scoped surfaces', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant();
|
||||
|
||||
$action = Action::make('test');
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_VIEW)
|
||||
->tenantFromRecord()
|
||||
->apply($action);
|
||||
|
||||
$this->actingAs($user);
|
||||
$action->record($tenant);
|
||||
|
||||
expect($action->isHidden())->toBeTrue();
|
||||
});
|
||||
|
||||
it('disables actions with the standard tooltip for members without the capability', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'readonly');
|
||||
|
||||
$action = Action::make('test');
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->apply($action);
|
||||
|
||||
$this->actingAs($user);
|
||||
$action->record($tenant);
|
||||
|
||||
expect($action->isHidden())->toBeFalse();
|
||||
expect($action->isDisabled())->toBeTrue();
|
||||
expect($action->getTooltip())->toBe(UiTooltips::insufficientPermission());
|
||||
});
|
||||
|
||||
it('enables actions for members with the capability', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
$action = Action::make('test');
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->apply($action);
|
||||
|
||||
$this->actingAs($user);
|
||||
$action->record($tenant);
|
||||
|
||||
expect($action->isHidden())->toBeFalse();
|
||||
expect($action->isDisabled())->toBeFalse();
|
||||
expect($action->getTooltip())->toBeNull();
|
||||
});
|
||||
|
||||
it('supports mixed visibility composition via andVisibleWhen', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
$action = Action::make('test');
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_VIEW)
|
||||
->andVisibleWhen(fn (): bool => false)
|
||||
->apply($action);
|
||||
|
||||
$this->actingAs($user);
|
||||
|
||||
expect($action->isHidden())->toBeTrue();
|
||||
});
|
||||
|
||||
it('supports mixed visibility composition via andHiddenWhen', function () {
|
||||
$tenant = Tenant::factory()->create();
|
||||
[$user] = createUserWithTenant($tenant, role: 'owner');
|
||||
|
||||
Filament::setTenant($tenant, true);
|
||||
|
||||
$action = Action::make('test');
|
||||
|
||||
UiEnforcement::for(Capabilities::TENANT_VIEW)
|
||||
->andHiddenWhen(fn (): bool => true)
|
||||
->apply($action);
|
||||
|
||||
$this->actingAs($user);
|
||||
|
||||
expect($action->isHidden())->toBeTrue();
|
||||
});
|
||||
|
||||
it('disables bulk actions for mixed-authorization selections (capability preflight)', function () {
|
||||
$tenantA = Tenant::factory()->create();
|
||||
$tenantB = Tenant::factory()->create();
|
||||
|
||||
[$user] = createUserWithTenant($tenantA, role: 'owner');
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$tenantB->getKey() => ['role' => 'readonly'],
|
||||
]);
|
||||
|
||||
$enforcement = UiEnforcement::for(Capabilities::TENANT_SYNC)
|
||||
->tenantFromRecord()
|
||||
->preflightByCapability();
|
||||
|
||||
expect($enforcement->bulkSelectionIsAuthorized($user, collect([$tenantA, $tenantB])))->toBeFalse();
|
||||
|
||||
$user->tenants()->syncWithoutDetaching([
|
||||
$tenantB->getKey() => ['role' => 'owner'],
|
||||
]);
|
||||
|
||||
expect($enforcement->bulkSelectionIsAuthorized($user, collect([$tenantA, $tenantB])))->toBeTrue();
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user