D5885.1779428337.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5885.1779428337.diff
View Options

	diff --git a/src/app/Observers/SignupCodeObserver.php b/src/app/Observers/SignupCodeObserver.php
	--- a/src/app/Observers/SignupCodeObserver.php
	+++ b/src/app/Observers/SignupCodeObserver.php
	@@ -32,16 +32,7 @@
	}
	}

	- $code->headers = collect(request()->headers->all())
	- ->filter(static function ($value, $key) {
	- // remove some headers we don't care about
	- return !in_array($key, ['cookie', 'referer', 'origin']);
	- })
	- ->map(static function ($value) {
	- return count($value) == 1 ? $value[0] : $value;
	- })
	- ->all();
	-
	+ $code->headers = SignupCode::requestHeaders(request());
	$code->expires_at = Carbon::now()->addHours($exp_hours);
	$code->ip_address = request()->ip();

	diff --git a/src/app/SignupCode.php b/src/app/SignupCode.php
	--- a/src/app/SignupCode.php
	+++ b/src/app/SignupCode.php
	@@ -7,6 +7,7 @@
	use Carbon\Carbon;
	use Illuminate\Database\Eloquent\Model;
	use Illuminate\Database\Eloquent\SoftDeletes;
	+use Illuminate\Http\Request;

	/**
	* The eloquent definition of a SignupCode.
	@@ -98,4 +99,20 @@

	return Utils::randStr($code_length);
	}
	+
	+ /**
	+ * Collect some headers from a request
	+ */
	+ public static function requestHeaders(Request $request): array
	+ {
	+ return collect(request()->headers->all())
	+ ->filter(static function ($value, $key) {
	+ // get only headers we care about
	+ return preg_match('/^(host\|x-forwarded-\|x-real-ip\|user-agent)/i', $key) === 1;
	+ })
	+ ->map(static function ($value) {
	+ return count($value) == 1 ? $value[0] : $value;
	+ })
	+ ->all();
	+ }
	}