Skip to content
This repository was archived by the owner on Jul 27, 2022. It is now read-only.

Commit c9fe8d7

Browse files
committed
MISPDEV-32 null checks added
1 parent b8a128b commit c9fe8d7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/ee/aktors/misp2/action/LoginAction.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import java.io.UnsupportedEncodingException;
6262
import java.security.NoSuchAlgorithmException;
6363
import java.security.cert.CertificateFactory;
64-
import java.security.cert.CertificateParsingException;
6564
import java.security.cert.X509Certificate;
6665
import java.util.*;
6766
import java.util.stream.Collectors;
@@ -128,7 +127,7 @@ public String showLogin() {
128127
}
129128

130129
/**
131-
* @return ERROE if login fails, SUCCESS otherwise
130+
* @return ERROR if login fails, SUCCESS otherwise
132131
*/
133132
@HTTPMethods(methods = {HTTPMethod.POST})
134133
public String loginAdmin() {
@@ -479,20 +478,21 @@ private Boolean hasValidIssuancePolicy( X509Certificate certificate) throws IOEx
479478
"1.3.6.1.4.1.51455.1.1.1"
480479
};
481480
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);
485484
CertificatePolicies policies = CertificatePolicies.getInstance(
486485
JcaX509ExtensionUtils.parseExtensionValue(extensionValue)
487486
);
487+
Objects.requireNonNull(policies, "Certificate policy extension value was empty");
488488
LOG.debug("policies found:{}", policies);
489489
Set<String> policyIds = Arrays.stream(policies.getPolicyInformation())
490490
.map(PolicyInformation::getPolicyIdentifier)
491491
.map(ASN1ObjectIdentifier::getId)
492492
.collect(Collectors.toSet());
493493
LOG.debug("policy OID's contained:{}", policyIds);
494494
return Arrays.stream(validIssuancePolicyOIDs)
495-
.anyMatch( oid -> policyIds.contains(oid));
495+
.anyMatch(policyIds::contains);
496496
}
497497

498498
private Map<String, String> parseSubjectDn(String dn) {

0 commit comments

Comments
 (0)