ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-29 15:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updating the certificate details page to display the Holder information and include a link to the associated Endorsement Certificate.

Browse Source
This commit is contained in:
Taruan Matthews 2018-09-28 09:16:41 -04:00 committed by apldev3
parent e27e5ea1e6
commit 916638be03
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java
View File

@ -257,6 +257,17 @@ public final class CertificateStringMapBuilder {
Integer.toString(certificate.getMinorVersion()));
data.put("revisionLevel",
Integer.toString(certificate.getRevisionLevel()));
data.put("holderSerialNumber", certificate.getHolderSerialNumber()
.toString(Certificate.HEX_BASE)
.replaceAll("(?<=..)(..)", ":$1"));
data.put("holderIssuer", certificate.getHolderIssuer());
EndorsementCredential ekCertificate = EndorsementCredential
.select(certificateManager)
.bySerialNumber(certificate.getHolderSerialNumber())
.getCertificate();
if (ekCertificate != null) {
data.put("ekId", ekCertificate.getId().toString());
}
//x509 credential version
data.put("x509Version", certificate.getX509CredentialVersion());

22
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
View File

@ -179,6 +179,28 @@
</div>
</div>
</c:if>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Holder</span></div>
<div id="holder" class="col col-md-8">
<c:if test="${not empty initialData.holderIssuer}">
<div><span>${initialData.holderIssuer}</span></div>
</c:if>
<div id="certificateid">
<c:choose>
<c:when test="${not empty initialData.ekId}">
<span>
<a href="${portal}/certificate-details?id=${initialData.ekId}&type=endorsement">
${initialData.holderSerialNumber}
</a>
</span>
</c:when>
<c:otherwise>
<div><span>${initialData.holderSerialNumber}</span></div>
</c:otherwise>
</c:choose>
</div>
</div>
</div>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Manufacturer</span></div>
<div id="manufacturer" class="col col-md-8">${initialData.manufacturer}</div>

14
HIRS_Utils/src/main/java/hirs/data/persist/certificate/Certificate.java
View File

@ -196,6 +196,7 @@ public abstract class Certificate extends ArchivableEntity {
public static final String HOLDER_SERIAL_NUMBER_FIELD = "holderSerialNumber";
@Column(nullable = false, precision = MAX_NUMERIC_PRECISION, scale = 0)
private final BigInteger holderSerialNumber;
private String holderIssuer;
// we don't need to persist this, but we don't want to unpack this cert multiple times
@Transient
@ -220,6 +221,7 @@ public abstract class Certificate extends ArchivableEntity {
this.certificateHash = 0;
this.certAndTypeHash = 0;
this.holderSerialNumber = BigInteger.ZERO;
this.holderIssuer = null;
}
/**
@ -302,8 +304,10 @@ public abstract class Certificate extends ArchivableEntity {
.getBaseCertificateID()
.getSerial()
.getValue();
this.holderIssuer = attCertInfo.getHolder()
.getBaseCertificateID().getIssuer()
.getNames()[0].getName().toString();
this.signature = attCert.getSignatureValue().getBytes();
this.issuer = getAttributeCertificateIssuerNames(
attCertInfo.getIssuer())[0].toString();
this.issuerOrganization = getOrganization(this.issuer);
@ -506,6 +510,14 @@ public abstract class Certificate extends ArchivableEntity {
return holderSerialNumber;
}
/**
* Getter for the Certificate's Holder Common Name information.
* @return this certificate's holder issuer as a string.
*/
public String getHolderIssuer() {
return this.holderIssuer;
}
/**
* @return this certificate's issuer
*/