Operating mode in the admin (test mode sends all mail to a test recipient until switched live), bot protection for booking requests, mail rendering tests, mail:test command
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
fdcb68d578
commit
d018c97be4
22 files changed
+698
-23
No files matched your search
@@ -5,6 +5,7 @@
|
||||
use App\Actions\CreateReservation;
|
||||
use App\Actions\RequestMarketingConsent;
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\ReferralSource;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
@@ -77,12 +78,17 @@ class BookingRequest extends Component
|
||||
/** Honeypot, must stay empty. */
|
||||
public string $website = '';
|
||||
|
||||
/** When the form was opened (time trap against bots); cannot be changed by the browser. */
|
||||
#[Locked]
|
||||
public int $openedAt = 0;
|
||||
|
||||
#[Locked]
|
||||
public ?int $bookingId = null;
|
||||
|
||||
public function mount(?Property $property = null): void
|
||||
{
|
||||
$this->propertyId = ($property ?? Property::query()->where('is_active', true)->firstOrFail())->id;
|
||||
$this->openedAt = now()->getTimestamp();
|
||||
$this->month = CarbonImmutable::today()->format('Y-m');
|
||||
$this->prefillFromSearch();
|
||||
$this->utm = collect(request()->only(['utm_source', 'utm_medium', 'utm_campaign']))
|
||||
@@ -215,17 +221,22 @@ public function submit(CreateReservation $createReservation): void
|
||||
{
|
||||
$this->validate();
|
||||
|
||||
if ($this->website !== '') {
|
||||
// Bots: honeypot filled or submitted faster than a human can fill the form – silently ignored.
|
||||
if ($this->website !== '' || now()->getTimestamp() - $this->openedAt < config('fewo.spam.min_seconds')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$rateLimitKey = 'booking-request:'.request()->ip();
|
||||
if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
|
||||
if ($this->tooManyRequests()) {
|
||||
$this->addError('email', 'Zu viele Anfragen. Bitte versuchen Sie es später erneut oder rufen Sie uns an.');
|
||||
|
||||
return;
|
||||
}
|
||||
RateLimiter::hit($rateLimitKey, 3600);
|
||||
|
||||
if ($this->openRequestsOfEmail() >= config('fewo.spam.open_requests_per_email')) {
|
||||
$this->addError('email', 'Zu dieser E-Mail-Adresse liegen bereits offene Anfragen vor. Wir melden uns in Kürze – bei Fragen rufen Sie uns gern an.');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
$booking = $createReservation->handle(
|
||||
@@ -260,6 +271,39 @@ public function submit(CreateReservation $createReservation): void
|
||||
/**
|
||||
* @return array<string, list<string>>
|
||||
*/
|
||||
/**
|
||||
* Rate limits per IP address, per e-mail address and for all requests together (counted when they pass).
|
||||
*/
|
||||
private function tooManyRequests(): bool
|
||||
{
|
||||
$limits = [
|
||||
'booking-request:'.request()->ip() => [config('fewo.spam.per_ip_per_hour'), 3600],
|
||||
'booking-request-email:'.sha1(mb_strtolower($this->email)) => [config('fewo.spam.per_email_per_day'), 86400],
|
||||
'booking-request-all' => [config('fewo.spam.total_per_hour'), 3600],
|
||||
];
|
||||
|
||||
foreach ($limits as $key => [$max]) {
|
||||
if (RateLimiter::tooManyAttempts($key, $max)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($limits as $key => [, $decay]) {
|
||||
RateLimiter::hit($key, $decay);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private function openRequestsOfEmail(): int
|
||||
{
|
||||
return Booking::query()
|
||||
->whereIn('status', BookingStatus::holding())
|
||||
->where('hold_expires_at', '>', now())
|
||||
->whereHas('guest', fn ($query) => $query->where('email', mb_strtolower($this->email)))
|
||||
->count();
|
||||
}
|
||||
|
||||
protected function rules(): array
|
||||
{
|
||||
return [
|
||||
@@ -268,14 +312,18 @@ protected function rules(): array
|
||||
'guests' => ['required', 'integer', 'min:1', 'max:'.$this->property->max_guests],
|
||||
'extras.*' => ['nullable', 'integer', 'min:0', 'max:10'],
|
||||
'promoCode' => ['nullable', 'string', 'max:50'],
|
||||
'firstName' => ['required', 'string', 'max:255'],
|
||||
'lastName' => ['required', 'string', 'max:255'],
|
||||
'firstName' => ['required', 'string', 'max:255', 'not_regex:/https?:|www\.|<|>/i'],
|
||||
'lastName' => ['required', 'string', 'max:255', 'not_regex:/https?:|www\.|<|>/i'],
|
||||
'email' => ['required', 'email', 'max:255'],
|
||||
'phone' => ['nullable', 'string', 'max:50'],
|
||||
'street' => ['nullable', 'string', 'max:255'],
|
||||
'postalCode' => ['nullable', 'string', 'max:20'],
|
||||
'city' => ['nullable', 'string', 'max:255'],
|
||||
'message' => ['nullable', 'string', 'max:5000'],
|
||||
'message' => ['nullable', 'string', 'max:5000', function (string $attribute, mixed $value, \Closure $fail): void {
|
||||
if (preg_match_all('~https?://|www\.~i', (string) $value) > config('fewo.spam.max_links')) {
|
||||
$fail('Bitte schreiben Sie Ihre Nachricht ohne Links.');
|
||||
}
|
||||
}],
|
||||
'referralSource' => ['nullable', Rule::enum(ReferralSource::class)],
|
||||
'privacyAccepted' => ['accepted'],
|
||||
];
|
||||
|
||||
Reference in new issue
Block a user