mirror of
https://github.com/projectsend/projectsend.git
synced 2026-09-17 00:55:07 +00:00
28e18497b5
ProfileController::destroy() validates current_password and soft-deletes. It never asks StaffAccounts::guardLastAdministrator(), and every other door does: Staff update(), guardDeletable(), and both directions of the role conversion. This is the one door where the account being removed is certainly signed in. An installation with a single administrator therefore had a button that emptied it. Measured on main: DELETE /settings/profile 302, the account is gone live staff rows 0 (the row is trashed, not removed) anonymous GET / 302 -> /setup anonymous POST /setup a new active System Administrator EnsureSetupIsComplete asks ->exists(), which excludes trashed rows, and routes/web.php registers GET and POST setup with no auth and no guest middleware -- correctly, since a fresh installation has nobody to authenticate. SetupController::store() re-checks the same condition, so both halves agreed with each other and both were wrong once the last staff row was trashed. Two locks, because one of them is asked at five doors and the other at one. First: destroy() now asks guardLastAdministrator(), the same call with the same message as everywhere else. An administrator with a colleague still goes, a non-administrator staff member still goes, and a client still closes their own account. Second: "has this installation been set up" is not the same question as "does it have a working administrator right now", and only the first one belongs in EnsureSetupIsComplete. A trashed staff row is still evidence that setup happened, so it now counts -- in the middleware and in SetupController::setupIsComplete(), which have to agree or the result is either a redirect loop or an open form. That second lock holds even if a future door forgets the first one. Measured with the guard bypassed entirely and the row trashed directly: GET / answers with the login screen and POST /setup creates nothing. Worth stating plainly: an installation that has already lost its last administrator will now find setup shut rather than open. That is the point -- the recovery path for it is `php artisan projectsend:admin`, which is also how every unattended container installs itself, not a form that anybody on the internet can reach. Six tests, two measured red against the unfixed code (2 failed / 4 passed) -- one per lock. The other four are the boundaries: a colleague present, a staff member who is not an administrator, a client, and a genuinely fresh installation that must still reach setup. Two existing tests needed saying more clearly rather than changing: ProfileUpdateTest's deletion cases now create a second administrator, so that what they assert is self-deletion and not this new refusal; and GettingStartedTest's "fresh installation" cases forceDelete rather than delete, because a soft-deleted staff row is no longer a fresh installation -- which is the whole of the second lock. Full suite passes (2054 passed / 2 skipped), PHPStan level 8 clean.
137 lines
4.7 KiB
PHP
137 lines
4.7 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Settings;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Requests\Settings\ProfileUpdateRequest;
|
|
use App\Modules\Audit\Action;
|
|
use App\Modules\Audit\ActivityLogger;
|
|
use App\Modules\Clients\ClientFieldContext;
|
|
use App\Modules\Clients\ClientPortalCustomFields;
|
|
use App\Modules\Identity\Erasure\ErasureSchedule;
|
|
use App\Modules\Identity\StaffAccounts;
|
|
use App\Modules\Platform\Localization\TimezoneRegistry;
|
|
use App\Modules\Platform\Settings\Setting;
|
|
use App\Modules\Platform\Settings\Settings;
|
|
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
|
use Illuminate\Http\RedirectResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Inertia\Inertia;
|
|
use Inertia\Response;
|
|
|
|
class ProfileController extends Controller
|
|
{
|
|
public function __construct(
|
|
private readonly ClientPortalCustomFields $customFields,
|
|
private readonly TimezoneRegistry $timezones,
|
|
private readonly StaffAccounts $accounts,
|
|
) {}
|
|
|
|
/**
|
|
* Show the user's profile settings page.
|
|
*/
|
|
public function edit(Request $request): Response
|
|
{
|
|
$user = $request->user();
|
|
assert($user !== null);
|
|
|
|
return Inertia::render('settings/profile', [
|
|
'mustVerifyEmail' => $user instanceof MustVerifyEmail,
|
|
'status' => $request->session()->get('status'),
|
|
// Resolved, so the picker shows the zone dates are actually
|
|
// being rendered in — which for most people is the one their
|
|
// browser was detected as, not something they ever chose.
|
|
'timezone' => $this->timezones->resolve($user),
|
|
'timezones' => $this->timezones->options(),
|
|
'custom_fields' => $user->isClient() ? $this->customFields->rows(ClientFieldContext::AccountEdit, $user) : [],
|
|
'custom_field_values' => $user->isClient() ? $this->customFields->values(ClientFieldContext::AccountEdit, $user) : [],
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* The account-deletion screen.
|
|
*
|
|
* Its own page rather than a block under the profile form: this is
|
|
* the one irreversible action a person can take on themselves, and it
|
|
* should be somewhere you navigate to on purpose instead of somewhere
|
|
* you scroll past on the way to saving your email address. The delete
|
|
* itself still goes to destroy() below.
|
|
*/
|
|
public function deleteAccount(): Response
|
|
{
|
|
return Inertia::render('settings/delete-account', [
|
|
'erasureGraceDays' => (int) app(Settings::class)->get(Setting::AccountErasureGraceDays),
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* Update the user's profile settings.
|
|
*/
|
|
public function update(ProfileUpdateRequest $request): RedirectResponse
|
|
{
|
|
$user = $request->user();
|
|
assert($user !== null);
|
|
|
|
$validated = $request->validated();
|
|
$customFieldValues = $validated['custom_field_values'] ?? [];
|
|
unset($validated['custom_field_values']);
|
|
|
|
$user->fill($validated);
|
|
|
|
if ($user->isDirty('email')) {
|
|
$user->email_verified_at = null;
|
|
}
|
|
|
|
$user->save();
|
|
|
|
if ($user->isClient()) {
|
|
$this->customFields->save($user, ClientFieldContext::AccountEdit, $customFieldValues);
|
|
}
|
|
|
|
app(ActivityLogger::class)->log(Action::ProfileUpdated, $user);
|
|
|
|
return to_route('profile.edit');
|
|
}
|
|
|
|
/**
|
|
* Delete the user's account.
|
|
*/
|
|
public function destroy(Request $request): RedirectResponse
|
|
{
|
|
$request->validate([
|
|
'password' => ['required', 'current_password'],
|
|
]);
|
|
|
|
$user = $request->user();
|
|
assert($user !== null);
|
|
|
|
// The rule every other door into this already asks: Staff update(),
|
|
// guardDeletable(), and both role-conversion directions. This one
|
|
// did not, and self-deletion is the one door where the account
|
|
// being removed is certainly signed in — so the last active
|
|
// administrator could take themselves out, leaving no live staff
|
|
// row at all. EnsureSetupIsComplete then reopens first-run setup to
|
|
// anybody who asks, which is the other half of this and is closed
|
|
// below.
|
|
$this->accounts->guardLastAdministrator(
|
|
$user,
|
|
removesAdmin: $this->accounts->isAdministratorRole($user->role_id),
|
|
);
|
|
|
|
Auth::logout();
|
|
|
|
// Self-deletion: soft delete now, permanent GDPR erasure after
|
|
// the disclosed grace period (Setting::AccountErasureGraceDays).
|
|
app(ErasureSchedule::class)->apply($user);
|
|
$user->delete();
|
|
|
|
app(ActivityLogger::class)->log(Action::UserDeleted, $user, context: ['name' => $user->name]);
|
|
|
|
$request->session()->invalidate();
|
|
$request->session()->regenerateToken();
|
|
|
|
return redirect('/');
|
|
}
|
|
}
|