From da7e1de7f3b6f6b8dfb062b532a08d4b4ae9d892 Mon Sep 17 00:00:00 2001
From: chubtub <43381989+chubtub@users.noreply.github.com>
Date: Tue, 11 May 2021 13:06:21 -0400
Subject: [PATCH] Support -m|--manufacturer and -s|--serial filter options from
 commandline in controller class.

---
 .../ValidationReportsPageController.java      | 51 ++++++++++---------
 scripts/download_validation_reports.sh        |  2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java
index a53c97cc..8883d6a7 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java
@@ -159,6 +159,8 @@ public class ValidationReportsPageController extends PageController<NoPageParams
         String columnHeaders = "";
         boolean systemOnly = false;
         boolean componentOnly = false;
+        String filterManufacturer = "";
+        String filterSerial = "";
 
         Enumeration parameters = request.getParameterNames();
         while (parameters.hasMoreElements()) {
@@ -224,17 +226,17 @@ public class ValidationReportsPageController extends PageController<NoPageParams
                         columnHeaders += componentColumnHeaders;
                     }
                     break;
-/*                case "manufacturer":
-                    if (!parameterValue.isEmpty()) {
-
+                case "manufacturer":
+                    if (parameterValue != null && !parameterValue.isEmpty()) {
+                        filterManufacturer = parameterValue;
                     }
                     break;
                 case "serial":
-                    if (!parameterValue.isEmpty()) {
-
+                    if (parameterValue != null && !parameterValue.isEmpty()) {
+                        filterSerial = parameterValue;
                     }
                     break;
-*/
+
                 default:
             }
         }
@@ -256,25 +258,28 @@ public class ValidationReportsPageController extends PageController<NoPageParams
                     && (createTimes.get(i).isBefore(endDate)
                         || createTimes.get(i).isEqual(endDate))) {
                 UUID deviceId = deviceManager.getDevice(deviceNames[i]).getId();
-                LOGGER.info(deviceId);
                 PlatformCredential pc = PlatformCredential.select(certificateManager)
                         .byDeviceId(deviceId).getCertificate();
-                LOGGER.info("Found platform credential: " + pc.toString());
-                if (!componentOnly) {
-                    reportData.append(pc.getManufacturer() + ","
-                            + pc.getModel() + ","
-                            + pc.getPlatformSerial() + ","
-                            + LocalDateTime.now().toString() + ","
-                            + pc.getDevice().getSupplyChainStatus() + ",");
-                }
-                if (!systemOnly) {
-                    ArrayList<ArrayList<String>> parsedComponents = parseComponents(pc);
-                    for (ArrayList<String> component : parsedComponents) {
-                        for (String data : component) {
-                            reportData.append(data + ",");
+                if ((filterManufacturer.isEmpty() || filterManufacturer.equals(
+                                                        pc.getManufacturer()))
+                        && (filterSerial.isEmpty() || filterSerial.equals(
+                                                    pc.getPlatformSerial()))) {
+                    if (!componentOnly) {
+                        reportData.append(pc.getManufacturer() + ","
+                                + pc.getModel() + ","
+                                + pc.getPlatformSerial() + ","
+                                + LocalDateTime.now().toString() + ","
+                                + pc.getDevice().getSupplyChainStatus() + ",");
+                    }
+                    if (!systemOnly) {
+                        ArrayList<ArrayList<String>> parsedComponents = parseComponents(pc);
+                        for (ArrayList<String> component : parsedComponents) {
+                            for (String data : component) {
+                                reportData.append(data + ",");
+                            }
+                            reportData.deleteCharAt(reportData.length() - 1);
+                            reportData.append("\n,,,,,");
                         }
-                        reportData.deleteCharAt(reportData.length() - 1);
-                        reportData.append("\n,,,,,");
                     }
                 }
             }
@@ -284,8 +289,6 @@ public class ValidationReportsPageController extends PageController<NoPageParams
         }
         bufferedWriter.append(columnHeaders + "\n");
         bufferedWriter.append(reportData.toString() + "\n");
-        LOGGER.info(columnHeaders);
-        LOGGER.info(reportData.toString());
         bufferedWriter.flush();
     }
 
diff --git a/scripts/download_validation_reports.sh b/scripts/download_validation_reports.sh
index d01c89af..95fc752e 100644
--- a/scripts/download_validation_reports.sh
+++ b/scripts/download_validation_reports.sh
@@ -85,7 +85,7 @@ do
 	esac
 done
 
-echo "start date: $startDate, end date: $endDate, ip: $ip, system: $system, component: $component, manufacturer: $manufacturer, serial: $serial"
+#echo "start date: $startDate, end date: $endDate, ip: $ip, system: $system, component: $component, manufacturer: $manufacturer, serial: $serial"
 
 #call ACA for validation report
 endpoint="https://$ip:8443/HIRS_AttestationCAPortal/portal/validation-reports"