Page MenuHomePhorge
Files F117755621

D5760.1775203841.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D5760.1775203841.diff
View Options

diff --git a/src/app/Policy/Greylist.php b/src/app/Policy/Greylist.php
--- a/src/app/Policy/Greylist.php
+++ b/src/app/Policy/Greylist.php
@@ -177,7 +177,7 @@
->update(['greylisting' => false, 'updated_at' => $this->timestamp]);
$enabled = false;
- } elseif ($all->count() >= (self::CONNECTION_WHITELIST_THRESHOLD - 1)) {
+ } elseif ($all->where('greylisting', false)->count() >= (self::CONNECTION_WHITELIST_THRESHOLD - 1)) {
// Automatically create a whitelist if we have at least 5 (4 existing plus this) messages from the sender
$this->whitelist = Whitelist::create([
'sender_domain' => $this->senderDomain,
diff --git a/src/tests/Feature/Policy/GreylistTest.php b/src/tests/Feature/Policy/GreylistTest.php
--- a/src/tests/Feature/Policy/GreylistTest.php
+++ b/src/tests/Feature/Policy/GreylistTest.php
@@ -96,6 +96,9 @@
]);
$this->assertTrue($request->shouldDefer());
+
+ Greylist\Connect::where('sender_domain', "sender.domain")
+ ->update(['greylisting' => false]);
}
$whitelist = Greylist\Whitelist::where('sender_domain', 'sender.domain')->first();
@@ -127,6 +130,9 @@
]);
$this->assertTrue($request->shouldDefer());
+
+ Greylist\Connect::where('sender_domain', "sender.domain")
+ ->update(['greylisting' => false]);
}
$whitelist = Greylist\Whitelist::where('sender_domain', 'sender.domain')->first();
@@ -411,6 +417,9 @@
]);
$this->assertTrue($request->shouldDefer());
+
+ Greylist\Connect::where('sender_domain', "sender.domain")
+ ->update(['greylisting' => false]);
}
$whitelist = Greylist\Whitelist::where('sender_domain', 'sender.domain')->first();
@@ -444,6 +453,9 @@
]);
$this->assertTrue($request->shouldDefer());
+
+ Greylist\Connect::where('sender_domain', "sender.domain")
+ ->update(['greylisting' => false]);
}
$whitelist = Greylist\Whitelist::where('sender_domain', 'sender.domain')->first();

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 8:10 AM (13 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18793764
Default Alt Text
D5760.1775203841.diff (2 KB)

Event Timeline