Updated the error message for no associated RIM not found, cleaned up display of the event content and adjusted the column of the digest display.

HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java

@@ -327,6 +327,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
         AppraisalStatus fwStatus = null;
         String manufacturer = device.getDeviceInfo()
                 .getHardwareInfo().getManufacturer();
+        String model = device.getDeviceInfo().getHardwareInfo().getProductName();
         ReferenceManifest baseRim = null;
         Set<ReferenceManifest> rims = ReferenceManifest
                 .select(referenceManifestManager).getRIMs();
@@ -407,8 +408,8 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
         } else {
             fwStatus = new AppraisalStatus(FAIL,
                     String.format("Firmware validation failed: "
-                                    + "No associated RIM file could be found for %s",
+                                    + "No associated RIM file could be found for %s:%s",
-                            manufacturer));
+                            manufacturer, model));
         }
 
         return buildValidationRecord(SupplyChainValidation.ValidationType.FIRMWARE,

HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp

@@ -40,10 +40,10 @@
                         <table id="eventLog">
                             <thead>
                                 <tr class="header">
-                                    <th style="width: 5%">Event #</th>
+                                    <th>Event #</th>
-                                    <th style="width: 10%">PCR Index</th>
+                                    <th>PCR Index</th>
                                     <th style="width: 20%">Event Type</th>
-                                    <th style="width: 20%">Digest</th>
+                                    <th>Digest</th>
                                     <th style="width: 50%">Event Content</th>
                                 </tr>
                             </thead>
@@ -52,11 +52,11 @@
                                     <c:set var="count" value="1" scope="page"/>
                                     <c:forEach items="${initialData.events}" var="event">
                                         <tr>
-                                            <td>${count}</td>
+                                            <td style="width: 75px">${count}</td>
-                                            <td>PCR${event.getPcrIndex()}</td>
+                                            <td class="pcrCell">PCR${event.getPcrIndex()}</td>
                                             <td>${event.getEventTypeStr()}</td>
                                             <td class="digestCell">${event.getEventDigestStr()}</td>
-                                            <td class="dataCell" title="${event.getEventContentStr()}">${event.getEventContentStr()}</td>
+                                            <td title="${event.getEventContentStr()}"><div style="height: 50px; overflow: auto">${event.getEventContentStr()}</div></td>
                                         </tr>
                                         <c:set var="count" value="${count + 1}" scope="page"/>
                                     </c:forEach>

HIRS_AttestationCAPortal/src/main/webapp/common/rim_details.css

@@ -46,6 +46,10 @@
 }
 
 .digestCell {
-  max-width: 150px;
+  max-width: 200px;
   word-wrap: break-word;
 }
+
+.pcrCell {
+  max-width: 50px;
+}

HIRS_Utils/src/main/java/hirs/tpm/eventlog/TpmPcrEvent.java

@@ -414,7 +414,7 @@ public class TpmPcrEvent {
                 sb.append("Unknown Event found\n");
         }
 
-        return sb.toString();
+        return cleanTextContent(sb.toString());
     }
 
     /**
@@ -741,4 +741,23 @@ public class TpmPcrEvent {
         }
         return sb.toString() + "\n";
     }
+
+    /**
+     * Remove bad visual value text.
+     * @param text content to operate over.
+     * @return cleared string
+     */
+    public String cleanTextContent(final String text) {
+        String result;
+        // strips off all non-ASCII characters
+        result = text.replaceAll("[^\\x00-\\x7F]", "");
+
+        // erases all the ASCII control characters
+        result = result.replaceAll("[\\p{Cntrl}&&[^\r\n\t]]", "");
+
+        // removes non-printable characters from Unicode
+        result = result.replaceAll("\\p{C}", "");
+
+        return result.trim();
+    }
 }