D5484.1775352838.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5484.1775352838.diff
View Options

	diff --git a/src/app/Policy/SmtpAccess.php b/src/app/Policy/SmtpAccess.php
	--- a/src/app/Policy/SmtpAccess.php
	+++ b/src/app/Policy/SmtpAccess.php
	@@ -81,6 +81,11 @@
	return true;
	}

	+ // noreply@ user can impersonate everyone
	+ if ($user->email == \config('mail.mailers.smtp.username')) {
	+ return true;
	+ }
	+
	// Is it one of user's aliases?
	$alias = $user->aliases()->where('alias', $email)->first();

	diff --git a/src/tests/Feature/Policy/SmtpAccessTest.php b/src/tests/Feature/Policy/SmtpAccessTest.php
	--- a/src/tests/Feature/Policy/SmtpAccessTest.php
	+++ b/src/tests/Feature/Policy/SmtpAccessTest.php
	@@ -43,10 +43,16 @@
	{
	$john = $this->getTestUser('john@kolab.org');
	$jack = $this->getTestUser('jack@kolab.org');
	+ $noreply = User::where('email', \config('mail.mailers.smtp.username'))->first();

	// Test main email address
	$this->assertTrue(SmtpAccess::verifySender($john, ucfirst($john->email)));

	+ // Test noreply@ user
	+ if ($noreply) {
	+ $this->assertTrue(SmtpAccess::verifySender($noreply, $john->email));
	+ }
	+
	// Test an alias
	$this->assertTrue(SmtpAccess::verifySender($john, 'John.Doe@kolab.org'));