fixup! feat(services): add log and login/session services

Author: ChristophWurst

lib/LoginStats.php

@@ -9,10 +9,12 @@
 
 namespace OCA\ServerInfo;
 
+use OCP\IConfig;
 use OCP\IDBConnection;
 
 class LoginStats {
 	public function __construct(
+		private IConfig $config,
 		private IDBConnection $db,
 	) {
 	}
@@ -23,10 +25,22 @@ public function __construct(
 	 *     bruteforceAttempts1h: int,
 	 *     bruteforceTotal: int,
 	 *     topIps: list<array{ip: string, count: int}>,
-	 *     available: bool
+	 *     available: bool,
+	 *     reason?: string
 	 * }
 	 */
 	public function getStats(): array {
+		if ($this->usesRedisBruteforceBackend()) {
+			return [
+				'bruteforceAttempts24h' => 0,
+				'bruteforceAttempts1h' => 0,
+				'bruteforceTotal' => 0,
+				'topIps' => [],
+				'available' => false,
+				'reason' => 'redis_backend',
+			];
+		}
+
 		try {
 			$total = $this->countAttempts();
 		} catch (\Throwable) {
@@ -48,6 +62,14 @@ public function getStats(): array {
 		];
 	}
 
+	private function usesRedisBruteforceBackend(): bool {
+		if ($this->config->getSystemValueBool('auth.bruteforce.protection.force.database', false)) {
+			return false;
+		}
+		$distributed = ltrim($this->config->getSystemValueString('memcache.distributed', ''), '\\');
+		return $distributed === 'OC\Memcache\Redis';
+	}
+
 	private function countAttempts(?int $sinceTimestamp = null): int {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select($qb->func()->count('id'))->from('bruteforce_attempts');

tests/lib/LoginStatsTest.php

@@ -11,15 +11,18 @@
 
 use OCA\ServerInfo\LoginStats;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Server;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 /**
  * @group DB
  */
 class LoginStatsTest extends TestCase {
 	private IDBConnection $db;
+	private IConfig&MockObject $config;
 	private LoginStats $instance;
 
 	private const IP_A = '10.0.0.1';
@@ -29,7 +32,10 @@ class LoginStatsTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 		$this->db = Server::get(IDBConnection::class);
-		$this->instance = new LoginStats($this->db);
+		$this->config = $this->createMock(IConfig::class);
+		$this->config->method('getSystemValueBool')->willReturn(false);
+		$this->config->method('getSystemValueString')->willReturn('');
+		$this->instance = new LoginStats($this->config, $this->db);
 		$this->cleanUp();
 	}
 
@@ -61,6 +67,29 @@ private function insertAttempt(string $ip, int $occurred): void {
 		$qb->executeStatement();
 	}
 
+	public function testRedisBackendReturnsUnavailable(): void {
+		$config = $this->createMock(IConfig::class);
+		$config->method('getSystemValueBool')->willReturn(false);
+		$config->method('getSystemValueString')->willReturn('OC\Memcache\Redis');
+		$instance = new LoginStats($config, $this->db);
+
+		$result = $instance->getStats();
+
+		$this->assertFalse($result['available']);
+		$this->assertSame('redis_backend', $result['reason']);
+	}
+
+	public function testForceDatabaseOverridesRedis(): void {
+		$config = $this->createMock(IConfig::class);
+		$config->method('getSystemValueBool')->willReturn(true);
+		$config->method('getSystemValueString')->willReturn('OC\Memcache\Redis');
+		$instance = new LoginStats($config, $this->db);
+
+		$result = $instance->getStats();
+
+		$this->assertTrue($result['available']);
+	}
+
 	public function testReturnShape(): void {
 		$result = $this->instance->getStats();
 
@@ -114,6 +143,7 @@ public function testTopIpsShape(): void {
 
 		$result = $this->instance->getStats();
 
+		$this->assertIsArray($result['topIps']);
 		foreach ($result['topIps'] as $entry) {
 			$this->assertArrayHasKey('ip', $entry);
 			$this->assertArrayHasKey('count', $entry);