ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-30 08:04:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-395' of https://github.com/nsacyber/HIRS into issue-395

Browse Source
This commit is contained in:
Cyrus 2022-02-03 13:47:44 -05:00
commit b5d01a3997
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java
View File

@ -57,7 +57,7 @@ public enum Page {
/** /**
* Page to display RIM event digest table. * Page to display RIM event digest table.
*/ */
TPM_EVENTS("RIM Database", "ic_important_devices", "first"), RIM_DATABASE("RIM Database", "ic_important_devices", "first"),
/** /**
* Page that manages Attestation CA Policy. * Page that manages Attestation CA Policy.
*/ */

10
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/TpmEventsPageController.java → HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java
View File

@ -40,8 +40,8 @@ import java.text.SimpleDateFormat;
* Controller for the TPM Events page. * Controller for the TPM Events page.
*/ */
@Controller @Controller
@RequestMapping("/tpm-events") @RequestMapping("/rim-database")
public class TpmEventsPageController public class RimDatabasePageController
extends PageController<NoPageParams> { extends PageController<NoPageParams> {
private static final String BIOS_RELEASE_DATE_FORMAT = "yyyy-MM-dd"; private static final String BIOS_RELEASE_DATE_FORMAT = "yyyy-MM-dd";
@ -51,7 +51,7 @@ public class TpmEventsPageController
private final ReferenceDigestManager referenceDigestManager; private final ReferenceDigestManager referenceDigestManager;
private final ReferenceEventManager referenceEventManager; private final ReferenceEventManager referenceEventManager;
private static final Logger LOGGER private static final Logger LOGGER
= LogManager.getLogger(TpmEventsPageController.class); = LogManager.getLogger(RimDatabasePageController.class);
/** /**
* This class was created for the purposes of avoiding findbugs message: As * This class was created for the purposes of avoiding findbugs message: As
@ -103,11 +103,11 @@ public class TpmEventsPageController
* @param referenceEventManager the referenceEventManager object * @param referenceEventManager the referenceEventManager object
*/ */
@Autowired @Autowired
public TpmEventsPageController( public RimDatabasePageController(
final DBReferenceManifestManager referenceManifestManager, final DBReferenceManifestManager referenceManifestManager,
final DBReferenceDigestManager referenceDigestManager, final DBReferenceDigestManager referenceDigestManager,
final DBReferenceEventManager referenceEventManager) { final DBReferenceEventManager referenceEventManager) {
super(Page.TPM_EVENTS); super(Page.RIM_DATABASE);
this.referenceManifestManager = referenceManifestManager; this.referenceManifestManager = referenceManifestManager;
this.referenceDigestManager = referenceDigestManager; this.referenceDigestManager = referenceDigestManager;
this.referenceEventManager = referenceEventManager; this.referenceEventManager = referenceEventManager;

4
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
View File

@ -67,6 +67,10 @@
<a href="${portal}/devices"><img src="${icons}/ic_devices_black_24dp.png" /> Devices</a> <a href="${portal}/devices"><img src="${icons}/ic_devices_black_24dp.png" /> Devices</a>
</h3> </h3>
<h4>View devices covered by this CA for supply chain validation.</h4> <h4>View devices covered by this CA for supply chain validation.</h4>
<h3>
<a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a>
</h3>
<h4>View a list of TPM events </h4>
</div> </div>
</div> </div>
</div> </div>

0
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/tpm-events.jsp → HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-database.jsp
View File