fix: use Nextcloud's instanceid instead of generating random ID

- Changed CaIdentifierService to use system's instanceid from config.php
- Removed custom instance_id generation logic using ISecureRandom
- Updated unit tests to mock IConfig and verify correct instanceid usage
- This fixes race condition in certificate generation during integration tests

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/Service/CaIdentifierService.php

@@ -10,7 +10,7 @@
 
 use OCA\Libresign\AppInfo\Application;
 use OCP\IAppConfig;
-use OCP\Security\ISecureRandom;
+use OCP\IConfig;
 
 class CaIdentifierService {
 	private const ENGINE_TYPES = [
@@ -20,17 +20,12 @@ class CaIdentifierService {
 
 	public function __construct(
 		private IAppConfig $appConfig,
+		private IConfig $config,
 	) {
 	}
 
 	public function getInstanceId(): string {
-		$instanceId = $this->appConfig->getValueString(Application::APP_ID, 'instance_id', '');
-		if (strlen($instanceId) === 10) {
-			return $instanceId;
-		}
-		$instanceId = \OC::$server->get(ISecureRandom::class)->generate(10, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
-		$this->appConfig->setValueString(Application::APP_ID, 'instance_id', $instanceId);
-		return $instanceId;
+		return $this->config->getSystemValueString('instanceid');
 	}
 
 	public function generateCaId(string $engineName): string {

tests/php/Unit/Service/CaIdentifierServiceTest.php

@@ -10,6 +10,7 @@
 
 use OCA\Libresign\Service\CaIdentifierService;
 use OCP\IAppConfig;
+use OCP\IConfig;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -19,17 +20,22 @@
  */
 final class CaIdentifierServiceTest extends TestCase {
 	private CaIdentifierService $service;
-	private MockObject $appConfig;
+	private IAppConfig&MockObject $appConfig;
+	private IConfig&MockObject $config;
 
 	protected function setUp(): void {
-		parent::setUp();
 		$this->appConfig = $this->createMock(IAppConfig::class);
-		/** @var IAppConfig $appConfig */
-		$appConfig = $this->appConfig;
-		$this->service = new CaIdentifierService($appConfig);
+		$this->config = $this->createMock(IConfig::class);
+		$this->service = new CaIdentifierService($this->appConfig, $this->config);
 	}
 
 	public function testGenerateCaIdWithOpenSSL(): void {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValueString')
+			->with('instanceid')
+			->willReturn('abc1234567');
+
 		$this->appConfig
 			->expects($this->once())
 			->method('getValueInt')
@@ -43,10 +49,16 @@ public function testGenerateCaIdWithOpenSSL(): void {
 
 		$result = $this->service->generateCaId('openssl');
 
-		$this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:o$/', $result);
+		$this->assertEquals('libresign-ca-id:abc1234567_g:1_e:o', $result);
 	}
 
 	public function testGenerateCaIdWithCFSSL(): void {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValueString')
+			->with('instanceid')
+			->willReturn('xyz9876543');
+
 		$this->appConfig
 			->expects($this->once())
 			->method('getValueInt')
@@ -60,7 +72,7 @@ public function testGenerateCaIdWithCFSSL(): void {
 
 		$result = $this->service->generateCaId('cfssl');
 
-		$this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:c$/', $result);
+		$this->assertEquals('libresign-ca-id:xyz9876543_g:3_e:c', $result);
 	}
 
 	#[DataProvider('providerIsValidCaId')]