ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-17 02:09:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up log messages

Browse Source
This commit is contained in:
chubtub 2024-05-16 13:46:35 -04:00
parent bd2eb885f2
commit 888e8bd598
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java
View File

@ -419,10 +419,9 @@ public class ReferenceManifestValidator {
*/ */
private void whySignatureInvalid(final XMLSignature signature, final DOMValidateContext context) private void whySignatureInvalid(final XMLSignature signature, final DOMValidateContext context)
throws XMLSignatureException{ throws XMLSignatureException{
log.error("Verifying xml signature:");
boolean cryptoValidity = signature.getSignatureValue().validate(context); boolean cryptoValidity = signature.getSignatureValue().validate(context);
if (cryptoValidity) { if (cryptoValidity) {
log.error("Signature value is valid."); log.info("Signature value is valid.");
} else { } else {
log.error("Signature value is invalid!"); log.error("Signature value is invalid!");
} }
@ -435,7 +434,7 @@ public class ReferenceManifestValidator {
refUri = "whole document"; refUri = "whole document";
} }
if (refValidity) { if (refValidity) {
log.error("Reference for " + refUri + " is valid."); log.info("Reference for " + refUri + " is valid.");
} else { } else {
log.error("Reference for " + refUri + " is invalid!"); log.error("Reference for " + refUri + " is invalid!");
} }
@ -457,13 +456,12 @@ public class ReferenceManifestValidator {
throw new Exception("Truststore is empty"); throw new Exception("Truststore is empty");
} }
final String INT_CA_ERROR = "Intermediate CA found, searching for root CA";
String errorMessage = ""; String errorMessage = "";
X509Certificate chainCert = cert; X509Certificate chainCert = cert;
boolean isChainCertValid; boolean isChainCertValid;
do { do {
isChainCertValid = false; isChainCertValid = false;
log.error("Validating " + chainCert.getSubjectX500Principal().getName()); log.info("Validating " + chainCert.getSubjectX500Principal().getName());
for (X509Certificate trustedCert : trustStore) { for (X509Certificate trustedCert : trustStore) {
boolean isIssuer = areYouMyIssuer(chainCert, trustedCert); boolean isIssuer = areYouMyIssuer(chainCert, trustedCert);
boolean isSigner = areYouMySigner(chainCert, trustedCert); boolean isSigner = areYouMySigner(chainCert, trustedCert);
@ -534,7 +532,7 @@ public class ReferenceManifestValidator {
+ System.lineSeparator() + System.lineSeparator()
+ "Certificate needed for verification is missing: " + "Certificate needed for verification is missing: "
+ signer.getSubjectX500Principal().getName(); + signer.getSubjectX500Principal().getName();
log.error(error); log.info(error);
} catch (CertificateException e) { } catch (CertificateException e) {
throw new Exception("Encoding error: " + e.getMessage()); throw new Exception("Encoding error: " + e.getMessage());
} }