mirror of
https://github.com/nsacyber/HIRS.git
synced 2024-12-18 20:47:58 +00:00
This commit adds functionality to display tpm even log information to the support RIM display page. Outstanding issues to implement: 1) add link to base from support RIM, 2) make event table scrollable
This commit is contained in:
parent
39cfaa5fac
commit
3636782987
@ -9,6 +9,7 @@ import java.security.KeyStoreException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.cert.CertificateException;
|
||||
|
||||
import hirs.data.persist.BaseReferenceManifest;
|
||||
import hirs.data.persist.TPMMeasurementRecord;
|
||||
import hirs.data.persist.SwidResource;
|
||||
import hirs.data.persist.PCRPolicy;
|
||||
@ -335,13 +336,9 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
|
||||
|
||||
fwStatus = new AppraisalStatus(PASS,
|
||||
SupplyChainCredentialValidator.FIRMWARE_VALID);
|
||||
if (rim == null) {
|
||||
fwStatus = new AppraisalStatus(FAIL,
|
||||
String.format("Firmware validation failed: "
|
||||
+ "No associated RIM file could be found for %s",
|
||||
manufacturer));
|
||||
} else {
|
||||
List<SwidResource> swids = rim.parseResource();
|
||||
if (rim instanceof BaseReferenceManifest) {
|
||||
BaseReferenceManifest bRim = (BaseReferenceManifest) rim;
|
||||
List<SwidResource> swids = bRim.parseResource();
|
||||
for (SwidResource swid : swids) {
|
||||
baseline = swid.getPcrValues()
|
||||
.toArray(new String[swid.getPcrValues().size()]);
|
||||
@ -413,6 +410,11 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
|
||||
fwStatus = new AppraisalStatus(FAIL, "Associated Issued Attestation"
|
||||
+ " Certificate can not be found.");
|
||||
}
|
||||
} else {
|
||||
fwStatus = new AppraisalStatus(FAIL,
|
||||
String.format("Firmware validation failed: "
|
||||
+ "No associated RIM file could be found for %s",
|
||||
manufacturer));
|
||||
}
|
||||
|
||||
return buildValidationRecord(SupplyChainValidation.ValidationType.FIRMWARE,
|
||||
|
@ -6,5 +6,4 @@
|
||||
|
||||
<suppressions>
|
||||
<suppress checks="MagicNumber" files=".*[/\\]src[/\\]test[/\\]+" />
|
||||
<suppress checks="AvoidInlineConditionals" files=".*[/\\]src[/\\]test[/\\]+" />
|
||||
</suppressions>
|
||||
|
@ -27,7 +27,7 @@ public final class DataTableResponse<T> {
|
||||
|
||||
/**
|
||||
* Builds a data table response using a FilteredRecordList.
|
||||
* @param recordList the filtered recordd list
|
||||
* @param recordList the filtered record list
|
||||
* @param inputQuery the data table input (used for draw)
|
||||
*/
|
||||
public DataTableResponse(final FilteredRecordsList<T> recordList,
|
||||
|
@ -1,7 +1,10 @@
|
||||
package hirs.attestationca.portal.page.controllers;
|
||||
|
||||
import hirs.data.persist.BaseReferenceManifest;
|
||||
import hirs.data.persist.ReferenceManifest;
|
||||
import hirs.data.persist.SupportReferenceManifest;
|
||||
import hirs.data.persist.SwidResource;
|
||||
import hirs.persist.DBManagerException;
|
||||
import hirs.persist.ReferenceManifestManager;
|
||||
import hirs.tpm.eventlog.TCGEventLog;
|
||||
import hirs.attestationca.portal.page.Page;
|
||||
@ -10,9 +13,6 @@ import hirs.attestationca.portal.page.PageMessages;
|
||||
import hirs.attestationca.portal.page.params.ReferenceManifestDetailsPageParams;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.NoSuchFileException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.util.Arrays;
|
||||
@ -20,6 +20,7 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -53,6 +54,7 @@ public class ReferenceManifestDetailsPageController
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the filePath for the view and the data model for the page.
|
||||
*
|
||||
* @param params The object to map url parameters into.
|
||||
* @param model The data model for the request. Can contain data from
|
||||
@ -120,72 +122,75 @@ public class ReferenceManifestDetailsPageController
|
||||
.select(referenceManifestManager)
|
||||
.byEntityId(uuid).getRIM();
|
||||
|
||||
if (rim != null) {
|
||||
if (rim instanceof BaseReferenceManifest) {
|
||||
BaseReferenceManifest bRim = (BaseReferenceManifest) rim;
|
||||
// Software Identity
|
||||
data.put("swidName", rim.getSwidName());
|
||||
data.put("swidVersion", rim.getSwidVersion());
|
||||
if (rim.isSwidCorpus() == 1) {
|
||||
data.put("swidName", bRim.getSwidName());
|
||||
data.put("swidVersion", bRim.getSwidVersion());
|
||||
if (bRim.isSwidCorpus() == 1) {
|
||||
data.put("swidCorpus", "True");
|
||||
} else {
|
||||
data.put("swidCorpus", "False");
|
||||
}
|
||||
if (rim.isSwidPatch() == 1) {
|
||||
if (bRim.isSwidPatch() == 1) {
|
||||
data.put("swidPatch", "True");
|
||||
} else {
|
||||
data.put("swidPatch", "False");
|
||||
}
|
||||
if (rim.isSwidSupplemental() == 1) {
|
||||
if (bRim.isSwidSupplemental() == 1) {
|
||||
data.put("swidSupplemental", "True");
|
||||
} else {
|
||||
data.put("swidSupplemental", "False");
|
||||
}
|
||||
// data.put("swidCorpus", (rim.isSwidCorpus() == 1) ? "True" : "False");
|
||||
// data.put("swidPatch", (rim.isSwidPatch() == 1) ? "True" : "False");
|
||||
// data.put("swidSupplemental", (rim.isSwidSupplemental() == 1) ? "True" : "False");
|
||||
data.put("swidTagId", rim.getTagId());
|
||||
// Entity
|
||||
data.put("entityName", rim.getEntityName());
|
||||
data.put("entityRegId", rim.getEntityRegId());
|
||||
data.put("entityRole", rim.getEntityRole());
|
||||
data.put("entityThumbprint", rim.getEntityThumbprint());
|
||||
data.put("entityName", bRim.getEntityName());
|
||||
data.put("entityRegId", bRim.getEntityRegId());
|
||||
data.put("entityRole", bRim.getEntityRole());
|
||||
data.put("entityThumbprint", bRim.getEntityThumbprint());
|
||||
// Link
|
||||
data.put("linkHref", rim.getLinkHref());
|
||||
data.put("linkRel", rim.getLinkRel());
|
||||
data.put("linkHref", bRim.getLinkHref());
|
||||
data.put("linkRel", bRim.getLinkRel());
|
||||
data.put("supportBaseRimId", "");
|
||||
data.put("supportBaseRimTagId", "");
|
||||
data.put("platformManufacturer", rim.getPlatformManufacturer());
|
||||
data.put("platformManufacturerId", rim.getPlatformManufacturerId());
|
||||
data.put("platformModel", rim.getPlatformModel());
|
||||
data.put("platformVersion", rim.getPlatformVersion());
|
||||
data.put("firmwareVersion", rim.getFirmwareVersion());
|
||||
data.put("payloadType", rim.getPayloadType());
|
||||
data.put("colloquialVersion", rim.getColloquialVersion());
|
||||
data.put("edition", rim.getEdition());
|
||||
data.put("product", rim.getProduct());
|
||||
data.put("revision", rim.getRevision());
|
||||
data.put("bindingSpec", rim.getBindingSpec());
|
||||
data.put("bindingSpecVersion", rim.getBindingSpecVersion());
|
||||
data.put("pcUriGlobal", rim.getPcURIGlobal());
|
||||
data.put("pcUriLocal", rim.getPcURILocal());
|
||||
data.put("rimLinkHash", rim.getRimLinkHash());
|
||||
data.put("platformManufacturer", bRim.getPlatformManufacturer());
|
||||
data.put("platformManufacturerId", bRim.getPlatformManufacturerId());
|
||||
data.put("platformModel", bRim.getPlatformModel());
|
||||
data.put("platformVersion", bRim.getPlatformVersion());
|
||||
data.put("firmwareVersion", bRim.getFirmwareVersion());
|
||||
data.put("payloadType", bRim.getPayloadType());
|
||||
data.put("colloquialVersion", bRim.getColloquialVersion());
|
||||
data.put("edition", bRim.getEdition());
|
||||
data.put("product", bRim.getProduct());
|
||||
data.put("revision", bRim.getRevision());
|
||||
data.put("bindingSpec", bRim.getBindingSpec());
|
||||
data.put("bindingSpecVersion", bRim.getBindingSpecVersion());
|
||||
data.put("pcUriGlobal", bRim.getPcURIGlobal());
|
||||
data.put("pcUriLocal", bRim.getPcURILocal());
|
||||
data.put("rimLinkHash", bRim.getRimLinkHash());
|
||||
data.put("rimType", bRim.getRimType());
|
||||
data.put("associatedRim", bRim.getAssociatedRim());
|
||||
|
||||
// checkout later
|
||||
data.put("rimType", rim.getRimType());
|
||||
List<SwidResource> resources = rim.parseResource();
|
||||
List<SwidResource> resources = bRim.parseResource();
|
||||
String resourceFilename = null;
|
||||
TCGEventLog logProcessor;
|
||||
|
||||
// going to have to pull the filename and grab that from the DB
|
||||
// to get the id to make the link
|
||||
try {
|
||||
for (SwidResource swidRes : resources) {
|
||||
resourceFilename = swidRes.getName();
|
||||
Path logPath = Paths.get(String.format("%s/%s",
|
||||
SwidResource.RESOURCE_UPLOAD_FOLDER,
|
||||
resourceFilename));
|
||||
if (Files.exists(logPath)) {
|
||||
logProcessor = new TCGEventLog(
|
||||
Files.readAllBytes(logPath));
|
||||
ReferenceManifest dbRim = ReferenceManifest.select(
|
||||
referenceManifestManager).byFileName(resourceFilename).getRIM();
|
||||
|
||||
if (dbRim != null) {
|
||||
logProcessor = new TCGEventLog(dbRim.getRimBytes());
|
||||
swidRes.setPcrValues(Arrays.asList(
|
||||
logProcessor.getExpectedPCRValues()));
|
||||
|
||||
if (bRim.getAssociatedRim() == null) {
|
||||
bRim.setAssociatedRim(dbRim.getId());
|
||||
}
|
||||
} else {
|
||||
swidRes.setPcrValues(new ArrayList<>());
|
||||
}
|
||||
@ -194,12 +199,23 @@ public class ReferenceManifestDetailsPageController
|
||||
LOGGER.error(String.format("File Not found!: %s",
|
||||
resourceFilename));
|
||||
LOGGER.error(nsfEx);
|
||||
} catch (DBManagerException dbmEx) {
|
||||
LOGGER.error(dbmEx);
|
||||
}
|
||||
|
||||
data.put("associatedRim", bRim.getAssociatedRim());
|
||||
data.put("swidFiles", resources);
|
||||
} else if (rim instanceof SupportReferenceManifest) {
|
||||
SupportReferenceManifest sRim = (SupportReferenceManifest) rim;
|
||||
data.put("baseRim", sRim.getFileName());
|
||||
data.put("associatedRim", sRim.getAssociatedRim());
|
||||
data.put("rimType", sRim.getRimType());
|
||||
|
||||
TCGEventLog logProcessor = new TCGEventLog(sRim.getRimBytes());
|
||||
data.put("events", logProcessor.getEventList());
|
||||
} else {
|
||||
LOGGER.error(String.format("Unable to find Reference Integrity "
|
||||
+ "Manifest with ID: %s", uuid));
|
||||
LOGGER.error(String.format("Unable to find Reference Integrity "
|
||||
+ "Manifest with ID: %s", uuid));
|
||||
}
|
||||
|
||||
return data;
|
||||
|
@ -26,10 +26,9 @@ import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
@ -202,27 +201,54 @@ public class ReferenceManifestPageController
|
||||
matcher = pattern.matcher(fileName);
|
||||
supportRIM = matcher.matches();
|
||||
|
||||
if (supportRIM) {
|
||||
filePath = Paths.get(String.format("%s/%s",
|
||||
SwidResource.RESOURCE_UPLOAD_FOLDER,
|
||||
file.getOriginalFilename()));
|
||||
if (Files.notExists(Paths.get(SwidResource.RESOURCE_UPLOAD_FOLDER))) {
|
||||
Files.createDirectory(Paths.get(SwidResource.RESOURCE_UPLOAD_FOLDER));
|
||||
}
|
||||
if (Files.notExists(filePath)) {
|
||||
Files.createFile(filePath);
|
||||
}
|
||||
|
||||
Files.write(filePath, file.getBytes());
|
||||
|
||||
String uploadCompletedMessage = String.format(
|
||||
"%s successfully uploaded", file.getOriginalFilename());
|
||||
messages.addSuccess(uploadCompletedMessage);
|
||||
LOGGER.info(uploadCompletedMessage);
|
||||
}
|
||||
|
||||
//Parse reference manifests
|
||||
ReferenceManifest rim = parseRIM(file, supportRIM, messages);
|
||||
// look for associated base/support
|
||||
Set<ReferenceManifest> rims = ReferenceManifest
|
||||
.select(referenceManifestManager).getRIMs();
|
||||
|
||||
// update information for associated support rims
|
||||
if (supportRIM) {
|
||||
for (ReferenceManifest element : rims) {
|
||||
if (element instanceof BaseReferenceManifest) {
|
||||
BaseReferenceManifest bRim = (BaseReferenceManifest) element;
|
||||
for (SwidResource swid : bRim.parseResource()) {
|
||||
if (swid.getName().equals(rim.getFileName())) {
|
||||
rim.setFirmwareVersion(swid.getSize());
|
||||
rim.setPlatformManufacturer(element.getPlatformManufacturer());
|
||||
rim.setPlatformModel(element.getPlatformModel());
|
||||
rim.setTagId(element.getTagId());
|
||||
rim.setAssociatedRim(element.getId());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
BaseReferenceManifest bRim = (BaseReferenceManifest) rim;
|
||||
for (SwidResource swid : bRim.parseResource()) {
|
||||
for (ReferenceManifest element : rims) {
|
||||
if (element instanceof SupportReferenceManifest) {
|
||||
SupportReferenceManifest sRim = (SupportReferenceManifest) element;
|
||||
if (swid.getName().equals(sRim.getFileName())) {
|
||||
sRim.setPlatformManufacturer(bRim.getPlatformManufacturer());
|
||||
sRim.setPlatformModel(bRim.getPlatformModel());
|
||||
sRim.setFirmwareVersion(swid.getSize());
|
||||
sRim.setTagId(bRim.getTagId());
|
||||
rim.setAssociatedRim(sRim.getId());
|
||||
try {
|
||||
referenceManifestManager.update(sRim);
|
||||
} catch (DBManagerException dbmEx) {
|
||||
LOGGER.error(String.format("Couldn't update Base RIM %s with "
|
||||
+ "associated UUID %s", rim.getTagId(),
|
||||
sRim.getId()), dbmEx);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Store only if it was parsed
|
||||
if (rim != null) {
|
||||
@ -320,6 +346,8 @@ public class ReferenceManifestPageController
|
||||
fileName.append(".swidTag\"");
|
||||
} else {
|
||||
// this needs to be updated for support rims
|
||||
SupportReferenceManifest bRim = (SupportReferenceManifest) referenceManifest;
|
||||
fileName.append(bRim.getFileName());
|
||||
}
|
||||
|
||||
// Set filename for download.
|
||||
@ -382,9 +410,9 @@ public class ReferenceManifestPageController
|
||||
|
||||
try {
|
||||
if (supportRIM) {
|
||||
return new SupportReferenceManifest(fileBytes);
|
||||
return new SupportReferenceManifest(fileName, fileBytes);
|
||||
} else {
|
||||
return new BaseReferenceManifest(fileBytes);
|
||||
return new BaseReferenceManifest(fileName, fileBytes);
|
||||
}
|
||||
// the this is a List<Object> is object is a JaxBElement that can
|
||||
// be matched up to the QName
|
||||
|
@ -8,6 +8,7 @@
|
||||
<my:page>
|
||||
<jsp:attribute name="style">
|
||||
<link type="text/css" rel="stylesheet" href="${common}/certificate_details.css"/>
|
||||
<link type="text/css" rel="stylesheet" href="${common}/rim_details.css"/>
|
||||
</jsp:attribute>
|
||||
<jsp:attribute name="pageHeaderTitle">
|
||||
${initialData.rimType} Reference Integrity Manifest
|
||||
@ -17,192 +18,267 @@
|
||||
</jsp:attribute>
|
||||
<jsp:body>
|
||||
<div id="certificate-details-page" class="container-fluid">
|
||||
<div class="row">
|
||||
<c:if test="${initialData.swidSupplemental=='True'}">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Base RIM</span></div>
|
||||
<div id="baseRim" class="col col-md-8">
|
||||
<c:choose>
|
||||
<c:when test="${not empty initialData.supportBaseRimTagId}">
|
||||
<a href="${portal}/rim-details?id=${initialData.supportBaseRimId}">
|
||||
${initialData.supportBaseRimTagId}
|
||||
</a>
|
||||
<!-- Event Number, Event Type, Digest (hex), Event Content -->
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="component col col-md-10" style="color: red; padding-left: 20px">Base RIM not uploaded from the ACA RIM Page</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Software Identity</span></div>
|
||||
<div id="softwareIdentity" class="col col-md-8">
|
||||
<div>SWID Name: <span>${initialData.swidName}</span></div>
|
||||
<div>SWID Version: <span>${initialData.swidVersion}</span></div>
|
||||
<div>SWID Tag ID: <span>${initialData.swidTagId}</span></div>
|
||||
<div>SWID Tag Version: <span></span></div>
|
||||
<c:if test="${initialData.swidCorpus}">
|
||||
<div>SWID Corpus: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Corpus Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:if test="${initialData.swidPatch}">
|
||||
<div>SWID Patch: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Patch Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:if test="${initialData.swidSupplemental}">
|
||||
<div>SWID Supplemental: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Supplemental Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Entity</span></div>
|
||||
<div id="entity" class="col col-md-8">
|
||||
<div>Entity Name: <span>${initialData.entityName}</span></div>
|
||||
<c:if test="${not empty initialData.entityRegId}">
|
||||
<div>Entity Reg ID: <span>${initialData.entityRegId}</span></div>
|
||||
</c:if>
|
||||
<div>Entity Role: <span>${initialData.entityRole}</span></div>
|
||||
<div>Entity Thumbprint: <span>${initialData.entityThumbprint}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Link</span></div>
|
||||
<div id="link" class="col col-md-8">
|
||||
<c:if test="${not empty initialData.linkHref}">
|
||||
<div><span><a href="${initialData.linkHref}" rel="${initialData.linkRel}">${initialData.linkHref}</a></span>
|
||||
</div>
|
||||
<div>Rel: <span>${initialData.linkRel}</span>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Meta</span></div>
|
||||
<div id="link" class="col col-md-8">
|
||||
<div>Platform Manufacturer ID: <span>${initialData.platformManufacturerId}</span></div>
|
||||
<div>Platform Manufacturer: <span>${initialData.platformManufacturer}</span></div>
|
||||
<div>Platform Model: <span>${initialData.platformModel}</span></div>
|
||||
<c:if test="${not empty initialData.platformVersion}">
|
||||
<div>Platform Version: <span>${initialData.platformVersion}</span></div>
|
||||
</c:if>
|
||||
<div>Colloquial Version: <span>${initialData.colloquialVersion}</span></div>
|
||||
<div>Edition: <span>${initialData.edition}</span></div>
|
||||
<div>Product: <span>${initialData.product}</span></div>
|
||||
<div>Revision: <span>${initialData.revision}</span></div>
|
||||
|
||||
<c:if test="${not empty initialData.payloadType}">
|
||||
<div>Payload Type: <span>${initialData.payloadType}</span></div>
|
||||
</c:if>
|
||||
<c:if test="${not empty initialData.firmwareVersion}">
|
||||
<div>Firmware Version: <span>${initialData.firmwareVersion}</span></div>
|
||||
</c:if>
|
||||
<div>Binding Spec: <span>${initialData.bindingSpec}</span></div>
|
||||
<div>Binding Spec Version: <span>${initialData.bindingSpecVersion}</span></div>
|
||||
<c:if test="${not empty initiaData.pcUriGlobal}">
|
||||
<div>PC URI Global: <span>${initialData.pcUriGlobal}</span></div>
|
||||
</c:if>
|
||||
<c:if test="${not empty initiaData.pcUriLocal}">
|
||||
<div>PC URI Local: <span>${initialData.pcUriLocal}</span></div>
|
||||
</c:if>
|
||||
<div>Rim Link Hash: <span>${initialData.rimLinkHash}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Payload/Support RIM(s)</span></div>
|
||||
<div id="platformConfiguration" class="col col-md-8">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading" role="tab" id="headingOne">
|
||||
<h4 class="panel-title">
|
||||
<a role="button" data-toggle="collapse" data-parent="#platformConfiguration" class="collapsed"
|
||||
href="#directorycollapse" aria-expanded="true" aria-controls="directorycollapse">
|
||||
Directory
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="directorycollapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true">
|
||||
<div class="panel-body">
|
||||
<div class="panel-heading" role="tab" id="headingThree">
|
||||
<h3 class="panel-title">
|
||||
<a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
|
||||
href="#filescollapse" aria-expanded="false" aria-controls="filescollapse">
|
||||
Files
|
||||
<c:choose>
|
||||
<c:when test="${initialData.rimType=='Support'}">
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Base RIM</span></div>
|
||||
<div id="baseRim" class="col col-md-8">
|
||||
<c:choose>
|
||||
<c:when test="${not empty initialData.associatedRim}">
|
||||
<a href="${portal}/rim-details?id=${initialData.associatedRim}">
|
||||
${initialData.associatedRim}
|
||||
</a>
|
||||
</h3>
|
||||
</div>
|
||||
<div id="filescollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
|
||||
<c:if test="${not empty initialData.swidFiles}">
|
||||
<div id="componentIdentifier" class="row">
|
||||
<c:forEach items="${initialData.swidFiles}" var="resource">
|
||||
<div class="component col col-md-10" style="padding-left: 20px">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<span data-toggle="tooltip" data-placement="top" title="Resource File">
|
||||
${resource.getName()}
|
||||
</span>
|
||||
</div>
|
||||
<c:choose>
|
||||
<c:when test="${not empty resource.getPcrValues()}">
|
||||
<div class="component col col-md-10">
|
||||
<span class="fieldHeader">File Size:</span>
|
||||
<span class="fieldValue">${resource.getSize()}</span><br/>
|
||||
<span class="fieldHeader">Hash:</span>
|
||||
<span class="fieldValue" style="overflow-wrap: break-word">${resource.getHashValue()}</span><br/>
|
||||
<c:if test="${not empty resource.getRimFormat()}">
|
||||
<span class="fieldHeader">RIM Format:</span>
|
||||
<span class="fieldValue">${resource.getRimFormat()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getRimType()}">
|
||||
<span class="fieldHeader">RIM Type:</span>
|
||||
<span class="fieldValue">${resource.getRimType()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getRimUriGlobal()}">
|
||||
<span class="fieldHeader">URI Global:</span>
|
||||
<span class="fieldValue">${resource.getRimUriGlobal()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getPcrValues()}">
|
||||
<div class="panel-body">
|
||||
<div class="component" role="tab" id="pcrValues">
|
||||
<a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
|
||||
href="#pcrscollapse" aria-expanded="false" aria-controls="pcrscollapse">
|
||||
Expected PCR Values
|
||||
</a>
|
||||
</div>
|
||||
<div id="pcrscollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
|
||||
<div>
|
||||
<c:forEach items="${resource.getPcrMap()}" var="pcrValue">
|
||||
<div id="componentIdentifier" class="row">
|
||||
<div>
|
||||
<span>${pcrValue.key}</span>
|
||||
<span style="overflow-wrap: break-word">${pcrValue.value}</span>
|
||||
<!-- Event Number, Event Type, Digest (hex), Event Content -->
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="component col col-md-10" style="color: red; padding-left: 20px">Base RIM not uploaded from the ACA RIM Page</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tableDivTag">
|
||||
<input type="text" id="eventInput" onkeyup="eventSearch()" placeholder="Search for text..." /><br />
|
||||
<table id="eventLog">
|
||||
<thead>
|
||||
<tr class="header">
|
||||
<th style="width: 5%">Event #</th>
|
||||
<th style="width: 10%">PCR Index</th>
|
||||
<th style="width: 20%">Event Type</th>
|
||||
<th style="width: 20%">Digest</th>
|
||||
<th style="width: 50%">Event Content</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:if test="${not empty initialData.events}">
|
||||
<c:set var="count" value="1" scope="page"/>
|
||||
<c:forEach items="${initialData.events}" var="event">
|
||||
<tr>
|
||||
<td>${count}</td>
|
||||
<td>${event.getPcrIndex()}</td>
|
||||
<td>${event.getEventTypeStr()}</td>
|
||||
<td>${event.getEventDigestStr()}</td>
|
||||
<td>${event.getEventContentStr()}</td>
|
||||
</tr>
|
||||
<c:set var="count" value="${count + 1}" scope="page"/>
|
||||
<!-- not status.last ? ‘<hr/>’ : ‘<br/>’ -->
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Software Identity</span></div>
|
||||
<div id="softwareIdentity" class="col col-md-8">
|
||||
<div>SWID Name: <span>${initialData.swidName}</span></div>
|
||||
<div>SWID Version: <span>${initialData.swidVersion}</span></div>
|
||||
<div>SWID Tag ID: <span>${initialData.swidTagId}</span></div>
|
||||
<div>SWID Tag Version: <span></span></div>
|
||||
<c:if test="${initialData.swidCorpus}">
|
||||
<div>SWID Corpus: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Corpus Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:if test="${initialData.swidPatch}">
|
||||
<div>SWID Patch: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Patch Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:if test="${initialData.swidSupplemental}">
|
||||
<div>SWID Supplemental: <span><img src="${icons}/ic_checkbox_marked_circle_black_green_24dp.png" title="Supplemental Flag"></span>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Entity</span></div>
|
||||
<div id="entity" class="col col-md-8">
|
||||
<div>Entity Name: <span>${initialData.entityName}</span></div>
|
||||
<c:if test="${not empty initialData.entityRegId}">
|
||||
<div>Entity Reg ID: <span>${initialData.entityRegId}</span></div>
|
||||
</c:if>
|
||||
<div>Entity Role: <span>${initialData.entityRole}</span></div>
|
||||
<div>Entity Thumbprint: <span>${initialData.entityThumbprint}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Link</span></div>
|
||||
<div id="link" class="col col-md-8">
|
||||
<c:if test="${not empty initialData.linkHref}">
|
||||
<div><span><a href="${initialData.linkHref}" rel="${initialData.linkRel}">${initialData.linkHref}</a></span>
|
||||
</div>
|
||||
<div>Rel: <span>${initialData.linkRel}</span>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Meta</span></div>
|
||||
<div id="link" class="col col-md-8">
|
||||
<div>Platform Manufacturer ID: <span>${initialData.platformManufacturerId}</span></div>
|
||||
<div>Platform Manufacturer: <span>${initialData.platformManufacturer}</span></div>
|
||||
<div>Platform Model: <span>${initialData.platformModel}</span></div>
|
||||
<c:if test="${not empty initialData.platformVersion}">
|
||||
<div>Platform Version: <span>${initialData.platformVersion}</span></div>
|
||||
</c:if>
|
||||
<div>Colloquial Version: <span>${initialData.colloquialVersion}</span></div>
|
||||
<div>Edition: <span>${initialData.edition}</span></div>
|
||||
<div>Product: <span>${initialData.product}</span></div>
|
||||
<div>Revision: <span>${initialData.revision}</span></div>
|
||||
|
||||
<c:if test="${not empty initialData.payloadType}">
|
||||
<div>Payload Type: <span>${initialData.payloadType}</span></div>
|
||||
</c:if>
|
||||
<c:if test="${not empty initialData.firmwareVersion}">
|
||||
<div>Firmware Version: <span>${initialData.firmwareVersion}</span></div>
|
||||
</c:if>
|
||||
<div>Binding Spec: <span>${initialData.bindingSpec}</span></div>
|
||||
<div>Binding Spec Version: <span>${initialData.bindingSpecVersion}</span></div>
|
||||
<c:if test="${not empty initiaData.pcUriGlobal}">
|
||||
<div>PC URI Global: <span>${initialData.pcUriGlobal}</span></div>
|
||||
</c:if>
|
||||
<c:if test="${not empty initiaData.pcUriLocal}">
|
||||
<div>PC URI Local: <span>${initialData.pcUriLocal}</span></div>
|
||||
</c:if>
|
||||
<div>Rim Link Hash: <span>${initialData.rimLinkHash}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Payload/Support RIM(s)</span></div>
|
||||
<div id="platformConfiguration" class="col col-md-8">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading" role="tab" id="headingOne">
|
||||
<h4 class="panel-title">
|
||||
<a role="button" data-toggle="collapse" data-parent="#platformConfiguration" class="collapsed"
|
||||
href="#directorycollapse" aria-expanded="true" aria-controls="directorycollapse">
|
||||
Directory
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="directorycollapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true">
|
||||
<div class="panel-body">
|
||||
<div class="panel-heading" role="tab" id="headingThree">
|
||||
<h3 class="panel-title">
|
||||
<a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
|
||||
href="#filescollapse" aria-expanded="false" aria-controls="filescollapse">
|
||||
Files
|
||||
</a>
|
||||
</h3>
|
||||
</div>
|
||||
<div id="filescollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
|
||||
<c:if test="${not empty initialData.swidFiles}">
|
||||
<div id="componentIdentifier" class="row">
|
||||
<c:forEach items="${initialData.swidFiles}" var="resource">
|
||||
<div class="component col col-md-10" style="padding-left: 20px">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<span data-toggle="tooltip" data-placement="top" title="Resource File">
|
||||
<c:choose>
|
||||
<c:when test="${not empty initialData.associatedRim}">
|
||||
<a href="${portal}/rim-details?id=${initialData.associatedRim}">${resource.getName()}</a>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
${resource.getName()}
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</span>
|
||||
</div>
|
||||
<c:choose>
|
||||
<c:when test="${not empty resource.getPcrValues()}">
|
||||
<div class="component col col-md-10">
|
||||
<span class="fieldHeader">File Size:</span>
|
||||
<span class="fieldValue">${resource.getSize()}</span><br/>
|
||||
<span class="fieldHeader">Hash:</span>
|
||||
<span class="fieldValue" style="overflow-wrap: break-word">${resource.getHashValue()}</span><br/>
|
||||
<c:if test="${not empty resource.getRimFormat()}">
|
||||
<span class="fieldHeader">RIM Format:</span>
|
||||
<span class="fieldValue">${resource.getRimFormat()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getRimType()}">
|
||||
<span class="fieldHeader">RIM Type:</span>
|
||||
<span class="fieldValue">${resource.getRimType()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getRimUriGlobal()}">
|
||||
<span class="fieldHeader">URI Global:</span>
|
||||
<span class="fieldValue">${resource.getRimUriGlobal()}</span><br/>
|
||||
</c:if>
|
||||
<c:if test="${not empty resource.getPcrValues()}">
|
||||
<div class="panel-body">
|
||||
<div class="component" role="tab" id="pcrValues">
|
||||
<a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
|
||||
href="#pcrscollapse" aria-expanded="false" aria-controls="pcrscollapse">
|
||||
Expected PCR Values
|
||||
</a>
|
||||
</div>
|
||||
<div id="pcrscollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
|
||||
<div>
|
||||
<c:forEach items="${resource.getPcrMap()}" var="pcrValue">
|
||||
<div id="componentIdentifier" class="row">
|
||||
<div>
|
||||
<span>${pcrValue.key}</span>
|
||||
<span style="overflow-wrap: break-word">${pcrValue.value}</span>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="component col col-md-10" style="color: red; padding-left: 20px">Support RIM file named ${resource.getName()} was not imported via the Reference Integrity Manifest page.</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="component col col-md-10" style="color: red; padding-left: 20px">Support RIM file named ${resource.getName()} was not imported via the Reference Integrity Manifest page.</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
function eventSearch() {
|
||||
// Declare variables
|
||||
var input, filter, table, tr, td, i, txtValue, txtFound;
|
||||
input = document.getElementById("eventInput");
|
||||
filter = input.value.toUpperCase();
|
||||
table = document.getElementById("eventLog");
|
||||
tr = table.getElementsByTagName("tr");
|
||||
|
||||
// Loop through all table rows, and hide those who don't match the search query
|
||||
for (i = 0; i < tr.length; i++) {
|
||||
txtFound = false;
|
||||
tds = tr[i].getElementsByTagName("td");
|
||||
for (j = 0; j < tds.length; j++) {
|
||||
td = tds[j];
|
||||
|
||||
if (td) {
|
||||
txtValue = td.textContent || td.innerText;
|
||||
if (txtValue.toUpperCase().indexOf(filter) > -1) {
|
||||
txtFound = true;
|
||||
break;
|
||||
} else {
|
||||
txtFound = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (txtFound) {
|
||||
tr[i].style.display = "";
|
||||
} else {
|
||||
tr[i].style.display = "none";
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</jsp:body>
|
||||
</my:page>
|
||||
|
@ -16,6 +16,7 @@
|
||||
font-weight: bold;
|
||||
margin: auto 0;
|
||||
}
|
||||
|
||||
#platformID {
|
||||
display: inline;
|
||||
}
|
||||
@ -62,4 +63,4 @@
|
||||
margin: 4px 2px;
|
||||
cursor: pointer;
|
||||
border-radius: 2px;
|
||||
}
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
package hirs.attestationca.portal.page.controllers;
|
||||
|
||||
import hirs.data.persist.BaseReferenceManifest;
|
||||
import hirs.data.persist.ReferenceManifest;
|
||||
import hirs.persist.DBReferenceManifestManager;
|
||||
import hirs.attestationca.portal.page.Page;
|
||||
@ -52,7 +53,7 @@ public class ReferenceManifestDetailsPageControllerTest extends PageControllerTe
|
||||
} catch (URISyntaxException e) {
|
||||
throw new IOException("Could not resolve path URI", e);
|
||||
}
|
||||
referenceManifest = new ReferenceManifest(Files.readAllBytes(fPath));
|
||||
referenceManifest = new BaseReferenceManifest(Files.readAllBytes(fPath));
|
||||
referenceManifestManager.save(referenceManifest);
|
||||
}
|
||||
|
||||
|
@ -12,6 +12,7 @@ import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.JAXBElement;
|
||||
import javax.xml.bind.JAXBException;
|
||||
@ -26,6 +27,10 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@Entity
|
||||
public class BaseReferenceManifest extends ReferenceManifest {
|
||||
private static final Logger LOGGER = LogManager.getLogger(BaseReferenceManifest.class);
|
||||
|
||||
@ -35,14 +40,12 @@ public class BaseReferenceManifest extends ReferenceManifest {
|
||||
private String swidName = null;
|
||||
@Column
|
||||
private String swidVersion = null;
|
||||
@Column(nullable = false)
|
||||
private int swidCorpus = 0;
|
||||
@Column(nullable = false)
|
||||
private int swidPatch = 0;
|
||||
@Column(nullable = false)
|
||||
private int swidSupplemental = 0;
|
||||
@Column
|
||||
private String firmwareVersion = null;
|
||||
private int swidCorpus = 0;
|
||||
@Column
|
||||
private int swidPatch = 0;
|
||||
@Column
|
||||
private int swidSupplemental = 0;
|
||||
@Column
|
||||
private String colloquialVersion = null;
|
||||
@Column
|
||||
@ -74,10 +77,11 @@ public class BaseReferenceManifest extends ReferenceManifest {
|
||||
private String linkRel = null;
|
||||
|
||||
/**
|
||||
* Support constructor for the RIM object.
|
||||
*
|
||||
* @param fileName
|
||||
* @param rimBytes
|
||||
* @throws IOException
|
||||
* @param fileName - string representation of the uploaded file.
|
||||
* @param rimBytes - the file content of the uploaded file.
|
||||
* @throws IOException - thrown if the file is invalid.
|
||||
*/
|
||||
public BaseReferenceManifest(final String fileName, final byte[] rimBytes) throws IOException {
|
||||
this(rimBytes);
|
||||
@ -440,24 +444,6 @@ public class BaseReferenceManifest extends ReferenceManifest {
|
||||
this.swidSupplemental = swidSupplemental;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the firmware version info.
|
||||
*
|
||||
* @return string for the firmware version
|
||||
*/
|
||||
public String getFirmwareVersion() {
|
||||
return firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the firmware version info.
|
||||
*
|
||||
* @param firmwareVersion passed in firmware version
|
||||
*/
|
||||
public void setFirmwareVersion(final String firmwareVersion) {
|
||||
this.firmwareVersion = firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the Entity Name.
|
||||
*
|
||||
@ -769,8 +755,8 @@ public class BaseReferenceManifest extends ReferenceManifest {
|
||||
return String.format("ReferenceManifest{swidName=%s,"
|
||||
+ "platformManufacturer=%s,"
|
||||
+ " platformModel=%s,"
|
||||
+ "firmwareVersion=%s, firmwareVersion=%s, rimHash=%d}",
|
||||
+ "tagId=%s, rimHash=%d}",
|
||||
swidName, this.getPlatformManufacturer(),
|
||||
this.getPlatformModel(), firmwareVersion, getTagId(), this.getRimHash());
|
||||
this.getPlatformModel(), getTagId(), this.getRimHash());
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
package hirs.data.persist;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.UUID;
|
||||
import javax.persistence.Access;
|
||||
import javax.persistence.AccessType;
|
||||
import javax.persistence.Column;
|
||||
@ -12,6 +13,8 @@ import hirs.persist.ReferenceManifestManager;
|
||||
import hirs.persist.ReferenceManifestSelector;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.hibernate.annotations.Type;
|
||||
|
||||
import javax.persistence.Table;
|
||||
import javax.xml.XMLConstants;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
@ -28,7 +31,13 @@ import javax.xml.bind.annotation.XmlRootElement;
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
@Access(AccessType.FIELD)
|
||||
public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
/**
|
||||
* String for display of a Base RIM.
|
||||
*/
|
||||
public static final String BASE_RIM = "Base";
|
||||
/**
|
||||
* String for display of a Support RIM.
|
||||
*/
|
||||
public static final String SUPPORT_RIM = "Support";
|
||||
|
||||
/**
|
||||
@ -69,12 +78,6 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
public Selector(final ReferenceManifestManager referenceManifestManager) {
|
||||
super(referenceManifestManager);
|
||||
}
|
||||
|
||||
/**
|
||||
* Specify a manufacturer that certificates must have to be considered as matching.
|
||||
* @param rimType the manufacturer to query, not empty or null
|
||||
* @return this instance (for chaining further calls)
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
@ -96,9 +99,14 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
@Column
|
||||
private String platformManufacturerId = null;
|
||||
@Column
|
||||
private String firmwareVersion = null;
|
||||
@Column
|
||||
private String platformModel = null;
|
||||
@Column(nullable = false)
|
||||
private String fileName = null;
|
||||
@Type(type = "uuid-char")
|
||||
@Column
|
||||
private UUID associatedRim;
|
||||
|
||||
/**
|
||||
* Get a Selector for use in retrieving ReferenceManifest.
|
||||
@ -119,8 +127,18 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
this.rimBytes = null;
|
||||
this.rimHash = 0;
|
||||
this.rimType = null;
|
||||
this.platformManufacturer = null;
|
||||
this.platformManufacturerId = null;
|
||||
this.platformModel = null;
|
||||
this.fileName = BASE_RIM;
|
||||
this.tagId = null;
|
||||
this.associatedRim = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default constructor for ingesting the bytes of the file content.
|
||||
* @param rimBytes - file contents.
|
||||
*/
|
||||
public ReferenceManifest(final byte[] rimBytes) {
|
||||
Preconditions.checkArgument(rimBytes != null,
|
||||
"Cannot construct a RIM from a null byte array");
|
||||
@ -238,6 +256,40 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
this.tagId = tagId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the firmware version info.
|
||||
*
|
||||
* @return string for the firmware version
|
||||
*/
|
||||
public String getFirmwareVersion() {
|
||||
return firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the firmware version info.
|
||||
*
|
||||
* @param firmwareVersion passed in firmware version
|
||||
*/
|
||||
public void setFirmwareVersion(final String firmwareVersion) {
|
||||
this.firmwareVersion = firmwareVersion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the associated RIM DB ID.
|
||||
* @return UUID for the rim
|
||||
*/
|
||||
public UUID getAssociatedRim() {
|
||||
return associatedRim;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the associated RIM DB ID.
|
||||
* @param associatedRim UUID for the rim
|
||||
*/
|
||||
public void setAssociatedRim(final UUID associatedRim) {
|
||||
this.associatedRim = associatedRim;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the Reference Integrity Manifest as a byte array.
|
||||
*
|
||||
@ -264,4 +316,26 @@ public abstract class ReferenceManifest extends ArchivableEntity {
|
||||
public int hashCode() {
|
||||
return getRimHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(final Object object) {
|
||||
if (this == object) {
|
||||
return true;
|
||||
}
|
||||
if (object == null || getClass() != object.getClass()) {
|
||||
return false;
|
||||
}
|
||||
if (!super.equals(object)) {
|
||||
return false;
|
||||
}
|
||||
ReferenceManifest that = (ReferenceManifest) object;
|
||||
return rimHash == that.rimHash
|
||||
&& Arrays.equals(rimBytes, that.rimBytes)
|
||||
&& rimType.equals(that.rimType)
|
||||
&& tagId.equals(that.tagId)
|
||||
&& platformManufacturer.equals(that.platformManufacturer)
|
||||
&& platformManufacturerId.equals(that.platformManufacturerId)
|
||||
&& platformModel.equals(that.platformModel)
|
||||
&& fileName.equals(that.fileName);
|
||||
}
|
||||
}
|
||||
|
@ -1,21 +1,45 @@
|
||||
package hirs.data.persist;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import hirs.tpm.eventlog.TCGEventLog;
|
||||
import hirs.tpm.eventlog.TpmPcrEvent;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import java.io.IOException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Sub class that will just focus on PCR Values and Events
|
||||
* Sub class that will just focus on PCR Values and Events.
|
||||
*/
|
||||
@Entity
|
||||
public class SupportReferenceManifest extends ReferenceManifest {
|
||||
private static final Logger LOGGER = LogManager.getLogger(SupportReferenceManifest.class);
|
||||
|
||||
@Column(nullable = false)
|
||||
@Column
|
||||
@JsonIgnore
|
||||
private int pcrHash;
|
||||
private int pcrHash = 0;
|
||||
|
||||
/**
|
||||
* Support constructor for the RIM object.
|
||||
*
|
||||
* @param fileName - string representation of the uploaded file.
|
||||
* @param rimBytes byte array representation of the RIM
|
||||
* @throws IOException if unable to unmarshal the string
|
||||
*/
|
||||
public SupportReferenceManifest(final String fileName,
|
||||
final byte[] rimBytes) throws IOException {
|
||||
this(rimBytes);
|
||||
this.setRimType(SUPPORT_RIM);
|
||||
this.setFileName(fileName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Main constructor for the RIM object. This takes in a byte array of a
|
||||
@ -27,19 +51,71 @@ public class SupportReferenceManifest extends ReferenceManifest {
|
||||
public SupportReferenceManifest(final byte[] rimBytes) throws IOException {
|
||||
super(rimBytes);
|
||||
this.setRimType(SUPPORT_RIM);
|
||||
this.pcrHash = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default constructor necessary for Hibernate.
|
||||
*/
|
||||
protected SupportReferenceManifest() {
|
||||
|
||||
super();
|
||||
this.pcrHash = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter method for the expected PCR values contained within the support
|
||||
* RIM.
|
||||
* @return a string array of the pcr values.
|
||||
*/
|
||||
public String[] getExpectedPCRList() {
|
||||
try {
|
||||
TCGEventLog logProcessor = new TCGEventLog(this.getRimBytes());
|
||||
this.pcrHash = Arrays.hashCode(logProcessor.getExpectedPCRValues());
|
||||
return logProcessor.getExpectedPCRValues();
|
||||
} catch (CertificateException cEx) {
|
||||
LOGGER.error(cEx);
|
||||
} catch (NoSuchAlgorithmException noSaEx) {
|
||||
LOGGER.error(noSaEx);
|
||||
} catch (IOException ioEx) {
|
||||
LOGGER.error(ioEx);
|
||||
}
|
||||
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter method for the event log that should be present in the support RIM.
|
||||
*
|
||||
* @return list of TPM PCR Events for display
|
||||
*/
|
||||
public List<TpmPcrEvent> getEventLog() {
|
||||
TCGEventLog logProcessor = null;
|
||||
try {
|
||||
logProcessor = new TCGEventLog(this.getRimBytes());
|
||||
return Collections.unmodifiableList(logProcessor.getEventList());
|
||||
} catch (CertificateException cEx) {
|
||||
LOGGER.error(cEx);
|
||||
} catch (NoSuchAlgorithmException noSaEx) {
|
||||
LOGGER.error(noSaEx);
|
||||
} catch (IOException ioEx) {
|
||||
LOGGER.error(ioEx);
|
||||
}
|
||||
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the PCR Hash contained in the support RIM.
|
||||
* @return hash in int form
|
||||
*/
|
||||
public int getPcrHash() {
|
||||
return pcrHash;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for the PCR Hash.
|
||||
* @param pcrHash hash in int form
|
||||
*/
|
||||
public void setPcrHash(final int pcrHash) {
|
||||
this.pcrHash = pcrHash;
|
||||
}
|
||||
|
@ -118,11 +118,11 @@ public abstract class ReferenceManifestSelector<ReferenceManifest> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Specif the file name of the object to grab.
|
||||
* Specify the file name of the object to grab.
|
||||
* @param fileName the name of the file associated with the rim
|
||||
* @return
|
||||
* @return instance of the manifest in relation to the filename.
|
||||
*/
|
||||
public ReferenceManifestSelector byFileName(final int fileName) {
|
||||
public ReferenceManifestSelector byFileName(final String fileName) {
|
||||
setFieldValue(RIM_FILENAME_FIELD, fileName);
|
||||
return this;
|
||||
}
|
||||
|
@ -252,7 +252,7 @@ public final class TCGEventLog {
|
||||
public String[] getExpectedPCRValues() {
|
||||
String[] pcrs = new String[PCR_COUNT];
|
||||
for (int i = 0; i < PCR_COUNT; i++) {
|
||||
pcrs[i] = HexUtils.byteArrayToHexString(pcrList[i]);
|
||||
pcrs[i] = Hex.encodeHexString(pcrList[i]);
|
||||
}
|
||||
return pcrs;
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package hirs.tpm.eventlog;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigInteger;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
@ -25,51 +26,82 @@ import hirs.tpm.eventlog.uefi.UefiConstants;
|
||||
import hirs.tpm.eventlog.uefi.UefiFirmware;
|
||||
import hirs.tpm.eventlog.uefi.UefiVariable;
|
||||
import hirs.utils.HexUtils;
|
||||
import org.apache.commons.codec.binary.Hex;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
/**
|
||||
* Class to process a TCG_PCR_EVENT.
|
||||
* TCG_PCR_EVENT is used when the Event log uses the SHA1 Format as described in the
|
||||
* TCG Platform Firmware Profile (PFP) specification.
|
||||
* typedef struct {
|
||||
* TCG_PCRINDEX PCRIndex; //PCR Index value that either
|
||||
* //matches the PCRIndex of a
|
||||
* //previous extend operation or
|
||||
* //indicates that this Event Log
|
||||
* //entry is not associated with
|
||||
* //an extend operation
|
||||
* TCG_EVENTTYPE EventType; //See Log event types defined in toStrng()
|
||||
* TCG_DIGEST digest; //The hash of the event data
|
||||
* UINT32 EventSize; //Size of the event data
|
||||
* UINT8 Event[EventSize]; //The event data
|
||||
* TCG_PCRINDEX PCRIndex; //PCR Index value that either
|
||||
* //matches the PCRIndex of a
|
||||
* //previous extend operation or
|
||||
* //indicates that this Event Log
|
||||
* //entry is not associated with
|
||||
* //an extend operation
|
||||
* TCG_EVENTTYPE EventType; //See Log event types defined in toStrng()
|
||||
* TCG_DIGEST digest; //The hash of the event data
|
||||
* UINT32 EventSize; //Size of the event data
|
||||
* UINT8 Event[EventSize]; //The event data
|
||||
* } TCG_PCR_EVENT;
|
||||
*/
|
||||
public class TpmPcrEvent {
|
||||
/** Log format. SHA1=1, Crytpo agile=2. */
|
||||
private int logFormat = -1;
|
||||
/** PCR index. */
|
||||
private int pcrIndex = -1;
|
||||
/** Event Type (long). */
|
||||
private long eventType = 0;
|
||||
/** Event digest. */
|
||||
private byte[] digest = null;
|
||||
/** Even data (no content). */
|
||||
private byte[] event;
|
||||
/** Even content data. */
|
||||
private byte[] eventContent;
|
||||
/** TCG Event Log spec version. */
|
||||
private String version = "Unknown";
|
||||
/** TCG Event Log errata version. */
|
||||
private String errata = "Unknown";
|
||||
/** Description for toString support. */
|
||||
private String description = "";
|
||||
/** Length (in bytes) of a pcr. */
|
||||
private int digestLength = 0;
|
||||
/** Event hash for SHA1 event logs. */
|
||||
private byte[] eventDataSha1hash;
|
||||
/** Event hash for Crypto Agile events. */
|
||||
private byte[] eventDataSha256hash;
|
||||
/** Indent Offset. */
|
||||
private static final Logger LOGGER = LogManager.getLogger(TpmPcrEvent.class);
|
||||
/**
|
||||
* Indent Offset.
|
||||
*/
|
||||
private static final int INDENT_3 = 3;
|
||||
/**
|
||||
* Log format. SHA1=1, Crytpo agile=2.
|
||||
*/
|
||||
private int logFormat = -1;
|
||||
/**
|
||||
* PCR index.
|
||||
*/
|
||||
private int pcrIndex = -1;
|
||||
/**
|
||||
* Event Type (long).
|
||||
*/
|
||||
private long eventType = 0;
|
||||
/**
|
||||
* Event digest.
|
||||
*/
|
||||
private byte[] digest = null;
|
||||
/**
|
||||
* Event data (no content).
|
||||
*/
|
||||
private byte[] event;
|
||||
/**
|
||||
* Event content data.
|
||||
*/
|
||||
private byte[] eventContent;
|
||||
/**
|
||||
* TCG Event Log spec version.
|
||||
*/
|
||||
private String version = "Unknown";
|
||||
/**
|
||||
* TCG Event Log errata version.
|
||||
*/
|
||||
private String errata = "Unknown";
|
||||
/**
|
||||
* Description for toString support.
|
||||
*/
|
||||
private String description = "";
|
||||
/**
|
||||
* Length (in bytes) of a pcr.
|
||||
*/
|
||||
private int digestLength = 0;
|
||||
/**
|
||||
* Event hash for SHA1 event logs.
|
||||
*/
|
||||
private byte[] eventDataSha1hash;
|
||||
/**
|
||||
* Event hash for Crypto Agile events.
|
||||
*/
|
||||
private byte[] eventDataSha256hash;
|
||||
private EvPostCode evPostCode;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
@ -104,6 +136,14 @@ public class TpmPcrEvent {
|
||||
return digestCopy;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a hex representation of the event digest.
|
||||
* @return hex string
|
||||
*/
|
||||
public String getEventDigestStr() {
|
||||
return Hex.encodeHexString(this.digest);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the event PCR index value from a TCG Event.
|
||||
*
|
||||
@ -122,22 +162,25 @@ public class TpmPcrEvent {
|
||||
return pcrIndex;
|
||||
}
|
||||
|
||||
/** Sets the Log Format for this TCG Event.
|
||||
* 1 = SHA1 Format, 2 = Crypto Agile format.
|
||||
* @param format indicates log format.
|
||||
*/
|
||||
protected void setLogFormat(final int format) {
|
||||
logFormat = format;
|
||||
}
|
||||
/**
|
||||
* Sets the Log Format for this TCG Event.
|
||||
* 1 = SHA1 Format, 2 = Crypto Agile format.
|
||||
*
|
||||
* @param format indicates log format.
|
||||
*/
|
||||
protected void setLogFormat(final int format) {
|
||||
logFormat = format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the Log Format for this TCG Event.
|
||||
* 1 = SHA1 Format, 2 = Crypto Agile format.
|
||||
* @return number representing the format.
|
||||
*/
|
||||
public int getLogFormat() {
|
||||
return logFormat;
|
||||
}
|
||||
/**
|
||||
* Gets the Log Format for this TCG Event.
|
||||
* 1 = SHA1 Format, 2 = Crypto Agile format.
|
||||
*
|
||||
* @return number representing the format.
|
||||
*/
|
||||
public int getLogFormat() {
|
||||
return logFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the EventType.
|
||||
@ -157,6 +200,14 @@ public class TpmPcrEvent {
|
||||
return eventType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a formatted string of the type for the event.
|
||||
* @return a string formatted to be human readable
|
||||
*/
|
||||
public String getEventTypeStr() {
|
||||
return String.format("0x%s %s", Long.toHexString(eventType), eventString((int) eventType));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the version of the TCG Log Event specification pertaining to the log.
|
||||
* only updated if the event is a TCG_EfiSpecIdEvent.
|
||||
@ -190,11 +241,13 @@ public class TpmPcrEvent {
|
||||
/**
|
||||
* Gets the Event Data (no event content) for the event.
|
||||
* event log format.
|
||||
*
|
||||
* @return byte array holding the event structure.
|
||||
*/
|
||||
public byte[] getEvent() {
|
||||
return java.util.Arrays.copyOf(event, event.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the event content after processing.
|
||||
*
|
||||
@ -202,17 +255,168 @@ public class TpmPcrEvent {
|
||||
*/
|
||||
protected void setEventContent(final byte[] eventData) {
|
||||
eventContent = new byte[eventData.length];
|
||||
evPostCode = new EvPostCode(eventContent);
|
||||
System.arraycopy(eventData, 0, eventContent, 0, eventData.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the event Content Data (not the entire event structure).
|
||||
*
|
||||
* @return byte array holding the events content field
|
||||
*/
|
||||
public byte[] getEventContent() {
|
||||
return java.util.Arrays.copyOf(eventContent, eventContent.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* A getter that parses the content based on the type and returns the proper string
|
||||
* value for the content.
|
||||
* @return an appended string of human readable data
|
||||
*/
|
||||
public String getEventContentStr() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
switch ((int) this.eventType) {
|
||||
case EvConstants.EV_PREBOOT_CERT:
|
||||
sb.append(" EV_PREBOOT_CERT");
|
||||
break;
|
||||
case EvConstants.EV_POST_CODE:
|
||||
sb.append(new EvPostCode(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_UNUSED:
|
||||
break;
|
||||
case EvConstants.EV_NO_ACTION:
|
||||
EvNoAction noAction = null;
|
||||
try {
|
||||
noAction = new EvNoAction(eventContent);
|
||||
sb.append(noAction.toString());
|
||||
if (noAction.isSpecIDEvent()) {
|
||||
// this should be in the constructor
|
||||
EvEfiSpecIdEvent specID = noAction.getEvEfiSpecIdEvent();
|
||||
version = String.format("%s.%s",
|
||||
specID.getVersionMajor(),
|
||||
specID.getVersionMinor());
|
||||
errata = specID.getErrata();
|
||||
}
|
||||
} catch (UnsupportedEncodingException ueEx) {
|
||||
LOGGER.error(ueEx);
|
||||
sb.append(ueEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_SEPARATOR:
|
||||
if (EvPostCode.isAscii(eventContent)
|
||||
&& !this.isBlank(eventContent)) {
|
||||
sb.append(String.format("Separator event content = %s",
|
||||
new String(eventContent, StandardCharsets.UTF_8)));
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_EVENT_TAG:
|
||||
sb.append(new EvEventTag(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_S_CRTM_CONTENTS:
|
||||
sb.append(new EvSCrtmContents(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_S_CRTM_VERSION:
|
||||
try {
|
||||
sb.append(new EvSCrtmVersion(eventContent).toString());
|
||||
} catch (UnsupportedEncodingException ueEx) {
|
||||
LOGGER.error(ueEx);
|
||||
sb.append(ueEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_CPU_MICROCODE:
|
||||
case EvConstants.EV_PLATFORM_CONFIG_FLAGS:
|
||||
case EvConstants.EV_TABLE_OF_DEVICES:
|
||||
break;
|
||||
case EvConstants.EV_COMPACT_HASH:
|
||||
try {
|
||||
sb.append(new EvCompactHash(eventContent).toString());
|
||||
} catch (UnsupportedEncodingException ueEx) {
|
||||
LOGGER.error(ueEx);
|
||||
sb.append(ueEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_IPL:
|
||||
sb.append(new EvIPL(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_IPL_PARTITION_DATA:
|
||||
case EvConstants.EV_NONHOST_CODE:
|
||||
case EvConstants.EV_NONHOST_CONFIG:
|
||||
case EvConstants.EV_NONHOST_INFO:
|
||||
case EvConstants.EV_EV_OMIT_BOOT_DEVICES_EVENTS:
|
||||
case EvConstants.EV_EFI_EVENT_BASE:
|
||||
break;
|
||||
case EvConstants.EV_EFI_VARIABLE_DRIVER_CONFIG:
|
||||
UefiVariable efiVar = null;
|
||||
try {
|
||||
efiVar = new UefiVariable(eventContent);
|
||||
String efiVarDescription = efiVar.toString().replace("\n", "\n ");
|
||||
sb.append(efiVarDescription.substring(0,
|
||||
efiVarDescription.length() - INDENT_3));
|
||||
} catch (CertificateException cEx) {
|
||||
LOGGER.error(cEx);
|
||||
sb.append(cEx.toString());
|
||||
} catch (NoSuchAlgorithmException noSaEx) {
|
||||
LOGGER.error(noSaEx);
|
||||
sb.append(noSaEx.toString());
|
||||
} catch (IOException ioEx) {
|
||||
LOGGER.error(ioEx);
|
||||
sb.append(ioEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_EFI_VARIABLE_BOOT:
|
||||
case EvConstants.EV_EFI_VARIABLE_AUTHORITY:
|
||||
try {
|
||||
sb.append(new UefiVariable(eventContent).toString());
|
||||
} catch (CertificateException cEx) {
|
||||
LOGGER.error(cEx);
|
||||
sb.append(cEx.toString());
|
||||
} catch (NoSuchAlgorithmException noSaEx) {
|
||||
LOGGER.error(noSaEx);
|
||||
sb.append(noSaEx.toString());
|
||||
} catch (IOException ioEx) {
|
||||
LOGGER.error(ioEx);
|
||||
sb.append(ioEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_EFI_BOOT_SERVICES_APPLICATION:
|
||||
case EvConstants.EV_EFI_BOOT_SERVICES_DRIVER: // same as EV_EFI_BOOT_SERVICES_APP
|
||||
try {
|
||||
sb.append(new EvEfiBootServicesApp(eventContent).toString());
|
||||
} catch (UnsupportedEncodingException ueEx) {
|
||||
LOGGER.error(ueEx);
|
||||
sb.append(ueEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_EFI_RUNTIME_SERVICES_DRIVER:
|
||||
break;
|
||||
case EvConstants.EV_EFI_GPT_EVENT:
|
||||
try {
|
||||
sb.append(new EvEfiGptPartition(eventContent).toString());
|
||||
} catch (UnsupportedEncodingException ueEx) {
|
||||
LOGGER.error(ueEx);
|
||||
sb.append(ueEx.toString());
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_EFI_ACTION:
|
||||
case EvConstants.EV_ACTION:
|
||||
sb.append(new String(eventContent, StandardCharsets.UTF_8));
|
||||
break;
|
||||
case EvConstants.EV_EFI_PLATFORM_FIRMWARE_BLOB:
|
||||
sb.append(new UefiFirmware(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_EFI_HANDOFF_TABLES:
|
||||
sb.append(new EvEfiHandoffTable(eventContent).toString());
|
||||
break;
|
||||
case EvConstants.EV_EFI_HCRTM_EVENT:
|
||||
break;
|
||||
default:
|
||||
sb.append("Unknown Event found\n");
|
||||
}
|
||||
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the Digest Length.
|
||||
* Also the number of bytes expected within each PCR.
|
||||
@ -234,25 +438,26 @@ public class TpmPcrEvent {
|
||||
|
||||
/**
|
||||
* Parses the event content and creates a human readable description of each event.
|
||||
* @param event the byte array holding the event data.
|
||||
*
|
||||
* @param event the byte array holding the event data.
|
||||
* @param eventContent the byte array holding the event content.
|
||||
* @param eventNumber event position within the event log.
|
||||
* @param eventNumber event position within the event log.
|
||||
* @return String description of the event.
|
||||
* @throws CertificateException if the event contains an event that cannot be processed.
|
||||
* @throws CertificateException if the event contains an event that cannot be processed.
|
||||
* @throws NoSuchAlgorithmException if an event contains an unsupported algorithm.
|
||||
* @throws IOException if the event cannot be parsed.
|
||||
* @throws IOException if the event cannot be parsed.
|
||||
*/
|
||||
public String processEvent(final byte[] event, final byte[] eventContent, final int eventNumber)
|
||||
throws CertificateException, NoSuchAlgorithmException, IOException {
|
||||
public String processEvent(final byte[] event, final byte[] eventContent, final int eventNumber)
|
||||
throws CertificateException, NoSuchAlgorithmException, IOException {
|
||||
int eventID = (int) eventType;
|
||||
description += "Event# " + eventNumber + ": ";
|
||||
description += "Index PCR[" + getPcrIndex() + "]\n";
|
||||
description += "Event Type: 0x" + Long.toHexString(eventType) + " " + eventString(eventID);
|
||||
description += "\n";
|
||||
if (logFormat == 1) { // Digest
|
||||
description += "digest (SHA-1): " + HexUtils.byteArrayToHexString(this.digest);
|
||||
description += "digest (SHA-1): " + Hex.encodeHexString(this.digest);
|
||||
} else {
|
||||
description += "digest (SHA256): " + HexUtils.byteArrayToHexString(this.digest);
|
||||
description += "digest (SHA256): " + Hex.encodeHexString(this.digest);
|
||||
}
|
||||
if (eventID != UefiConstants.SIZE_4) {
|
||||
description += "\n";
|
||||
@ -269,11 +474,11 @@ public class TpmPcrEvent {
|
||||
switch (eventID) {
|
||||
case EvConstants.EV_PREBOOT_CERT:
|
||||
description += " EV_PREBOOT_CERT" + "\n";
|
||||
break;
|
||||
break;
|
||||
case EvConstants.EV_POST_CODE:
|
||||
EvPostCode postCode = new EvPostCode(eventContent);
|
||||
description += "Event Content:\n" + postCode.toString();
|
||||
break;
|
||||
description += "Event Content:\n" + postCode.toString();
|
||||
break;
|
||||
case EvConstants.EV_UNUSED:
|
||||
break;
|
||||
case EvConstants.EV_NO_ACTION:
|
||||
@ -287,15 +492,15 @@ public class TpmPcrEvent {
|
||||
break;
|
||||
case EvConstants.EV_SEPARATOR:
|
||||
if (EvPostCode.isAscii(eventContent)) {
|
||||
String seperatorEventData = new String(eventContent, StandardCharsets.UTF_8);
|
||||
if (!this.isEmpty(eventContent)) {
|
||||
description += "Seperator event content = " + seperatorEventData;
|
||||
String separatorEventData = new String(eventContent, StandardCharsets.UTF_8);
|
||||
if (!this.isBlank(eventContent)) {
|
||||
description += "Separator event content = " + separatorEventData;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case EvConstants.EV_ACTION:
|
||||
description += "Event Content:\n"
|
||||
+ new String(eventContent, StandardCharsets.UTF_8);
|
||||
+ new String(eventContent, StandardCharsets.UTF_8);
|
||||
break;
|
||||
case EvConstants.EV_EVENT_TAG:
|
||||
EvEventTag eventTag = new EvEventTag(eventContent);
|
||||
@ -316,7 +521,7 @@ public class TpmPcrEvent {
|
||||
case EvConstants.EV_TABLE_OF_DEVICES:
|
||||
break;
|
||||
case EvConstants.EV_COMPACT_HASH:
|
||||
EvCompactHash compactHash = new EvCompactHash(eventContent);
|
||||
EvCompactHash compactHash = new EvCompactHash(eventContent);
|
||||
description += "Event Content:\n" + compactHash.toString();
|
||||
break;
|
||||
case EvConstants.EV_IPL:
|
||||
@ -339,7 +544,7 @@ public class TpmPcrEvent {
|
||||
UefiVariable efiVar = new UefiVariable(eventContent);
|
||||
String efiVarDescription = efiVar.toString().replace("\n", "\n ");
|
||||
description += "Event Content:\n " + efiVarDescription.substring(0,
|
||||
efiVarDescription.length() - INDENT_3);
|
||||
efiVarDescription.length() - INDENT_3);
|
||||
break;
|
||||
case EvConstants.EV_EFI_VARIABLE_BOOT:
|
||||
description += "Event Content:\n" + new UefiVariable(eventContent).toString();
|
||||
@ -362,7 +567,7 @@ public class TpmPcrEvent {
|
||||
break;
|
||||
case EvConstants.EV_EFI_PLATFORM_FIRMWARE_BLOB:
|
||||
description += "Event Content:\n"
|
||||
+ new UefiFirmware(eventContent).toString();
|
||||
+ new UefiFirmware(eventContent).toString();
|
||||
break;
|
||||
case EvConstants.EV_EFI_HANDOFF_TABLES:
|
||||
EvEfiHandoffTable efiTable = new EvEfiHandoffTable(eventContent);
|
||||
@ -373,7 +578,8 @@ public class TpmPcrEvent {
|
||||
case EvConstants.EV_EFI_VARIABLE_AUTHORITY:
|
||||
description += "Event Content:\n" + new UefiVariable(eventContent).toString();
|
||||
break;
|
||||
default: description += " Unknown Event found" + "\n";
|
||||
default:
|
||||
description += " Unknown Event found" + "\n";
|
||||
}
|
||||
return description;
|
||||
}
|
||||
@ -381,152 +587,158 @@ public class TpmPcrEvent {
|
||||
/**
|
||||
* Converts the Event ID into a String As defined in the TCG PC Client FW Profile.
|
||||
* Event IDs have values larger than an integer,so a Long is used hold the value.
|
||||
*
|
||||
* @param event the event id.
|
||||
* @return TCG defined String that represents the event id
|
||||
*/
|
||||
private static String eventString(final long event) {
|
||||
private static String eventString(final long event) {
|
||||
|
||||
if (event == EvConstants.EV_PREBOOT_CERT) {
|
||||
return "EV_PREBOOT_CERT";
|
||||
} else if (event == EvConstants.EV_POST_CODE) {
|
||||
return "EV_POST_CODE";
|
||||
} else if (event == EvConstants.EV_UNUSED) {
|
||||
return "EV_Unused";
|
||||
} else if (event == EvConstants.EV_NO_ACTION) {
|
||||
return "EV_NO_ACTION";
|
||||
} else if (event == EvConstants.EV_SEPARATOR) {
|
||||
return "EV_SEPARATOR";
|
||||
} else if (event == EvConstants.EV_ACTION) {
|
||||
return "EV_ACTION";
|
||||
} else if (event == EvConstants.EV_EVENT_TAG) {
|
||||
return "EV_EVENT_TAG";
|
||||
} else if (event == EvConstants.EV_S_CRTM_CONTENTS) {
|
||||
return "EV_S_CRTM_CONTENTS";
|
||||
} else if (event == EvConstants.EV_S_CRTM_VERSION) {
|
||||
return "EV_S_CRTM_VERSION";
|
||||
} else if (event == EvConstants.EV_CPU_MICROCODE) {
|
||||
return "EV_CPU_MICROCODE";
|
||||
} else if (event == EvConstants.EV_PLATFORM_CONFIG_FLAGS) {
|
||||
return "EV_PLATFORM_CONFIG_FLAGS ";
|
||||
} else if (event == EvConstants.EV_TABLE_OF_DEVICES) {
|
||||
return "EV_TABLE_OF_DEVICES";
|
||||
} else if (event == EvConstants.EV_COMPACT_HASH) {
|
||||
return "EV_COMPACT_HASH";
|
||||
} else if (event == EvConstants.EV_IPL) {
|
||||
return "EV_IPL";
|
||||
} else if (event == EvConstants.EV_IPL_PARTITION_DATA) {
|
||||
return "EV_IPL_PARTITION_DATA";
|
||||
} else if (event == EvConstants.EV_NONHOST_CODE) {
|
||||
return "EV_NONHOST_CODE";
|
||||
} else if (event == EvConstants.EV_NONHOST_CONFIG) {
|
||||
return "EV_NONHOST_CONFIG";
|
||||
} else if (event == EvConstants.EV_NONHOST_INFO) {
|
||||
return "EV_NONHOST_INFO";
|
||||
} else if (event == EvConstants.EV_EV_OMIT_BOOT_DEVICES_EVENTS) {
|
||||
return "EV_EV_OMIT_BOOT_DEVICES_EVENTS";
|
||||
} else if (event == EvConstants.EV_EFI_EVENT_BASE) {
|
||||
return "EV_EFI_EVENT_BASE";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_DRIVER_CONFIG) {
|
||||
return "EV_EFI_VARIABLE_DRIVER_CONFIG";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_BOOT) {
|
||||
return "EV_EFI_VARIABLE_BOOT";
|
||||
} else if (event == EvConstants.EV_EFI_BOOT_SERVICES_APPLICATION) {
|
||||
return "EV_EFI_BOOT_SERVICES_APPLICATION";
|
||||
} else if (event == EvConstants.EV_EFI_BOOT_SERVICES_DRIVER) {
|
||||
return "EV_EFI_BOOT_SERVICES_DRIVER";
|
||||
} else if (event == EvConstants.EV_EFI_RUNTIME_SERVICES_DRIVER) {
|
||||
return "EV_EFI_RUNTIME_SERVICES_DRIVER";
|
||||
} else if (event == EvConstants.EV_EFI_GPT_EVENT) {
|
||||
return "EV_EFI_GPT_EVENT";
|
||||
} else if (event == EvConstants.EV_EFI_ACTION) {
|
||||
return "EV_EFI_ACTION";
|
||||
} else if (event == EvConstants.EV_EFI_PLATFORM_FIRMWARE_BLOB) {
|
||||
return "EV_EFI_PLATFORM_FIRMWARE_BLOB";
|
||||
} else if (event == EvConstants.EV_EFI_HANDOFF_TABLES) {
|
||||
return "EV_EFI_HANDOFF_TABLES";
|
||||
} else if (event == EvConstants.EV_EFI_HCRTM_EVENT) {
|
||||
return "EV_EFI_HCRTM_EVENT";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_AUTHORITY) {
|
||||
return "EV_EFI_VARIABLE_AUTHORITY";
|
||||
} else {
|
||||
return "Unknown Event ID " + event + " encountered";
|
||||
}
|
||||
}
|
||||
if (event == EvConstants.EV_PREBOOT_CERT) {
|
||||
return "EV_PREBOOT_CERT";
|
||||
} else if (event == EvConstants.EV_POST_CODE) {
|
||||
return "EV_POST_CODE";
|
||||
} else if (event == EvConstants.EV_UNUSED) {
|
||||
return "EV_Unused";
|
||||
} else if (event == EvConstants.EV_NO_ACTION) {
|
||||
return "EV_NO_ACTION";
|
||||
} else if (event == EvConstants.EV_SEPARATOR) {
|
||||
return "EV_SEPARATOR";
|
||||
} else if (event == EvConstants.EV_ACTION) {
|
||||
return "EV_ACTION";
|
||||
} else if (event == EvConstants.EV_EVENT_TAG) {
|
||||
return "EV_EVENT_TAG";
|
||||
} else if (event == EvConstants.EV_S_CRTM_CONTENTS) {
|
||||
return "EV_S_CRTM_CONTENTS";
|
||||
} else if (event == EvConstants.EV_S_CRTM_VERSION) {
|
||||
return "EV_S_CRTM_VERSION";
|
||||
} else if (event == EvConstants.EV_CPU_MICROCODE) {
|
||||
return "EV_CPU_MICROCODE";
|
||||
} else if (event == EvConstants.EV_PLATFORM_CONFIG_FLAGS) {
|
||||
return "EV_PLATFORM_CONFIG_FLAGS ";
|
||||
} else if (event == EvConstants.EV_TABLE_OF_DEVICES) {
|
||||
return "EV_TABLE_OF_DEVICES";
|
||||
} else if (event == EvConstants.EV_COMPACT_HASH) {
|
||||
return "EV_COMPACT_HASH";
|
||||
} else if (event == EvConstants.EV_IPL) {
|
||||
return "EV_IPL";
|
||||
} else if (event == EvConstants.EV_IPL_PARTITION_DATA) {
|
||||
return "EV_IPL_PARTITION_DATA";
|
||||
} else if (event == EvConstants.EV_NONHOST_CODE) {
|
||||
return "EV_NONHOST_CODE";
|
||||
} else if (event == EvConstants.EV_NONHOST_CONFIG) {
|
||||
return "EV_NONHOST_CONFIG";
|
||||
} else if (event == EvConstants.EV_NONHOST_INFO) {
|
||||
return "EV_NONHOST_INFO";
|
||||
} else if (event == EvConstants.EV_EV_OMIT_BOOT_DEVICES_EVENTS) {
|
||||
return "EV_EV_OMIT_BOOT_DEVICES_EVENTS";
|
||||
} else if (event == EvConstants.EV_EFI_EVENT_BASE) {
|
||||
return "EV_EFI_EVENT_BASE";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_DRIVER_CONFIG) {
|
||||
return "EV_EFI_VARIABLE_DRIVER_CONFIG";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_BOOT) {
|
||||
return "EV_EFI_VARIABLE_BOOT";
|
||||
} else if (event == EvConstants.EV_EFI_BOOT_SERVICES_APPLICATION) {
|
||||
return "EV_EFI_BOOT_SERVICES_APPLICATION";
|
||||
} else if (event == EvConstants.EV_EFI_BOOT_SERVICES_DRIVER) {
|
||||
return "EV_EFI_BOOT_SERVICES_DRIVER";
|
||||
} else if (event == EvConstants.EV_EFI_RUNTIME_SERVICES_DRIVER) {
|
||||
return "EV_EFI_RUNTIME_SERVICES_DRIVER";
|
||||
} else if (event == EvConstants.EV_EFI_GPT_EVENT) {
|
||||
return "EV_EFI_GPT_EVENT";
|
||||
} else if (event == EvConstants.EV_EFI_ACTION) {
|
||||
return "EV_EFI_ACTION";
|
||||
} else if (event == EvConstants.EV_EFI_PLATFORM_FIRMWARE_BLOB) {
|
||||
return "EV_EFI_PLATFORM_FIRMWARE_BLOB";
|
||||
} else if (event == EvConstants.EV_EFI_HANDOFF_TABLES) {
|
||||
return "EV_EFI_HANDOFF_TABLES";
|
||||
} else if (event == EvConstants.EV_EFI_HCRTM_EVENT) {
|
||||
return "EV_EFI_HCRTM_EVENT";
|
||||
} else if (event == EvConstants.EV_EFI_VARIABLE_AUTHORITY) {
|
||||
return "EV_EFI_VARIABLE_AUTHORITY";
|
||||
} else {
|
||||
return "Unknown Event ID " + event + " encountered";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Human readable output of a check of input against the current event hash.
|
||||
* @return human readable string.
|
||||
*/
|
||||
private String eventHashCheck() {
|
||||
String result = "";
|
||||
if (logFormat == 1) {
|
||||
if (Arrays.equals(this.digest, eventDataSha1hash)) { result
|
||||
+= "Event digest matched hash of the event data " + "\n";
|
||||
} else {
|
||||
result += "Event digest DID NOT match the hash of the event data :"
|
||||
+ HexUtils.byteArrayToHexString(getEventDigest()) + "\n";
|
||||
}
|
||||
/**
|
||||
* Human readable output of a check of input against the current event hash.
|
||||
*
|
||||
* @return human readable string.
|
||||
*/
|
||||
private String eventHashCheck() {
|
||||
String result = "";
|
||||
if (logFormat == 1) {
|
||||
if (Arrays.equals(this.digest, eventDataSha1hash)) {
|
||||
result
|
||||
+= "Event digest matched hash of the event data " + "\n";
|
||||
} else {
|
||||
if (Arrays.equals(this.digest, eventDataSha256hash)) {
|
||||
result += "Event digest matched hash of the event data " + "\n";
|
||||
} else {
|
||||
result += "Event digest DID NOT match the hash of the event data :"
|
||||
+ HexUtils.byteArrayToHexString(getEventDigest()) + "\n";
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
result += "Event digest DID NOT match the hash of the event data :"
|
||||
+ Hex.encodeHexString(getEventDigest()) + "\n";
|
||||
}
|
||||
} else {
|
||||
if (Arrays.equals(this.digest, eventDataSha256hash)) {
|
||||
result += "Event digest matched hash of the event data " + "\n";
|
||||
} else {
|
||||
result += "Event digest DID NOT match the hash of the event data :"
|
||||
+ Hex.encodeHexString(getEventDigest()) + "\n";
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks a byte array for all zeros.
|
||||
* @param array holds data to check.
|
||||
* @return true of all zeros are found.
|
||||
*/
|
||||
public boolean isEmpty(final byte[] array) {
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
if (array[i] != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* Checks a byte array for all zeros.
|
||||
*
|
||||
* @param array holds data to check.
|
||||
* @return true of all zeros are found.
|
||||
*/
|
||||
public boolean isBlank(final byte[] array) {
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
if (array[i] != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Human readable string representing the contents of the Event Log.
|
||||
* @return Description of the log.
|
||||
*/
|
||||
public String toString() {
|
||||
/**
|
||||
* Human readable string representing the contents of the Event Log.
|
||||
*
|
||||
* @return Description of the log.
|
||||
*/
|
||||
public String toString() {
|
||||
return description + "\n";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Human readable string representing the contents of the Event Log.
|
||||
* @param bEvent event Flag.
|
||||
* @param bContent content flag.
|
||||
* @param bHexEvent hex event flag.
|
||||
* @return Description of the log.
|
||||
*/
|
||||
public String toString(final boolean bEvent, final boolean bContent, final boolean bHexEvent) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (bEvent) {
|
||||
sb.append(description);
|
||||
}
|
||||
if (bHexEvent) {
|
||||
if (bEvent || bContent) {
|
||||
sb.append("\n");
|
||||
}
|
||||
byte[] eventData = getEvent();
|
||||
sb.append("Event (Hex no Content) (" + eventData.length + " bytes): "
|
||||
+ HexUtils.byteArrayToHexString(eventData));
|
||||
}
|
||||
if (bContent) {
|
||||
byte[] evContent = getEventContent();
|
||||
if (bEvent) {
|
||||
sb.append("\n");
|
||||
}
|
||||
sb.append("Event content (Hex) (" + evContent.length + " bytes): "
|
||||
+ HexUtils.byteArrayToHexString(evContent));
|
||||
}
|
||||
/**
|
||||
* Human readable string representing the contents of the Event Log.
|
||||
*
|
||||
* @param bEvent event Flag.
|
||||
* @param bContent content flag.
|
||||
* @param bHexEvent hex event flag.
|
||||
* @return Description of the log.
|
||||
*/
|
||||
public String toString(final boolean bEvent, final boolean bContent, final boolean bHexEvent) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (bEvent) {
|
||||
sb.append(description);
|
||||
}
|
||||
if (bHexEvent) {
|
||||
if (bEvent || bContent) {
|
||||
sb.append("\n");
|
||||
}
|
||||
byte[] eventData = getEvent();
|
||||
sb.append("Event (Hex no Content) (" + eventData.length + " bytes): "
|
||||
+ Hex.encodeHexString(eventData));
|
||||
}
|
||||
if (bContent) {
|
||||
byte[] evContent = getEventContent();
|
||||
if (bEvent) {
|
||||
sb.append("\n");
|
||||
}
|
||||
sb.append("Event content (Hex) (" + evContent.length + " bytes): "
|
||||
+ Hex.encodeHexString(evContent));
|
||||
}
|
||||
return sb.toString() + "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -34,19 +34,18 @@ public class EvPostCode {
|
||||
public EvPostCode(final byte[] postCode) {
|
||||
// 2 ways post code has been implemented, check for the ascii string first
|
||||
if (isAscii(postCode)) {
|
||||
String info = new String(postCode, StandardCharsets.UTF_8);
|
||||
codeInfo = info;
|
||||
codeInfo = new String(postCode, StandardCharsets.UTF_8);
|
||||
bisString = true;
|
||||
} else {
|
||||
blob = new UefiFirmware(postCode);
|
||||
}
|
||||
} else {
|
||||
blob = new UefiFirmware(postCode);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the UEFI Defined Firmware Blob information.
|
||||
* @return UEFI Defined Firmware Blob information.
|
||||
*/
|
||||
public UefiFirmware getfirmwareBlob() {
|
||||
public UefiFirmware getFirmwareBlob() {
|
||||
return blob;
|
||||
}
|
||||
|
||||
@ -75,12 +74,11 @@ public class EvPostCode {
|
||||
* @return true if byte array is a string.
|
||||
*/
|
||||
public static boolean isAscii(final byte[] postCode) {
|
||||
boolean bisAscii = true;
|
||||
for (byte b : postCode) {
|
||||
if (!Character.isDefined(b)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return bisAscii;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -1,73 +1,90 @@
|
||||
package hirs.tpm.eventlog.uefi;
|
||||
|
||||
import java.math.BigInteger;
|
||||
|
||||
import hirs.utils.HexUtils;
|
||||
|
||||
/**
|
||||
* Class to process the PFP defined UEFI_PLATFORM_FIRMWARE_BLOB structure.
|
||||
*
|
||||
* <p>
|
||||
* typedef struct tdUEFI_PLATFORM_FIRMWARE_BLOB {
|
||||
* UEFI_PHYSICAL_ADDRESS BlobBase;
|
||||
* UINT64 BlobLength;
|
||||
* UEFI_PHYSICAL_ADDRESS BlobBase;
|
||||
* UINT64 BlobLength;
|
||||
* } UEFI_PLATFORM_FIRMWARE_BLOB;
|
||||
*/
|
||||
public class UefiFirmware {
|
||||
private boolean berror = false;
|
||||
/** byte array holding the firmwares physical address. */
|
||||
private byte[] physicalAddress = null;
|
||||
/** byte array holding the uefi address length. */
|
||||
private byte[] addressLength = null;
|
||||
/** uefi physical address. */
|
||||
private int blobAddress = 0;
|
||||
/** uefi address length. */
|
||||
private int blobLength = 0;
|
||||
private boolean bError = false;
|
||||
/**
|
||||
* byte array holding the firmwares physical address.
|
||||
*/
|
||||
private byte[] physicalAddress = null;
|
||||
/**
|
||||
* byte array holding the uefi address length.
|
||||
*/
|
||||
private byte[] addressLength = null;
|
||||
/**
|
||||
* uefi physical address.
|
||||
*/
|
||||
private int blobAddress = 0;
|
||||
/**
|
||||
* uefi address length.
|
||||
*/
|
||||
private int blobLength = 0;
|
||||
|
||||
/**
|
||||
* UefiFirmware constructor.
|
||||
* @param blob byte array holding a Firmware Blob.
|
||||
*/
|
||||
public UefiFirmware(final byte[] blob) {
|
||||
if (blob.length != UefiConstants.SIZE_16) {
|
||||
berror = true;
|
||||
} else {
|
||||
physicalAddress = new byte[UefiConstants.SIZE_8];
|
||||
addressLength = new byte[UefiConstants.SIZE_8];
|
||||
System.arraycopy(blob, 0, physicalAddress, 0, UefiConstants.SIZE_8);
|
||||
System.arraycopy(blob, UefiConstants.SIZE_8, addressLength, 0, UefiConstants.SIZE_8);
|
||||
byte[] lelength = HexUtils.leReverseByte(addressLength);
|
||||
BigInteger bigIntLength = new BigInteger(lelength);
|
||||
blobLength = bigIntLength.intValue();
|
||||
byte[]leAddress = HexUtils.leReverseByte(physicalAddress);
|
||||
BigInteger bigIntAddress = new BigInteger(leAddress);
|
||||
blobAddress = bigIntAddress.intValue();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Returns the uefi firmware blobs physical address.
|
||||
* @return uefi firmware address.
|
||||
*/
|
||||
public int getPhysicalAddress() {
|
||||
return blobAddress;
|
||||
}
|
||||
/**
|
||||
* Returns the length of the blobs physical address.
|
||||
* @return length of the address.
|
||||
*/
|
||||
public int getBlobLength() {
|
||||
return blobLength;
|
||||
}
|
||||
/**
|
||||
* Returns a description of the firmware blobs location.
|
||||
* @return a description of the the firmware blobs location.
|
||||
*/
|
||||
public String toString() {
|
||||
String blobInfo = "";
|
||||
if (!berror) {
|
||||
blobInfo += " Platform Firwmare Blob Address = " + Integer.toHexString(blobAddress);
|
||||
blobInfo += " length = " + blobLength;
|
||||
} else {
|
||||
blobInfo += " Invalid Firmware Blob event encountered";
|
||||
}
|
||||
return blobInfo;
|
||||
}
|
||||
/**
|
||||
* UefiFirmware constructor.
|
||||
*
|
||||
* @param blob byte array holding a Firmware Blob.
|
||||
*/
|
||||
public UefiFirmware(final byte[] blob) {
|
||||
if (blob.length != UefiConstants.SIZE_16) {
|
||||
bError = true;
|
||||
} else {
|
||||
physicalAddress = new byte[UefiConstants.SIZE_8];
|
||||
addressLength = new byte[UefiConstants.SIZE_8];
|
||||
System.arraycopy(blob, 0, physicalAddress, 0, UefiConstants.SIZE_8);
|
||||
System.arraycopy(blob, UefiConstants.SIZE_8, addressLength, 0, UefiConstants.SIZE_8);
|
||||
byte[] lelength = HexUtils.leReverseByte(addressLength);
|
||||
BigInteger bigIntLength = new BigInteger(lelength);
|
||||
blobLength = bigIntLength.intValue();
|
||||
byte[] leAddress = HexUtils.leReverseByte(physicalAddress);
|
||||
BigInteger bigIntAddress = new BigInteger(leAddress);
|
||||
blobAddress = bigIntAddress.intValue();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the uefi firmware blobs physical address.
|
||||
*
|
||||
* @return uefi firmware address.
|
||||
*/
|
||||
public int getPhysicalAddress() {
|
||||
return blobAddress;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the length of the blobs physical address.
|
||||
*
|
||||
* @return length of the address.
|
||||
*/
|
||||
public int getBlobLength() {
|
||||
return blobLength;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a description of the firmware blobs location.
|
||||
*
|
||||
* @return a description of the the firmware blobs location.
|
||||
*/
|
||||
public String toString() {
|
||||
StringBuilder blobInfo = new StringBuilder();
|
||||
if (!bError) {
|
||||
blobInfo.append(String.format(" Platform Firmware Blob Address = %s",
|
||||
Integer.toHexString(blobAddress)));
|
||||
blobInfo.append(String.format(" length = %d", blobLength));
|
||||
} else {
|
||||
blobInfo.append(" Invalid Firmware Blob event encountered");
|
||||
}
|
||||
return blobInfo.toString();
|
||||
}
|
||||
}
|
||||
|
@ -26,145 +26,147 @@ final class Main {
|
||||
private static byte[] eventLog = null;
|
||||
private static boolean bContentFlag, bEventFlag, bHexEvent, bHexFlag, bPcrFlag = false;
|
||||
|
||||
/**
|
||||
* Main Constructor.
|
||||
* @param args command line parameters.
|
||||
*/
|
||||
public static void main(final String[] args) {
|
||||
commander = new Commander(args);
|
||||
if (!commander.getValidityFlag()) {
|
||||
System.out.print("Program exiting without processs due to issues with"
|
||||
+ " parameters provided.");
|
||||
System.exit(1);
|
||||
}
|
||||
if (commander.hasArguments()) {
|
||||
if (commander.getDoneFlag()) {
|
||||
System.exit(0);
|
||||
}
|
||||
if (commander.getHelpFlag()) {
|
||||
commander.printHelp("");
|
||||
System.exit(0);
|
||||
}
|
||||
if (commander.getOutputFlag()) {
|
||||
try {
|
||||
outputStream = new FileOutputStream(commander.getOutputFileName());
|
||||
} catch (FileNotFoundException e) {
|
||||
System.out.print("Error opening output file" + commander.getOutputFileName()
|
||||
+ "\nError was " + e.getMessage());
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
if (commander.getFileFlag()) {
|
||||
eventLog = openLog(commander.getInFileName());
|
||||
}
|
||||
if (commander.getContentFlag()) {
|
||||
bContentFlag = true;
|
||||
}
|
||||
if (commander.getDiffFlag()) {
|
||||
bEventFlag = true;
|
||||
String results = compareLogs(commander.getInFileName(),
|
||||
commander.getInFile2Name());
|
||||
writeOut(results);
|
||||
System.exit(0);
|
||||
}
|
||||
if (commander.getEventIdsFlag()) {
|
||||
bEventFlag = true;
|
||||
}
|
||||
if (commander.getEventHexFlag()) {
|
||||
bHexEvent = true;
|
||||
}
|
||||
if (commander.getPCRFlag()) {
|
||||
bPcrFlag = true;
|
||||
}
|
||||
if (commander.getVerifyFile()) {
|
||||
System.out.print("Verify option is not yet implemented");
|
||||
/**
|
||||
* Main Constructor.
|
||||
*
|
||||
* @param args command line parameters.
|
||||
*/
|
||||
public static void main(final String[] args) {
|
||||
commander = new Commander(args);
|
||||
if (!commander.getValidityFlag()) {
|
||||
System.out.print("Program exiting without processs due to issues with"
|
||||
+ " parameters provided.");
|
||||
System.exit(1);
|
||||
}
|
||||
if (commander.getHexFlag()) {
|
||||
bHexFlag = true;
|
||||
}
|
||||
} else {
|
||||
System.out.print("Nothing to do: No Parameters provided.");
|
||||
System.exit(1);
|
||||
} // End commander processing
|
||||
|
||||
try {
|
||||
if (eventLog == null) {
|
||||
eventLog = openLog("");
|
||||
}
|
||||
// Main Event processing
|
||||
TCGEventLog evLog = new TCGEventLog(eventLog, bEventFlag, bContentFlag, bHexEvent);
|
||||
if (bPcrFlag) {
|
||||
String[] pcrs = evLog.getExpectedPCRValues();
|
||||
int count = 0;
|
||||
if (!bHexFlag) {
|
||||
writeOut("Expected Platform Configuration Register (PCR) values"
|
||||
+ " derived from the Event Log: \n\n");
|
||||
if (commander.hasArguments()) {
|
||||
if (commander.getDoneFlag()) {
|
||||
System.exit(0);
|
||||
}
|
||||
for (String pcr: pcrs) {
|
||||
if (count++ == commander.getPcrNumber() || (commander.getPcrNumber() == -1)) {
|
||||
if (bHexFlag) {
|
||||
writeOut(pcr.toString() + "\n");
|
||||
} else {
|
||||
writeOut(" pcr " + (count - 1) + " = " + pcr.toString() + "\n");
|
||||
if (commander.getHelpFlag()) {
|
||||
commander.printHelp("");
|
||||
System.exit(0);
|
||||
}
|
||||
if (commander.getOutputFlag()) {
|
||||
try {
|
||||
outputStream = new FileOutputStream(commander.getOutputFileName());
|
||||
} catch (FileNotFoundException e) {
|
||||
System.out.print("Error opening output file" + commander.getOutputFileName()
|
||||
+ "\nError was " + e.getMessage());
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
if (commander.getFileFlag()) {
|
||||
eventLog = openLog(commander.getInFileName());
|
||||
}
|
||||
if (commander.getContentFlag()) {
|
||||
bContentFlag = true;
|
||||
}
|
||||
if (commander.getDiffFlag()) {
|
||||
bEventFlag = true;
|
||||
String results = compareLogs(commander.getInFileName(),
|
||||
commander.getInFile2Name());
|
||||
writeOut(results);
|
||||
System.exit(0);
|
||||
}
|
||||
if (commander.getEventIdsFlag()) {
|
||||
bEventFlag = true;
|
||||
}
|
||||
if (commander.getEventHexFlag()) {
|
||||
bHexEvent = true;
|
||||
}
|
||||
if (commander.getPCRFlag()) {
|
||||
bPcrFlag = true;
|
||||
}
|
||||
if (commander.getVerifyFile()) {
|
||||
System.out.print("Verify option is not yet implemented");
|
||||
System.exit(1);
|
||||
}
|
||||
if (commander.getHexFlag()) {
|
||||
bHexFlag = true;
|
||||
}
|
||||
} else {
|
||||
System.out.print("Nothing to do: No Parameters provided.");
|
||||
System.exit(1);
|
||||
} // End commander processing
|
||||
|
||||
try {
|
||||
if (eventLog == null) {
|
||||
eventLog = openLog("");
|
||||
}
|
||||
// Main Event processing
|
||||
TCGEventLog evLog = new TCGEventLog(eventLog, bEventFlag, bContentFlag, bHexEvent);
|
||||
if (bPcrFlag) {
|
||||
String[] pcrs = evLog.getExpectedPCRValues();
|
||||
int count = 0;
|
||||
if (!bHexFlag) {
|
||||
writeOut("Expected Platform Configuration Register (PCR) values"
|
||||
+ " derived from the Event Log: \n\n");
|
||||
}
|
||||
for (String pcr : pcrs) {
|
||||
if (count++ == commander.getPcrNumber() || (commander.getPcrNumber() == -1)) {
|
||||
if (bHexFlag) {
|
||||
writeOut(pcr.toString() + "\n");
|
||||
} else {
|
||||
writeOut(" pcr " + (count - 1) + " = " + pcr.toString() + "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!bHexFlag) {
|
||||
writeOut("\n----------------- End PCR Values ----------------- \n\n");
|
||||
}
|
||||
}
|
||||
|
||||
// General event log output
|
||||
if (bEventFlag) {
|
||||
if (!bHexFlag) {
|
||||
if (evLog.isCryptoAgile()) {
|
||||
writeOut("\nEvent Log follows the \"Crypto Agile\" format and has "
|
||||
+ evLog.getEventList().size() + " events:\n\n");
|
||||
} else {
|
||||
writeOut("\nEvent Log follows the \"SHA1\" format and has "
|
||||
+ evLog.getEventList().size() + " events:\n\n");
|
||||
if (!bHexFlag) {
|
||||
writeOut("\n----------------- End PCR Values ----------------- \n\n");
|
||||
}
|
||||
}
|
||||
int eventCount = 0;
|
||||
for (TpmPcrEvent event: evLog.getEventList()) {
|
||||
|
||||
// General event log output
|
||||
if (bEventFlag) {
|
||||
if (!bHexFlag) {
|
||||
if (evLog.isCryptoAgile()) {
|
||||
writeOut("\nEvent Log follows the \"Crypto Agile\" format and has "
|
||||
+ evLog.getEventList().size() + " events:\n\n");
|
||||
} else {
|
||||
writeOut("\nEvent Log follows the \"SHA1\" format and has "
|
||||
+ evLog.getEventList().size() + " events:\n\n");
|
||||
}
|
||||
}
|
||||
int eventCount = 0;
|
||||
for (TpmPcrEvent event : evLog.getEventList()) {
|
||||
if ((commander.getEventNumber() == eventCount++)
|
||||
|| commander.getEventNumber() == -1) {
|
||||
|| commander.getEventNumber() == -1) {
|
||||
if ((commander.getPcrNumber() == event.getPcrIndex())
|
||||
|| commander.getPcrNumber() == -1) {
|
||||
if (bHexFlag) {
|
||||
if (bEventFlag || bHexEvent) {
|
||||
writeOut(HexUtils.byteArrayToHexString(event.getEvent()) + "\n");
|
||||
}
|
||||
if (bContentFlag) {
|
||||
writeOut(HexUtils.byteArrayToHexString(event.getEventContent())
|
||||
+ "\n");
|
||||
}
|
||||
if (bEventFlag || bHexEvent) {
|
||||
writeOut(HexUtils.byteArrayToHexString(event.getEvent()) + "\n");
|
||||
}
|
||||
if (bContentFlag) {
|
||||
writeOut(HexUtils.byteArrayToHexString(event.getEventContent())
|
||||
+ "\n");
|
||||
}
|
||||
} else {
|
||||
writeOut(event.toString(bEventFlag, bContentFlag, bHexEvent) + "\n");
|
||||
writeOut(event.toString(bEventFlag, bContentFlag, bHexEvent) + "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException i) {
|
||||
System.out.print("IO error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + i.toString());
|
||||
System.exit(1);
|
||||
} catch (CertificateException c) {
|
||||
System.out.print("Certificate error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + c.toString());
|
||||
System.exit(1);
|
||||
} catch (NoSuchAlgorithmException a) {
|
||||
System.out.print("Algorithm error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + a.toString());
|
||||
System.exit(1);
|
||||
}
|
||||
} catch (IOException i) {
|
||||
System.out.print("IO error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + i.toString());
|
||||
System.exit(1);
|
||||
} catch (CertificateException c) {
|
||||
System.out.print("Certificate error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + c.toString());
|
||||
System.exit(1);
|
||||
} catch (NoSuchAlgorithmException a) {
|
||||
System.out.print("Algorithm error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + a.toString());
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens a TCG Event log file.
|
||||
* @param fileName Name of the log file. Will use a OS specific default.
|
||||
*
|
||||
* @param fileName Name of the log file. Will use a OS specific default.
|
||||
* @return a byte array holding the entire log
|
||||
*/
|
||||
public static byte[] openLog(final String fileName) {
|
||||
@ -186,10 +188,10 @@ commander = new Commander(args);
|
||||
Path path = Paths.get(fName);
|
||||
rawLog = Files.readAllBytes(path);
|
||||
if (!bHexFlag) {
|
||||
writeOut("tcg_eventlog_tool is opening file:" + path + "\n");
|
||||
writeOut("tcg_eventlog_tool is opening file:" + path + "\n");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
String error = "Error reading event Log File: " + e.toString();
|
||||
String error = "Error reading event Log File: " + e.toString();
|
||||
if (bDefault) {
|
||||
error += "\nTry using the -f option to specify an Event Log File";
|
||||
}
|
||||
@ -201,6 +203,7 @@ commander = new Commander(args);
|
||||
|
||||
/**
|
||||
* Write data out to the system and/or a file.
|
||||
*
|
||||
* @param data
|
||||
*/
|
||||
private static void writeOut(final String data) {
|
||||
@ -219,6 +222,7 @@ commander = new Commander(args);
|
||||
/**
|
||||
* Compares 2 Event Logs and returns a string based upon the results.
|
||||
* Uses the Events digest field for comparisons.
|
||||
*
|
||||
* @param logFileName1 Log file to use as a reference.
|
||||
* @param logFileName2 Log file to compare to the reference.
|
||||
* @return A sting containing human readable results.
|
||||
@ -232,12 +236,12 @@ commander = new Commander(args);
|
||||
try {
|
||||
eventLog1 = new TCGEventLog(evLog);
|
||||
} catch (Exception e) {
|
||||
sb.append("\nError processing event log " + logFileName1 + " : " + e.getMessage());
|
||||
sb.append("\nError processing event log " + logFileName1 + " : " + e.getMessage());
|
||||
return sb.toString();
|
||||
}
|
||||
try {
|
||||
eventLog2 = new TCGEventLog(evLog2);
|
||||
ArrayList<TpmPcrEvent> errors = diffEventLogs(eventLog1.getEventList(),
|
||||
ArrayList<TpmPcrEvent> errors = diffEventLogs(eventLog1.getEventList(),
|
||||
eventLog2.getEventList(), commander.getPcrNumber());
|
||||
if (errors.isEmpty() && !bHexFlag) {
|
||||
sb.append("\nEvent Log " + logFileName1 + " MATCHED EventLog " + logFileName2);
|
||||
@ -245,8 +249,8 @@ commander = new Commander(args);
|
||||
if (!errors.isEmpty() && !bHexFlag) {
|
||||
sb.append("\nEvent Log " + logFileName1
|
||||
+ " did NOT match EventLog " + logFileName2 + "\n");
|
||||
sb.append("There were " + errors.size() + " event mismatches: \n\n");
|
||||
}
|
||||
sb.append("There were " + errors.size() + " event mismatches: \n\n");
|
||||
}
|
||||
for (TpmPcrEvent error : errors) {
|
||||
if (bHexFlag) {
|
||||
if (bEventFlag || bHexEvent) {
|
||||
@ -254,51 +258,53 @@ commander = new Commander(args);
|
||||
}
|
||||
if (bContentFlag) {
|
||||
sb.append(HexUtils.byteArrayToHexString(error.getEventContent())
|
||||
+ "\n");
|
||||
+ "\n");
|
||||
}
|
||||
} else {
|
||||
sb.append(error.toString(bEventFlag, bContentFlag, bHexEvent) + "\n");
|
||||
}
|
||||
} else {
|
||||
sb.append(error.toString(bEventFlag, bContentFlag, bHexEvent) + "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException i) {
|
||||
System.out.print("IO error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + i.toString());
|
||||
+ "\nError was " + i.toString());
|
||||
System.exit(1);
|
||||
} catch (CertificateException c) {
|
||||
System.out.print("Certificate error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + c.toString());
|
||||
+ "\nError was " + c.toString());
|
||||
System.exit(1);
|
||||
} catch (NoSuchAlgorithmException a) {
|
||||
System.out.print("Algorithm error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + a.toString());
|
||||
System.exit(1);
|
||||
} catch (NoSuchAlgorithmException a) {
|
||||
System.out.print("Algorithm error processing Event Log " + commander.getInFileName()
|
||||
+ "\nError was " + a.toString());
|
||||
System.exit(1);
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare this event log against a second event log.
|
||||
* Returns a String Array of event descriptions in which the digests from the first
|
||||
* did no match the second. Return value is null if all events matched.
|
||||
* @param eventList initial events.
|
||||
* did no match the second. Return value is null if all events matched.
|
||||
*
|
||||
* @param eventList initial events.
|
||||
* @param eventList2 events to compare against.
|
||||
* @param pcr used as a filter. Use -1 to check all pcrs.
|
||||
* @param pcr used as a filter. Use -1 to check all pcrs.
|
||||
* @return array list of strings. Null of no events mismatched.
|
||||
*/
|
||||
public static ArrayList<TpmPcrEvent> diffEventLogs(final ArrayList<TpmPcrEvent> eventList,
|
||||
final ArrayList<TpmPcrEvent> eventList2, final int pcr) {
|
||||
final ArrayList<TpmPcrEvent> eventList2, final int pcr) {
|
||||
ArrayList<TpmPcrEvent> results = new ArrayList<TpmPcrEvent>();
|
||||
for (TpmPcrEvent event2 : eventList2) {
|
||||
if (pcr >= 0) {
|
||||
if (event2.getPcrIndex() == pcr) {
|
||||
if (!digestMatch(eventList, event2)) {
|
||||
results.add(event2);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!digestMatch(eventList, event2)) {
|
||||
results.add(event2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
@ -306,8 +312,9 @@ commander = new Commander(args);
|
||||
|
||||
/**
|
||||
* Checks a digest from a single event against all digests with the same index in an Event Log.
|
||||
*
|
||||
* @param eventLog The Reference Event log.
|
||||
* @param event single event to match.
|
||||
* @param event single event to match.
|
||||
* @return
|
||||
*/
|
||||
private static boolean digestMatch(final ArrayList<TpmPcrEvent> eventLog,
|
||||
|
Loading…
Reference in New Issue
Block a user