From 2b2e7c744b4f10ec9569c30c51a24db705e8464d Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Wed, 29 Jul 2020 09:27:15 -0400
Subject: [PATCH] Updated the messaging for an invalid swid tag file and added
.log as another type of tmp log file to extension to accept.
---
.../page/controllers/ReferenceManifestPageController.java | 6 +-----
.../src/main/java/hirs/data/persist/ReferenceManifest.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
index 5e5dd96d..df8acdf1 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
@@ -61,7 +61,7 @@ public class ReferenceManifestPageController
extends PageController<NoPageParams> {
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 ReferenceManifestManager referenceManifestManager;
@@ -232,10 +232,6 @@ public class ReferenceManifestPageController
messages,
rim,
referenceManifestManager);
-
- for (SwidResource swidRes : rim.parseResource()) {
- System.out.println("testing this section!");
- }
}
}
diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java
index bd1f869d..e2bdeecb 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java
@@ -469,7 +469,7 @@ public class ReferenceManifest extends ArchivableEntity {
if (jaxbe != null) {
return jaxbe;
} else {
- throw new IOException("Invalid swidtag file!");
+ throw new IOException("Invalid Base RIM, swidtag format expected.");
}
}