diff --git a/routes/web.php b/routes/web.php
index b9e8de6..c5141c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -23,6 +23,7 @@ use App\Livewire\CustomDomain;
use App\Livewire\Dashboard;
use App\Livewire\Invoices;
use App\Livewire\Order;
+use App\Livewire\Security;
use App\Livewire\Support;
use App\Livewire\Users;
use App\Models\Customer;
@@ -354,10 +355,9 @@ $portal = function () {
Route::get('/backups', Backups::class)->name('backups');
Route::get('/invoices', Invoices::class)->name('invoices');
- // Platzhalter fuer Aufgabe 6, die hier die eigentliche Sicherheitsseite
- // (Sperrliste der eigenen Instanzen) anlegt. Ohne einen benannten
- // 'portal.security' bricht schon heute MailPreviewTest, weil
- // SecurityBlockMail::content() dorthin verlinkt (route('portal.security')).
+ // Die Sperrliste der eigenen Instanzen — das Ziel, auf das die Mail aus
+ // BlockAddress verlinkt (SecurityBlockMail::content() ruft
+ // route('portal.security')).
//
// NICHT '/security': die öffentliche Seite (oben, Zeile ~254) meldet
// denselben Pfad an, und $appHost/$siteHost sind hier beide leer (jede
@@ -366,7 +366,9 @@ $portal = function () {
// Routen über Methode+Domain+URI, NICHT über den Namen. Zwei GET-Routen
// auf demselben Pfad ohne Domain überschreiben sich also gegenseitig,
// unabhängig vom Namen — die zweite gewinnt lautlos, ganz ohne Fehler.
- Route::get('/security-blocks', fn () => redirect()->route('dashboard'))->name('portal.security');
+ // Der PFAD bleibt deshalb '/security-blocks', der NAME 'portal.security'
+ // (die vertraglich fixierte Schnittstelle, die die Mail benutzt).
+ Route::get('/security-blocks', Security::class)->name('portal.security');
// The customer's own invoice as a PDF, rendered on demand from the frozen
// document — the same renderer the console uses, because there is only one
diff --git a/tests/Feature/Admin/RbacMoveTest.php b/tests/Feature/Admin/RbacMoveTest.php
index 87af37f..def9f66 100644
--- a/tests/Feature/Admin/RbacMoveTest.php
+++ b/tests/Feature/Admin/RbacMoveTest.php
@@ -13,10 +13,10 @@ it('moves every permission and role to the operator guard, leaving none behind',
expect(Permission::where('guard_name', 'web')->count())->toBe(0)
->and(Role::where('guard_name', 'web')->count())->toBe(0)
// 17 from the original seed, plus customers.grant_plan,
- // instances.restart and dpa.manage — the later ones created straight
- // onto this guard, because since this migration `web` is where a
- // permission goes to match nobody at all.
- ->and(Permission::where('guard_name', 'operator')->count())->toBe(20)
+ // instances.restart, dpa.manage and instances.manage — the later
+ // ones created straight onto this guard, because since this
+ // migration `web` is where a permission goes to match nobody at all.
+ ->and(Permission::where('guard_name', 'operator')->count())->toBe(21)
->and(Role::where('guard_name', 'operator')->count())->toBe(6);
});
@@ -159,7 +159,7 @@ it('preflights every customer conflict before mutating anything, listing all of
// server, which is the whole reason this has to be checked up front.
// Every capability this installation has, pushed back to `web` above to
// stage the pre-migration shape — the figure grows with each new one.
- expect(Permission::where('guard_name', 'web')->count())->toBe(20)
+ expect(Permission::where('guard_name', 'web')->count())->toBe(21)
->and(Permission::where('guard_name', 'operator')->count())->toBe(0)
->and(Role::where('guard_name', 'web')->count())->toBe(6)
->and(Role::where('guard_name', 'operator')->count())->toBe(0)
diff --git a/tests/Feature/Mail/MailLaneRoutingTest.php b/tests/Feature/Mail/MailLaneRoutingTest.php
new file mode 100644
index 0000000..8f356d8
--- /dev/null
+++ b/tests/Feature/Mail/MailLaneRoutingTest.php
@@ -0,0 +1,82 @@
+ 'CluPilot Cloud e.U.',
+ 'address' => 'Dreherstraße 66/1/8',
+ 'postcode' => '1110',
+ 'city' => 'Wien',
+ 'vat_id' => 'ATU00000000',
+ ]);
+
+ $customer = Customer::factory()->create(['name' => 'Muster GmbH']);
+ $orders = collect([Order::factory()->create([
+ 'customer_id' => $customer->id, 'amount_cents' => 1900, 'currency' => 'EUR', 'status' => 'paid',
+ ])]);
+
+ return app(IssueInvoice::class)->forOrders($customer, $orders);
+}
+
+it('reiht jede Mail in die Schlange ihrer Spur ein', function () {
+ Queue::fake();
+
+ Mail::to('kunde@example.test')->queue(new InvoiceMail(invoiceForTest(), 'Muster'));
+
+ Queue::assertPushedOn(MailLane::CALM, Illuminate\Mail\SendQueuedMailable::class);
+});
+
+it('reiht eine Direkt-Mail in die Direkt-Spur ein', function () {
+ Queue::fake();
+
+ $user = User::factory()->create();
+
+ Mail::to('kunde@example.test')->queue(new ResetPasswordMail($user, 'https://example.test/reset', 60));
+
+ Queue::assertPushedOn(MailLane::DIRECT, Illuminate\Mail\SendQueuedMailable::class);
+});
+
+it('folgt einer verschobenen Zuordnung', function () {
+ Queue::fake();
+ MailLane::assign(InvoiceMail::class, MailLane::URGENT);
+
+ Mail::to('kunde@example.test')->queue(new InvoiceMail(invoiceForTest(), 'Muster'));
+
+ Queue::assertPushedOn(MailLane::URGENT, Illuminate\Mail\SendQueuedMailable::class);
+});
+
+it('lässt keine Mailklasse ohne Spur', function () {
+ $missing = collect(glob(app_path('Mail/*.php')))
+ ->map(fn (string $path) => 'App\\Mail\\'.basename($path, '.php'))
+ ->reject(fn (string $class) => in_array(App\Mail\Concerns\RidesALane::class, class_uses_recursive($class), true))
+ ->values()
+ ->all();
+
+ expect($missing)->toBe([]);
+});
diff --git a/tests/Feature/Security/SecurityConsoleTest.php b/tests/Feature/Security/SecurityConsoleTest.php
new file mode 100644
index 0000000..127a7eb
--- /dev/null
+++ b/tests/Feature/Security/SecurityConsoleTest.php
@@ -0,0 +1,129 @@
+active()->create();
+ $block = SecurityBlock::factory()->forHost($host)->create(['ip' => '203.0.113.20']);
+
+ Livewire::actingAs(operator('Admin'), 'operator')
+ ->test(HostDetail::class, ['host' => $host])
+ ->assertSee('203.0.113.20')
+ ->call('onSecurityBlockReleaseConfirmed', $block->uuid)
+ ->assertDispatched('notify');
+
+ expect($block->fresh()->released_at)->not->toBeNull();
+});
+
+it('verweigert das Aufheben einer Host-Sperre ohne hosts.manage', function () {
+ $host = Host::factory()->active()->create();
+ $block = SecurityBlock::factory()->forHost($host)->create();
+
+ Livewire::actingAs(operator('Read-only'), 'operator')
+ ->test(HostDetail::class, ['host' => $host])
+ ->call('onSecurityBlockReleaseConfirmed', $block->uuid)
+ ->assertForbidden();
+
+ expect($block->fresh()->released_at)->toBeNull();
+});
+
+it('laesst eine Host-Sperre nicht ueber die Instanz-Seite eines Kunden aufheben', function () {
+ // Zwei getrennte Subjekte, zwei getrennte Pruefungen: CustomerDetail darf
+ // nur Sperren an EIGENEN Instanzen aufheben, nie eine Host-Sperre — auch
+ // nicht mit instances.manage.
+ $host = Host::factory()->active()->create();
+ $block = SecurityBlock::factory()->forHost($host)->create();
+ $customer = Customer::factory()->create();
+ Instance::factory()->for($customer)->create();
+
+ Livewire::actingAs(operator('Admin'), 'operator')
+ ->test(CustomerDetail::class, ['uuid' => $customer->uuid])
+ ->call('onSecurityBlockReleaseConfirmed', $block->uuid);
+
+ expect($block->fresh()->released_at)->toBeNull();
+});
+
+it('zeigt einem Betreiber mit instances.manage die Sperre einer Kunden-Instanz und laesst ihn sie aufheben', function () {
+ $customer = Customer::factory()->create();
+ $instance = Instance::factory()->for($customer)->create();
+ $block = SecurityBlock::factory()->for($instance)->create(['ip' => '198.51.100.42']);
+
+ Livewire::actingAs(operator('Support'), 'operator')
+ ->test(CustomerDetail::class, ['uuid' => $customer->uuid])
+ ->call('onSecurityBlockReleaseConfirmed', $block->uuid)
+ ->assertDispatched('notify');
+
+ expect($block->fresh()->released_at)->not->toBeNull();
+});
+
+it('verweigert das Aufheben einer Instanz-Sperre ohne instances.manage', function () {
+ // Keine der fuenf mitgelieferten Rollen eignet sich hier: Owner, Admin und
+ // Support tragen instances.manage genau wie customers.manage (dieselbe
+ // Begruendung wie bei instances.restart), Billing und Read-only haben
+ // nicht einmal customers.manage und koennten die Seite gar nicht oeffnen.
+ // Also die eigene, engere Rolle, die die Rollen-Konsole genau dafuer
+ // vorsieht (Muster: tests/Feature/Admin/RoleManagementTest.php).
+ $role = Role::findOrCreate('Kundendienst-eng', 'operator');
+ $role->syncPermissions(['console.view', 'customers.manage']);
+ $support = Operator::factory()->create(['password' => 'password']);
+ $support->assignRole($role);
+
+ $customer = Customer::factory()->create();
+ $instance = Instance::factory()->for($customer)->create();
+ $block = SecurityBlock::factory()->for($instance)->create();
+
+ Livewire::actingAs($support, 'operator')
+ ->test(CustomerDetail::class, ['uuid' => $customer->uuid])
+ ->call('onSecurityBlockReleaseConfirmed', $block->uuid)
+ ->assertForbidden();
+
+ expect($block->fresh()->released_at)->toBeNull();
+});
+
+it('autorisiert das geteilte Konsolen-Modal nach dem Subjekt der Sperre', function () {
+ $host = Host::factory()->active()->create();
+ $hostBlock = SecurityBlock::factory()->forHost($host)->create();
+
+ $customer = Customer::factory()->create();
+ $instance = Instance::factory()->for($customer)->create();
+ $instanceBlock = SecurityBlock::factory()->for($instance)->create();
+
+ // hosts.manage oeffnet die Host-Sperre, aber nicht die Instanz-Sperre.
+ Livewire::actingAs(operator('Admin'), 'operator')
+ ->test(ConfirmReleaseBlock::class, ['uuid' => $hostBlock->uuid])
+ ->assertSee($hostBlock->ip);
+
+ Livewire::actingAs(operator('Read-only'), 'operator')
+ ->test(ConfirmReleaseBlock::class, ['uuid' => $instanceBlock->uuid])
+ ->assertForbidden();
+});
+
+it('zeigt auf der Uebersicht einen Hinweis, solange irgendwo eine Sperre aktiv ist', function () {
+ Livewire::actingAs(operator('Owner'), 'operator')
+ ->test(Overview::class)
+ ->assertDontSee(__('admin.notice.security_blocks', ['n' => 1]));
+
+ $instance = Instance::factory()->create();
+ SecurityBlock::factory()->for($instance)->create();
+
+ Livewire::actingAs(operator('Owner'), 'operator')
+ ->test(Overview::class)
+ ->assertSee(__('admin.notice.security_blocks', ['n' => 1]));
+});
diff --git a/tests/Feature/Security/SecurityPageTest.php b/tests/Feature/Security/SecurityPageTest.php
new file mode 100644
index 0000000..45a84fb
--- /dev/null
+++ b/tests/Feature/Security/SecurityPageTest.php
@@ -0,0 +1,60 @@
+create() verknuepft
+// keinen User (user_id bleibt NULL, siehe CustomerFactory) — jeder bestehende
+// Test, der einen Kunden anmeldet, ruft dafuer ensureUser() (Muster:
+// tests/Feature/CustomerTwoFactorTest.php::portalUser()). Der RUECKGABEWERT
+// wird gebraucht, nicht $customer->user danach: ensureUser() selbst liest
+// $this->user als ersten Schritt ("if ($this->user) return $this->user;"),
+// bevor user_id gesetzt ist — das cacht die Beziehung als null, und ein
+// spaeteres update() raeumt einen bereits geladenen Beziehungs-Cache nicht
+// weg. $customer->user bliebe also null, obwohl user_id laengst gesetzt ist.
+
+it('zeigt dem Inhaber die Sperren seiner eigenen Instanz', function () {
+ $customer = Customer::factory()->create();
+ $user = $customer->ensureUser();
+ $instance = Instance::factory()->for($customer)->create();
+ $block = SecurityBlock::factory()->for($instance)->create(['ip' => '203.0.113.7']);
+
+ Livewire::actingAs($user)->test(Security::class)->assertSee('203.0.113.7');
+});
+
+it('zeigt einem Inhaber die Sperren eines FREMDEN Kunden nicht', function () {
+ $meine = Customer::factory()->create();
+ $user = $meine->ensureUser();
+ $fremde = Instance::factory()->create();
+ SecurityBlock::factory()->for($fremde)->create(['ip' => '198.51.100.9']);
+
+ Livewire::actingAs($user)->test(Security::class)->assertDontSee('198.51.100.9');
+});
+
+it('laesst einen Inhaber eine fremde Sperre nicht aufheben', function () {
+ $meine = Customer::factory()->create();
+ $user = $meine->ensureUser();
+ $fremd = SecurityBlock::factory()->for(Instance::factory()->create())->create();
+
+ Livewire::actingAs($user)->test(Security::class)
+ ->call('onReleaseConfirmed', $fremd->uuid)
+ ->assertForbidden();
+
+ expect($fremd->fresh()->released_at)->toBeNull();
+});
+
+it('hebt eine eigene Sperre auf und traegt ein, wer es war', function () {
+ $customer = Customer::factory()->create();
+ $user = $customer->ensureUser();
+ $instance = Instance::factory()->for($customer)->create();
+ $block = SecurityBlock::factory()->for($instance)->create();
+
+ Livewire::actingAs($user)->test(Security::class)
+ ->call('onReleaseConfirmed', $block->uuid);
+
+ expect($block->fresh()->released_at)->not->toBeNull()
+ ->and($block->fresh()->released_by_id)->toBe($user->id);
+});