|
61 | 61 | import java.io.UnsupportedEncodingException;
|
62 | 62 | import java.security.NoSuchAlgorithmException;
|
63 | 63 | import java.security.cert.CertificateFactory;
|
64 |
| -import java.security.cert.CertificateParsingException; |
65 | 64 | import java.security.cert.X509Certificate;
|
66 | 65 | import java.util.*;
|
67 | 66 | import java.util.stream.Collectors;
|
@@ -128,7 +127,7 @@ public String showLogin() {
|
128 | 127 | }
|
129 | 128 |
|
130 | 129 | /**
|
131 |
| - * @return ERROE if login fails, SUCCESS otherwise |
| 130 | + * @return ERROR if login fails, SUCCESS otherwise |
132 | 131 | */
|
133 | 132 | @HTTPMethods(methods = {HTTPMethod.POST})
|
134 | 133 | public String loginAdmin() {
|
@@ -479,20 +478,21 @@ private Boolean hasValidIssuancePolicy( X509Certificate certificate) throws IOEx
|
479 | 478 | "1.3.6.1.4.1.51455.1.1.1"
|
480 | 479 | };
|
481 | 480 | byte[] extensionValue = certificate.getExtensionValue(
|
482 |
| - Extension.certificatePolicies.getId() |
483 |
| - ); |
484 |
| - LOG.debug("extensionvaluef to parse:{}", extensionValue); |
| 481 | + Extension.certificatePolicies.getId()); |
| 482 | + Objects.requireNonNull(extensionValue, "No certificate policy extension found"); |
| 483 | + LOG.debug("extensionvalue to parse:{}", extensionValue); |
485 | 484 | CertificatePolicies policies = CertificatePolicies.getInstance(
|
486 | 485 | JcaX509ExtensionUtils.parseExtensionValue(extensionValue)
|
487 | 486 | );
|
| 487 | + Objects.requireNonNull(policies, "Certificate policy extension value was empty"); |
488 | 488 | LOG.debug("policies found:{}", policies);
|
489 | 489 | Set<String> policyIds = Arrays.stream(policies.getPolicyInformation())
|
490 | 490 | .map(PolicyInformation::getPolicyIdentifier)
|
491 | 491 | .map(ASN1ObjectIdentifier::getId)
|
492 | 492 | .collect(Collectors.toSet());
|
493 | 493 | LOG.debug("policy OID's contained:{}", policyIds);
|
494 | 494 | return Arrays.stream(validIssuancePolicyOIDs)
|
495 |
| - .anyMatch( oid -> policyIds.contains(oid)); |
| 495 | + .anyMatch(policyIds::contains); |
496 | 496 | }
|
497 | 497 |
|
498 | 498 | private Map<String, String> parseSubjectDn(String dn) {
|
|
0 commit comments