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

This reverts commit 8f71e6c.

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Service/CaIdentifierService.php

@@ -10,7 +10,7 @@
 
 use OCA\Libresign\AppInfo\Application;
 use OCP\IAppConfig;
-use OCP\IConfig;
+use OCP\Security\ISecureRandom;
 
 class CaIdentifierService {
 	private const ENGINE_TYPES = [
@@ -20,12 +20,17 @@ class CaIdentifierService {
 
 	public function __construct(
 		private IAppConfig $appConfig,
-		private IConfig $config,
 	) {
 	}
 
 	public function getInstanceId(): string {
-		return $this->config->getSystemValueString('instanceid');
+		$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;
 	}
 
 	public function generateCaId(string $engineName): string {

tests/php/Unit/Service/CaIdentifierServiceTest.php

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