amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-11-09 02:13:38 +00:00
Code Issues Projects Releases Wiki Activity

[Web][Rspamd] Keep the global archive switch in Redis only

Browse Source
This commit is contained in:
FreddleSpl0it committed 2026-11-09 01:09:43 +01:00
1 parent 2fc6868b72
commit c48691fca7
15 files changed
+78 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/php/Archive/Service/SettingsServiceTest.php
+12 -6
View File
@@ -15,7 +15,6 @@ use Mailcow\Tests\Support\FakeArchiveLookup;
use Mailcow\Tests\Support\FakeContext;
use Mailcow\Tests\Support\FakeRedis;
use Mailcow\Tests\Support\FakeSmtpClient;
use PDOException;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -74,12 +73,19 @@ class SettingsServiceTest extends TestCase
$this->assertSame('', $this->service()->save(['password' => '', 'password_remove' => '1'])->password);
}
public function testEnabledIsOffWithoutTheTable(): void
public function testSwitchIsKeptInRedisOnly(): void
{
$repo = $this->createMock(SettingsRepository::class);
$repo->method('load')->willThrowException(new PDOException('no such table'));
$this->assertFalse((new SettingsService($repo, $this->lookup, new ArchiveState($this->redis), $this->smtp, FakeContext::admin()))->enabled());
$this->assertFalse($this->service()->enabled());
$this->assertSame(0, $this->service()->get()->toArray()['enabled']);
$this->service()->save(['enabled' => '1']);
$this->assertSame('1', $this->redis->strings['ARCHIVE_ENABLED']);
$this->assertSame(1, $this->service()->get()->toArray()['enabled']);
// saving other settings keeps the switch
$this->service()->save(['port' => '2525']);
$this->assertTrue($this->service()->enabled());
// a lost Redis key shows as off, as rspamd sees it
unset($this->redis->strings['ARCHIVE_ENABLED']);
$this->assertFalse($this->service()->enabled());
}
public function testAddressOutsideTheMailcowDomains(): void