Rollen, Rechte und Zielgruppen
Some checks failed
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 1m30s
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 1m28s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 1m31s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 1m36s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 1m45s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 1m44s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 1m35s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 1m38s
CI / Build-Artefakte aktuell (pull_request) Successful in 54s

- Rollen mit globalen Rechten und Rechten für einzelne Objekte (z. B. „Beiträge
  schreiben in Kategorie MAV-Info“); Rollen sind additiv, Zuweisungen merken
  sich ihre Herkunft (manuell oder später Identity-Provider-Gruppe)
- Systemrolle „Administration“ ersetzt users.is_admin (Migration übernimmt
  bestehende Administratoren); nicht löschbar, man kann sie sich nicht selbst entziehen
- Rechte je Person vorberechnet und gecacht, Versionszähler invalidiert bei Änderungen
- Gate-Anbindung: registrierte Rechte entscheidet das Rechtesystem, Objektregeln
  die Policies; Admin-Seiten und Plugin-Ressourcen hinter passenden Rechten
- Redaktion nach Kategorie: Schreiben und Veröffentlichen getrennt, Liste im
  Admin auf eigene Kategorien beschränkt, ohne Veröffentlichungsrecht bleibt
  ein Beitrag Entwurf
- Zielgruppen (Rolle/Abteilung/Standort) für Kategorien und Termine als
  indizierte SQL-Bedingung in Listen, Detailseiten, Kacheln und .ics-Export
- Admin: Rollen-Verwaltung, „Rechte prüfen“, Redaktion und Sichtbarkeit direkt
  an Kategorie bzw. Termin
- Kern-Ressourcen explizit registriert, damit nach Updates liegengebliebene
  alte Dateien nicht doppelt geladen werden
- docs/PLUGINS.md für Plugin-Entwicklung; Demo-Rolle „MAV“

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Friederich Loheide 2026-09-26 07:18:37 +00:00
parent 28ef1e4a20
commit 9ddc35a62c
112 changed files with 2408 additions and 267 deletions

View file

