Merge pull request #20 from kolesa-team/CORE-2380

CORE-2380 В новом NCAnode не финализируется тикет, если документ был подписан давно
kolesa-team · Dec 12, 2023 · 2f951a5 · 2f951a5
2 parents 4eb564a + bc07f0c
commit 2f951a5
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/main/java/kz/ncanode/service/CmsService.java b/src/main/java/kz/ncanode/service/CmsService.java
@@ -228,16 +228,23 @@ public CmsVerificationResponse verify(String signedCms, String detachedData, boo
                 // TSP Checking
                 if (signer.getUnsignedAttributes() != null) {
                     var attrs = signer.getUnsignedAttributes().toHashtable();
-
                     if (attrs.containsKey(PKCSObjectIdentifiers.id_aa_signatureTimeStampToken)) {
-                        Attribute attr = (Attribute) attrs.get(PKCSObjectIdentifiers.id_aa_signatureTimeStampToken);
-
-
-                        if (attr.getAttrValues().size() != 1) {
+                        Object maybeVectorOrAttr = attrs.get(PKCSObjectIdentifiers.id_aa_signatureTimeStampToken);
+
+                        Optional<Attribute> attr = maybeVectorOrAttr instanceof Vector
+                                ? Optional.of(((List<Object>) maybeVectorOrAttr)
+                                    .stream()
+                                    .filter(Objects::nonNull)
+                                    .map(Attribute.class::cast)
+                                    .findFirst()
+                                    .orElseThrow(() -> new Exception("No attributes found")))
+                                : Optional.of((Attribute) maybeVectorOrAttr);
+
+                        if (attr.get().getAttrValues().size() != 1) {
                             throw new Exception("Too many TSP tokens");
                         }
 
-                        CMSSignedData tspCms = new CMSSignedData(attr.getAttrValues().getObjectAt(0).getDERObject().getEncoded());
+                        CMSSignedData tspCms = new CMSSignedData(attr.get().getAttrValues().getObjectAt(0).getDERObject().getEncoded());
                         TimeStampTokenInfo tspi = tspService.info(tspCms).orElseThrow();
 
                         try {