Skip to content

Commit 2931d38

Browse files
committed
refactor: remove redundant localize* methods
The service's validateFromResource() already returns properly formatted arrays with id, label, isValid, and reason. The localize* methods were unnecessarily converting numbers back to enums and then back to numbers. Now Pkcs12Handler uses the validation results directly without the circular conversion, eliminating code duplication and improving clarity. Signed-off-by: Vitor Mattos <[email protected]>
1 parent 9e77d51 commit 2931d38

2 files changed

Lines changed: 2 additions & 44 deletions

File tree

lib/Handler/SignEngine/Pkcs12Handler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,11 @@ private function enrichLeafWithNativeData(array $result, array $metadata, array
301301
}
302302

303303
if (isset($validation['signatureValidation']) && is_array($validation['signatureValidation'])) {
304-
$leaf['signature_validation'] = $this->pdfSignatureValidationService->localizeSignatureValidation($validation['signatureValidation']);
304+
$leaf['signature_validation'] = $validation['signatureValidation'];
305305
}
306306

307307
if (isset($validation['certificateValidation']) && is_array($validation['certificateValidation'])) {
308-
$leaf['certificate_validation'] = $this->pdfSignatureValidationService->localizeCertificateValidation($validation['certificateValidation']);
308+
$leaf['certificate_validation'] = $validation['certificateValidation'];
309309
}
310310

311311
if (!isset($leaf['certificate_validation'])) {

lib/Service/Signature/PdfSignatureValidationService.php

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,48 +69,6 @@ public function setTrustedRoots(array $certificates): void {
6969
$this->validator->setTrustedRoots($certificates);
7070
}
7171

72-
/**
73-
* Normalize a signature validation payload by id/reason to the canonical LibreSign shape.
74-
*
75-
* @param array{id?: int|string, reason?: mixed} $validation
76-
*/
77-
public function localizeSignatureValidation(array $validation): array {
78-
$id = (int)($validation['id'] ?? 6);
79-
$reason = is_string($validation['reason'] ?? null) ? $validation['reason'] : null;
80-
81-
$state = match ($id) {
82-
1 => ValidationState::SIGNATURE_VALID,
83-
2 => ValidationState::SIGNATURE_INVALID,
84-
3 => ValidationState::DIGEST_MISMATCH,
85-
5 => ValidationState::NOT_VERIFIED,
86-
default => ValidationState::NOT_VERIFIED,
87-
};
88-
89-
return $this->mapSignatureValidation(new ValidationResult($state, $reason));
90-
}
91-
92-
/**
93-
* Normalize a certificate validation payload by id/reason to the canonical LibreSign shape.
94-
*
95-
* @param array{id?: int|string, reason?: mixed} $validation
96-
*/
97-
public function localizeCertificateValidation(array $validation): array {
98-
$id = (int)($validation['id'] ?? 7);
99-
$reason = is_string($validation['reason'] ?? null) ? $validation['reason'] : null;
100-
101-
$state = match ($id) {
102-
1 => ValidationState::CERT_TRUSTED,
103-
2 => ValidationState::CERT_ISSUER_NOT_TRUSTED,
104-
3 => ValidationState::CERT_ISSUER_UNKNOWN,
105-
4 => ValidationState::CERT_REVOKED,
106-
5 => ValidationState::CERT_EXPIRED,
107-
6 => ValidationState::CERT_NOT_VERIFIED,
108-
default => ValidationState::CERT_NOT_VERIFIED,
109-
};
110-
111-
return $this->mapCertificateValidation(new ValidationResult($state, $reason));
112-
}
113-
11472
/**
11573
* Validate PDF signatures from file resource.
11674
*

0 commit comments

Comments
 (0)