refactor: inject PolicyService into certificate engine handlers

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

Author: vitormattos

lib/Handler/CertificateEngine/CfsslHandler.php

@@ -22,6 +22,7 @@
 use OCA\Libresign\Service\CertificatePolicyService;
 use OCA\Libresign\Service\Crl\CrlRevocationChecker;
 use OCA\Libresign\Service\Install\InstallService;
+use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\Process\ProcessManager;
 use OCA\Libresign\Vendor\Symfony\Component\Process\Process;
 use OCP\Files\AppData\IAppDataFactory;
@@ -58,6 +59,7 @@ public function __construct(
 		protected CertificatePolicyService $certificatePolicyService,
 		protected IURLGenerator $urlGenerator,
 		protected CaIdentifierService $caIdentifierService,
+		protected PolicyService $policyService,
 		protected CrlMapper $crlMapper,
 		protected LoggerInterface $logger,
 		CrlRevocationChecker $crlRevocationChecker,
@@ -72,6 +74,7 @@ public function __construct(
 			$certificatePolicyService,
 			$urlGenerator,
 			$caIdentifierService,
+			$policyService,
 			$logger,
 			$crlRevocationChecker,
 		);

lib/Handler/CertificateEngine/OpenSslHandler.php

@@ -15,6 +15,7 @@
 use OCA\Libresign\Service\CaIdentifierService;
 use OCA\Libresign\Service\CertificatePolicyService;
 use OCA\Libresign\Service\Crl\CrlRevocationChecker;
+use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\SerialNumberService;
 use OCA\Libresign\Service\SubjectAlternativeNameService;
 use OCP\Files\AppData\IAppDataFactory;
@@ -46,6 +47,7 @@ public function __construct(
 		protected IURLGenerator $urlGenerator,
 		protected SerialNumberService $serialNumberService,
 		protected CaIdentifierService $caIdentifierService,
+		protected PolicyService $policyService,
 		protected LoggerInterface $logger,
 		protected CrlMapper $crlMapper,
 		protected SubjectAlternativeNameService $subjectAlternativeNameService,
@@ -60,6 +62,7 @@ public function __construct(
 			$certificatePolicyService,
 			$urlGenerator,
 			$caIdentifierService,
+			$policyService,
 			$logger,
 			$crlRevocationChecker,
 		);

tests/php/Unit/Handler/CertificateEngine/CfsslHandlerTest.php

@@ -15,6 +15,7 @@
 use OCA\Libresign\Service\CertificatePolicyService;
 use OCA\Libresign\Service\Crl\CrlRevocationChecker;
 use OCA\Libresign\Service\Install\InstallService;
+use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\Process\ProcessManager;
 use OCA\Libresign\Tests\Unit\TestCase;
 use OCA\Libresign\Vendor\Symfony\Component\Process\Process;
@@ -234,6 +235,7 @@ private function getConstructorArgs(?string $binary = null): array {
 		$certificatePolicyService = \OCP\Server::get(CertificatePolicyService::class);
 		$urlGenerator = \OCP\Server::get(IURLGenerator::class);
 		$caIdentifierService = \OCP\Server::get(CaIdentifierService::class);
+		$policyService = \OCP\Server::get(PolicyService::class);
 		$crlMapper = \OCP\Server::get(CrlMapper::class);
 		$logger = \OCP\Server::get(LoggerInterface::class);
 		$crlRevocationChecker = $this->createMock(CrlRevocationChecker::class);
@@ -251,6 +253,7 @@ private function getConstructorArgs(?string $binary = null): array {
 			$certificatePolicyService,
 			$urlGenerator,
 			$caIdentifierService,
+			$policyService,
 			$crlMapper,
 			$logger,
 			$crlRevocationChecker,

tests/php/Unit/Handler/CertificateEngine/OpenSslHandlerTest.php

@@ -18,6 +18,7 @@
 use OCA\Libresign\Service\CaIdentifierService;
 use OCA\Libresign\Service\CertificatePolicyService;
 use OCA\Libresign\Service\Crl\CrlRevocationChecker;
+use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\SerialNumberService;
 use OCA\Libresign\Service\SubjectAlternativeNameService;
 use OCP\Files\AppData\IAppDataFactory;
@@ -40,6 +41,7 @@ final class OpenSslHandlerTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private SerialNumberService $serialNumberService;
 	private IURLGenerator $urlGenerator;
 	private CaIdentifierService $caIdentifierService;
+	private PolicyService $policyService;
 	private CrlMapper $crlMapper;
 	private LoggerInterface $logger;
 	private SubjectAlternativeNameService $subjectAlternativeNameService;
@@ -56,6 +58,7 @@ public function setUp(): void {
 		$this->serialNumberService = \OCP\Server::get(SerialNumberService::class);
 		$this->urlGenerator = \OCP\Server::get(IURLGenerator::class);
 		$this->caIdentifierService = \OCP\Server::get(CaIdentifierService::class);
+		$this->policyService = \OCP\Server::get(PolicyService::class);
 		$this->crlMapper = \OCP\Server::get(CrlMapper::class);
 		$this->logger = \OCP\Server::get(LoggerInterface::class);
 		$this->subjectAlternativeNameService = \OCP\Server::get(SubjectAlternativeNameService::class);
@@ -75,6 +78,7 @@ private function getInstance() {
 			$this->urlGenerator,
 			$this->serialNumberService,
 			$this->caIdentifierService,
+			$this->policyService,
 			$this->logger,
 			$this->crlMapper,
 			$this->subjectAlternativeNameService,
@@ -109,6 +113,7 @@ public function testRootCertificateCsrFailureThrowsLibresignException(): void {
 				$this->urlGenerator,
 				$this->serialNumberService,
 				$this->caIdentifierService,
+				$this->policyService,
 				$this->logger,
 				$this->crlMapper,
 				$this->subjectAlternativeNameService,
@@ -136,6 +141,7 @@ public function testRootCertificateSignFailureThrowsLibresignException(): void {
 				$this->urlGenerator,
 				$this->serialNumberService,
 				$this->caIdentifierService,
+				$this->policyService,
 				$this->logger,
 				$this->crlMapper,
 				$this->subjectAlternativeNameService,
@@ -163,6 +169,7 @@ public function testRootCertificateCsrUsesGeneratedConfig(): void {
 				$this->urlGenerator,
 				$this->serialNumberService,
 				$this->caIdentifierService,
+				$this->policyService,
 				$this->logger,
 				$this->crlMapper,
 				$this->subjectAlternativeNameService,