Merge pull request #199 from mitwork/email-attribute-parse-issue

Корректная обработка email в CertificateWrapper
malikzh · Aug 22, 2024 · 2fa8baf · 2fa8baf
2 parents 9dd4785 + 330339e
commit 2fa8baf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/kz/ncanode/wrapper/CertificateWrapper.java b/src/main/java/kz/ncanode/wrapper/CertificateWrapper.java
@@ -259,7 +259,7 @@ private static Optional<CertificateSubject> createCertificateSubjectFromDn(Strin
                     subjectBuilder.locality((String)rdn.getValue());
                 } else if (rdn.getType().equalsIgnoreCase("S")) {
                     subjectBuilder.state((String)rdn.getValue());
-                } else if (rdn.getType().equalsIgnoreCase("E")) {
+                } else if ((rdn.getType().equalsIgnoreCase("E")) || (rdn.getType().equalsIgnoreCase("EMAILADDRESS"))) {
                     subjectBuilder.email((String)rdn.getValue());
                 } else if (rdn.getType().equalsIgnoreCase("O")) {
                     subjectBuilder.organization((String)rdn.getValue());
@@ -276,7 +276,7 @@ private static Optional<CertificateSubject> createCertificateSubjectFromDn(Strin
 
             return Optional.of(subjectBuilder.build());
         } catch (InvalidNameException e) {
-            log.warn("Distinguished name parseing error", e);
+            log.warn("Distinguished name parsing error", e);
             return Optional.empty();
         }
     }

diff --git a/src/test/groovy/kz/ncanode/unit/service/CertificateServiceTest.groovy b/src/test/groovy/kz/ncanode/unit/service/CertificateServiceTest.groovy
@@ -26,7 +26,7 @@ class CertificateServiceTest extends Specification implements WithTestData {
         result.signers.size() == 1
     }
 
-    def "invalid cetificate info method"() {
+    def "invalid certificate info method"() {
         given:
         def certs = [
             "YXNkYXNk"