ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-06-21 00:23:11 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Updated the messaging for an invalid swid tag file and added .log as another type of tmp log file to extension to accept.

Browse Source
This commit is contained in:
Cyrus
2020-07-29 09:27:15 -04:00
parent 29789e2fbe
commit 2b2e7c744b
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
View File

@ -61,7 +61,7 @@ public class ReferenceManifestPageController
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";
private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rim|rimel|bin))$)"; private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rim|rimel|bin|log))$)";
private final BiosDateValidator biosValidator; private final BiosDateValidator biosValidator;
private final ReferenceManifestManager referenceManifestManager; private final ReferenceManifestManager referenceManifestManager;
@ -232,10 +232,6 @@ public class ReferenceManifestPageController
messages, messages,
rim, rim,
referenceManifestManager); referenceManifestManager);
for (SwidResource swidRes : rim.parseResource()) {
System.out.println("testing this section!");
}
} }
} }

2
HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java
View File

@ -469,7 +469,7 @@ public class ReferenceManifest extends ArchivableEntity {
if (jaxbe != null) { if (jaxbe != null) {
return jaxbe; return jaxbe;
} else { } else {
throw new IOException("Invalid swidtag file!"); throw new IOException("Invalid Base RIM, swidtag format expected.");
} }
} }