@ -7,8 +7,10 @@ use App\Models\User;
use App\Plugins\Plugin;
use App\Support\Abilities;
use App\Support\Navigation;
use Illuminate\Support\Facades\Gate;
use Inhaus\Plugins\Events\Http\Resources\EventResource;
use Inhaus\Plugins\Events\Models\Event;
use Inhaus\Plugins\Events\Policies\EventPolicy;
class EventsPlugin extends Plugin
{
@ -16,6 +18,7 @@ class EventsPlugin extends Plugin
{
$this->app->make(Navigation::class)->add('events', 'Termine', '/termine', active: 'events.*', sort: 30);
$this->app->make(Abilities::class)->define('events.manage', 'Termine verwalten', 'Termine');
Gate::policy(Event::class, EventPolicy::class);
$this->app->make(Widgets::class)->add('events.upcoming', 'events::Upcoming', 'aside', sort: 20, props: fn (User $user) => [
'events' => EventResource::collection(Event::query()->upcoming()->visibleTo($user)->limit(4)->get())->resolve(),

View file

@ -2,6 +2,7 @@
namespace Inhaus\Plugins\Events\Filament\Resources\Events;
use App\Filament\Components\AudienceSection;
use BackedEnum;
use Filament\Actions\DeleteAction;
use Filament\Actions\EditAction;
@ -83,6 +84,7 @@ class EventResource extends Resource
Section::make('Anzeige')
->columnSpan(1)
->schema([
AudienceSection::make('event', 'Wer den Termin sieht. Leer lassen = alle.'),
Toggle::make('is_published')->label('Veröffentlicht')->default(true),
FileUpload::make('image_path')
->label('Bild')

View file

@ -17,14 +17,14 @@ class EventController extends Controller
{
return Inertia::render('events::Index', [
'events' => EventResource::collection(
Event::query()->upcoming()->limit(200)->get()
Event::query()->upcoming()->visibleTo(request()->user())->limit(200)->get()
),
]);
}
public function show(Event $event): Response
{
abort_unless($event->is_published, 404);
abort_unless($event->is_published && $event->isVisibleTo(request()->user()), 404);
return Inertia::render('events::Show', [
'event' => [
@ -36,7 +36,7 @@ class EventController extends Controller
public function ics(Event $event, Calendar $calendar, Branding $branding): HttpResponse
{
abort_unless($event->is_published, 404);
abort_unless($event->is_published && $event->isVisibleTo(request()->user()), 404);
return response($calendar->toIcs($event, $branding->portalName()), 200, [
'Content-Type' => 'text/calendar; charset=utf-8',

View file

@ -4,6 +4,7 @@ namespace Inhaus\Plugins\Events\Models;
use App\Models\User;
use App\Support\Images;
use App\Support\Permissions\Audiences;
use App\Support\RichText;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
@ -91,9 +92,21 @@ class Event extends Model
}
/**
* Nur Einträge, die diese Person sehen darf (Zielgruppen). Platzhalter bis Phase 2c.
* Nur Termine, die diese Person sehen darf (Zielgruppe des Termins).
*
* @param Builder<Event> $query
*/
public function scopeVisibleTo(Builder $query, ?User $user): void {}
public function scopeVisibleTo(Builder $query, ?User $user): void
{
if ($user?->can('events.manage')) {
return;
}
Audiences::constrain($query, 'event', 'events.id', $user);
}
public function isVisibleTo(?User $user): bool
{
return (bool) $user?->can('events.manage') || Audiences::allows('event', $this->id, $user);
}
}

View file

@ -0,0 +1,29 @@
<?php
namespace Inhaus\Plugins\Events\Policies;
use App\Models\User;
use Inhaus\Plugins\Events\Models\Event;
class EventPolicy
{
public function viewAny(User $user): bool
{
return $user->can('events.manage');
}
public function create(User $user): bool
{
return $user->can('events.manage');
}
public function update(User $user, Event $event): bool
{
return $user->can('events.manage');
}
public function delete(User $user, Event $event): bool
{
return $user->can('events.manage');
}
}

View file

@ -2,11 +2,14 @@
namespace Inhaus\Plugins\News\Filament\Resources\NewsCategories;
use App\Filament\Components\AudienceSection;
use App\Filament\Components\RoleGrantSelect;
use BackedEnum;
use Filament\Actions\DeleteAction;
use Filament\Actions\EditAction;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
@ -50,6 +53,15 @@ class NewsCategoryResource extends Resource
->unique(ignoreRecord: true),
TextInput::make('description')->label('Beschreibung')->maxLength(500)->columnSpanFull(),
TextInput::make('sort')->label('Reihenfolge')->numeric()->default(0),
Section::make('Redaktion')
->description('Welche Rollen in dieser Kategorie Beiträge schreiben und veröffentlichen dürfen – z. B. die MAV in „MAV-Info“.')
->columnSpanFull()
->columns(2)
->schema([
RoleGrantSelect::make('writers', 'Dürfen schreiben', 'news.post.create', 'news_category'),
RoleGrantSelect::make('publishers', 'Dürfen veröffentlichen', 'news.post.publish', 'news_category'),
]),
AudienceSection::make('news_category', 'Wer Beiträge dieser Kategorie sieht. Leer lassen = alle.')->columnSpanFull(),
]);
}

View file

@ -15,6 +15,7 @@ use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Columns\IconColumn;
@ -22,10 +23,13 @@ use Filament\Tables\Columns\ImageColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\SelectFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Inhaus\Plugins\News\Filament\Resources\NewsPosts\Pages\CreateNewsPost;
use Inhaus\Plugins\News\Filament\Resources\NewsPosts\Pages\EditNewsPost;
use Inhaus\Plugins\News\Filament\Resources\NewsPosts\Pages\ListNewsPosts;
use Inhaus\Plugins\News\Models\NewsCategory;
use Inhaus\Plugins\News\Models\NewsPost;
use Inhaus\Plugins\News\Policies\NewsPostPolicy;
use UnitEnum;
class NewsPostResource extends Resource
@ -80,17 +84,27 @@ class NewsPostResource extends Resource
->schema([
Select::make('category_id')
->label('Kategorie')
->relationship('category', 'name')
->relationship('category', 'name', fn (Builder $query) => static::onlyWritableCategories($query))
->required(fn () => ! auth()->user()->can('news.manage'))
->rule(fn () => function (string $attribute, mixed $value, \Closure $fail) {
if ($value && ! static::onlyWritableCategories(NewsCategory::query())->whereKey($value)->exists()) {
$fail('In dieser Kategorie dürfen Sie keine Beiträge schreiben.');
}
})
->live()
->preload()
->searchable(),
DateTimePicker::make('published_at')
->label('Veröffentlichen am')
->disabled(fn (Get $get) => ! static::canPublishIn($get('category_id')))
->hint(fn (Get $get) => static::canPublishIn($get('category_id')) ? null : 'Veröffentlichung durch die Redaktion')
->helperText('Leer lassen = Entwurf. Ein Datum in der Zukunft plant den Beitrag.')
->seconds(false)
->native(false)
->displayFormat('d.m.Y H:i'),
Toggle::make('is_featured')
->label('Auf der Startseite hervorheben')
->disabled(fn (Get $get) => ! static::canPublishIn($get('category_id')))
->helperText('Hervorgehobene Beiträge mit Titelbild erscheinen groß im Slider.'),
FileUpload::make('cover_path')
->label('Titelbild')
@ -106,6 +120,33 @@ class NewsPostResource extends Resource
]);
}
/**
* Redakteure sehen nur Beiträge aus Kategorien, in denen sie schreiben dürfen.
*/
public static function getEloquentQuery(): Builder
{
$query = parent::getEloquentQuery();
$ids = auth()->user()?->permissions()->ids('news.post.create', 'news_category') ?? [];
return $ids === true || auth()->user()?->can('news.manage') ? $query : $query->whereIn('category_id', $ids);
}
/**
* @param Builder<NewsCategory> $query
* @return Builder<NewsCategory>
*/
public static function onlyWritableCategories(Builder $query): Builder
{
$ids = auth()->user()?->permissions()->ids('news.post.create', 'news_category') ?? [];
return $ids === true || auth()->user()?->can('news.manage') ? $query : $query->whereIn('id', $ids);
}
public static function canPublishIn(mixed $categoryId): bool
{
return app(NewsPostPolicy::class)->publish(auth()->user(), $categoryId ? (int) $categoryId : null);
}
public static function table(Table $table): Table
{
return $table

View file

@ -13,6 +13,11 @@ class CreateNewsPost extends CreateRecord
{
$data['author_id'] = auth()->id();
if (! NewsPostResource::canPublishIn($data['category_id'] ?? null)) {
$data['published_at'] = null;
$data['is_featured'] = false;
}
return $data;
}
}

View file

@ -10,6 +10,16 @@ class EditNewsPost extends EditRecord
{
protected static string $resource = NewsPostResource::class;
protected function mutateFormDataBeforeSave(array $data): array
{
if (! NewsPostResource::canPublishIn($data['category_id'] ?? $this->record->category_id)) {
$data['published_at'] = $this->record->published_at;
$data['is_featured'] = $this->record->is_featured;
}
return $data;
}
protected function getHeaderActions(): array
{
return [

View file

@ -14,11 +14,12 @@ class NewsController extends Controller
{
public function index(Request $request): Response
{
$categories = NewsCategory::query()->orderBy('sort')->orderBy('name')->get(['id', 'name', 'slug']);
$categories = NewsCategory::query()->visibleTo($request->user())->orderBy('sort')->orderBy('name')->get(['id', 'name', 'slug']);
$category = $categories->firstWhere('slug', $request->query('kategorie'));
$posts = NewsPost::query()
->published()
->visibleTo($request->user())
->with('category')
->when($category, fn ($query) => $query->where('category_id', $category->id))
->latest('published_at')
@ -34,7 +35,7 @@ class NewsController extends Controller
public function show(NewsPost $post): Response
{
abort_unless($post->isPublished(), 404);
abort_unless($post->isPublished() && $post->isVisibleTo(request()->user()), 404);
$post->load(['category', 'author']);
@ -53,6 +54,7 @@ class NewsController extends Controller
'related' => NewsPostResource::collection(
NewsPost::query()
->published()
->visibleTo(request()->user())
->with('category')
->whereKeyNot($post->id)
->when($post->category_id, fn ($query) => $query->where('category_id', $post->category_id))

View file

@ -2,7 +2,10 @@
namespace Inhaus\Plugins\News\Models;
use App\Models\User;
use App\Support\Permissions\Audiences;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
@ -18,6 +21,26 @@ class NewsCategory extends Model
return NewsCategoryFactory::new();
}
/**
* Für Rechte-Checks: $user->can('news.post.create', $category)
*
* @return array{0: string, 1: int}
*/
public function permissionResource(): array
{
return ['news_category', $this->id];
}
/**
* @param Builder<NewsCategory> $query
*/
public function scopeVisibleTo(Builder $query, ?User $user): void
{
if (! $user?->can('news.manage')) {
Audiences::constrain($query, 'news_category', 'news_categories.id', $user);
}
}
/**
* @return HasMany<NewsPost, $this>
*/

View file

@ -4,6 +4,7 @@ namespace Inhaus\Plugins\News\Models;
use App\Models\User;
use App\Support\Images;
use App\Support\Permissions\Audiences;
use App\Support\RichText;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
@ -117,9 +118,24 @@ class NewsPost extends Model
}
/**
* Nur Einträge, die diese Person sehen darf (Zielgruppen). Platzhalter bis Phase 2c.
* Nur Beiträge, die diese Person sehen darf – die Zielgruppe hängt an der Kategorie.
*
* @param Builder<NewsPost> $query
*/
public function scopeVisibleTo(Builder $query, ?User $user): void {}
public function scopeVisibleTo(Builder $query, ?User $user): void
{
if ($user?->can('news.manage')) {
return;
}
$query->where(function (Builder $q) use ($user) {
$q->whereNull('news_posts.category_id');
$q->orWhere(fn (Builder $inner) => Audiences::constrain($inner, 'news_category', 'news_posts.category_id', $user));
});
}
public function isVisibleTo(?User $user): bool
{
return $this->category_id === null || $user?->can('news.manage') || Audiences::allows('news_category', $this->category_id, $user);
}
}

View file

@ -9,9 +9,12 @@ use App\Support\Abilities;
use App\Support\Navigation;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
use Inhaus\Plugins\News\Http\Resources\NewsPostResource;
use Inhaus\Plugins\News\Models\NewsCategory;
use Inhaus\Plugins\News\Models\NewsPost;
use Inhaus\Plugins\News\Policies\NewsCategoryPolicy;
use Inhaus\Plugins\News\Policies\NewsPostPolicy;
class NewsPlugin extends Plugin
{
@ -25,6 +28,9 @@ class NewsPlugin extends Plugin
$abilities->define('news.post.publish', 'Beiträge veröffentlichen', 'Neuigkeiten', resource: 'news_category');
$abilities->resourceType('news_category', 'Kategorie', fn () => NewsCategory::query()->orderBy('sort')->pluck('name', 'id')->all());
Gate::policy(NewsCategory::class, NewsCategoryPolicy::class);
Gate::policy(NewsPost::class, NewsPostPolicy::class);
$this->registerWidgets($this->app->make(Widgets::class));
}

View file

@ -0,0 +1,29 @@
<?php
namespace Inhaus\Plugins\News\Policies;
use App\Models\User;
use Inhaus\Plugins\News\Models\NewsCategory;
class NewsCategoryPolicy
{
public function viewAny(User $user): bool
{
return $user->can('news.manage');
}
public function create(User $user): bool
{
return $user->can('news.manage');
}
public function update(User $user, NewsCategory $category): bool
{
return $user->can('news.manage');
}
public function delete(User $user, NewsCategory $category): bool
{
return $user->can('news.manage');
}
}

View file

@ -0,0 +1,38 @@
<?php
namespace Inhaus\Plugins\News\Policies;
use App\Models\User;
use Inhaus\Plugins\News\Models\NewsPost;
/**
* Redaktion nach Kategorie: Wer in einer Kategorie schreiben darf, bearbeitet
* dort alle Beiträge. Veröffentlichen ist ein eigenes Recht.
*/
class NewsPostPolicy
{
public function viewAny(User $user): bool
{
return $user->can('news.manage') || $user->permissions()->ids('news.post.create', 'news_category') !== [];
}
public function create(User $user): bool
{
return $this->viewAny($user);
}
public function update(User $user, NewsPost $post): bool
{
return $user->can('news.manage') || ($post->category_id && $user->can('news.post.create', ['news_category', $post->category_id]));
}
public function delete(User $user, NewsPost $post): bool
{
return $this->update($user, $post);
}
public function publish(User $user, ?int $categoryId): bool
{
return $user->can('news.manage') || ($categoryId && $user->can('news.post.publish', ['news_category', $categoryId]));
}
}