From ee7befca812c7e6d301391e994f1d6565f407412 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Fri, 8 Oct 2021 16:35:40 -0400
Subject: [PATCH 1/4] This initial commit adds the ability to download all
 platform credentials and trust chain credentials from their respective pages
 in a bulk zip.

---
 .../CertificateRequestPageController.java     | 93 ++++++++++++++++++-
 .../WEB-INF/jsp/platform-credentials.jsp      |  6 ++
 .../main/webapp/WEB-INF/jsp/trust-chain.jsp   |  6 ++
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
index 1032d836..2b74d217 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -48,11 +49,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import static org.apache.logging.log4j.LogManager.getLogger;
 
 /**
- * Controller for the Device page.
+ * Controller for the Certificates list all pages.
  */
 @Controller
 @RequestMapping("/certificate-request")
@@ -374,6 +377,94 @@ public class CertificateRequestPageController extends PageController<NoPageParam
         response.getOutputStream().write(certificateAuthorityCredential.getRawBytes());
     }
 
+    /**
+     * Handles request to download the certs by writing it to the response stream
+     * for download in bulk.
+     *
+     * @param response the response object (needed to update the header with the
+     * file name)
+     * @throws java.io.IOException when writing to response output stream
+     */
+    @RequestMapping(value = "/trust-chain/bulk", method = RequestMethod.GET)
+    public void caBulkDownload(final HttpServletResponse response)
+            throws IOException {
+        LOGGER.info("Handling request to download all trust chain certificates");
+        String fileName = "trust-chain.zip";
+        String zipFileName;
+
+        // Set filename for download.
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        response.setContentType("application/zip");
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
+            // get all files
+            for (CertificateAuthorityCredential ca : CertificateAuthorityCredential.select(certificateManager)
+                    .getCertificates()) {
+                zipFileName = String.format("ca-certificate[%s].cer",
+                        Integer.toHexString(ca.getCertificateHash()));
+                // configure the zip entry, the properties of the 'file'
+                ZipEntry zipEntry = new ZipEntry(zipFileName);
+                zipEntry.setSize((long) ca.getRawBytes().length * Byte.SIZE);
+                zipEntry.setTime(System.currentTimeMillis());
+                zipOut.putNextEntry(zipEntry);
+                // the content of the resource
+                StreamUtils.copy(ca.getRawBytes(), zipOut);
+                zipOut.closeEntry();
+            }
+            zipOut.finish();
+            // write cert to output stream
+        } catch (IllegalArgumentException ex) {
+            String uuidError = "Failed to parse ID from: ";
+            LOGGER.error(uuidError, ex);
+            // send a 404 error when invalid certificate
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    /**
+     * Handles request to download the certs by writing it to the response stream
+     * for download in bulk.
+     *
+     * @param response the response object (needed to update the header with the
+     * file name)
+     * @throws java.io.IOException when writing to response output stream
+     */
+    @RequestMapping(value = "/platform-credentials/bulk", method = RequestMethod.GET)
+    public void pcBulkDownload(final HttpServletResponse response)
+            throws IOException {
+        LOGGER.info("Handling request to download all platform certificates");
+        String fileName = "platform_certificates.zip";
+        String zipFileName;
+
+        // Set filename for download.
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        response.setContentType("application/zip");
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
+            // get all files
+            for (PlatformCredential pc : PlatformCredential.select(certificateManager)
+                    .getCertificates()) {
+                zipFileName = String.format("Platform_Certificate[%s].cer",
+                        Integer.toHexString(pc.getCertificateHash()));
+                // configure the zip entry, the properties of the 'file'
+                ZipEntry zipEntry = new ZipEntry(zipFileName);
+                zipEntry.setSize((long) pc.getRawBytes().length * Byte.SIZE);
+                zipEntry.setTime(System.currentTimeMillis());
+                zipOut.putNextEntry(zipEntry);
+                // the content of the resource
+                StreamUtils.copy(pc.getRawBytes(), zipOut);
+                zipOut.closeEntry();
+            }
+            zipOut.finish();
+            // write cert to output stream
+        } catch (IllegalArgumentException ex) {
+            String uuidError = "Failed to parse ID from: ";
+            LOGGER.error(uuidError, ex);
+            // send a 404 error when invalid certificate
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
     /**
      * Upload and processes a credential.
      *
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
index 7e02a9e2..67e3e02a 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
@@ -25,6 +25,12 @@
                 </my:file-chooser>
             </form:form>
         </div>
+        <div class="aca-input-box-header">
+            Bulk Platform Credentials Download
+            <a href="${portal}/certificate-request/platform-credentials/bulk">
+                <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+            </a>
+        </div>
         <br/>
         <div class="aca-data-table">
             <table id="platformTable" class="display" width="100%">
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
index ca8782c2..3e19cd67 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
@@ -78,6 +78,12 @@
             </form:form>
         </div>
         <br/>
+        <div class="aca-input-box-header">
+            Bulk Trust Chain CA Credentials Download
+            <a href="${portal}/certificate-request/trust-chain/bulk">
+                <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+            </a>
+        </div>
         <br/>
         <div class="aca-data-table">
             <table id="trustChainTable" class="display" width="100%">

From 9492c680da3499052e2058e3987a4a74bcb6893f Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Tue, 12 Oct 2021 08:41:45 -0400
Subject: [PATCH 2/4] There was an checkstyles error that needed to be
 corrected.

---
 .../page/controllers/CertificateRequestPageController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
index 2b74d217..312b3d04 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
@@ -398,7 +398,8 @@ public class CertificateRequestPageController extends PageController<NoPageParam
 
         try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
             // get all files
-            for (CertificateAuthorityCredential ca : CertificateAuthorityCredential.select(certificateManager)
+            for (CertificateAuthorityCredential ca : CertificateAuthorityCredential
+                    .select(certificateManager)
                     .getCertificates()) {
                 zipFileName = String.format("ca-certificate[%s].cer",
                         Integer.toHexString(ca.getCertificateHash()));

From 2b7b4bfdd1e2985dfdd75eadca6dc60ab08b9d80 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Fri, 29 Oct 2021 15:42:57 -0400
Subject: [PATCH 3/4] Updated the labeling for the Trust chain and platform
 certificates.  The import label is removed and the download icon moved next
 to the import button.  Added the same functionality to the RIMs.

---
 .../ReferenceManifestPageController.java      | 57 +++++++++++++++++++
 .../WEB-INF/jsp/platform-credentials.jsp      | 11 ++--
 .../WEB-INF/jsp/reference-manifests.jsp       |  5 +-
 .../main/webapp/WEB-INF/jsp/trust-chain.jsp   | 12 ++--
 4 files changed, 69 insertions(+), 16 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 f73d4c16..999b03dc 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
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -45,11 +46,15 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * Controller for the Reference Manifest page.
@@ -356,6 +361,58 @@ public class ReferenceManifestPageController
         }
     }
 
+    /**
+     * Handles request to download bulk of RIMs by writing it to the response stream
+     * for download in bulk.
+     *
+     * @param response the response object (needed to update the header with the
+     * file name)
+     * @throws java.io.IOException when writing to response output stream
+     */
+    @RequestMapping(value = "/bulk", method = RequestMethod.GET)
+    public void bulk(final HttpServletResponse response)
+            throws IOException {
+        LOGGER.info("Handling request to download all Reference Integrity Manifests");
+        String fileName = "rims.zip";
+        String zipFileName;
+
+        // Set filename for download.
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        response.setContentType("application/zip");
+
+        List<ReferenceManifest> referenceManifestList = new LinkedList<>();
+        referenceManifestList.addAll(BaseReferenceManifest
+                .select(referenceManifestManager).getRIMs());
+        referenceManifestList.addAll(SupportReferenceManifest
+                .select(referenceManifestManager).getRIMs());
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
+            // get all files
+            for (ReferenceManifest rim : referenceManifestList) {
+                if (rim.getFileName().isEmpty()) {
+                    zipFileName = "";
+                } else {
+                    // configure the zip entry, the properties of the 'file'
+                    zipFileName = rim.getFileName();
+                }
+                ZipEntry zipEntry = new ZipEntry(zipFileName);
+                zipEntry.setSize((long) rim.getRimBytes().length * Byte.SIZE);
+                zipEntry.setTime(System.currentTimeMillis());
+                zipOut.putNextEntry(zipEntry);
+                // the content of the resource
+                StreamUtils.copy(rim.getRimBytes(), zipOut);
+                zipOut.closeEntry();
+            }
+            zipOut.finish();
+            // write cert to output stream
+        } catch (IllegalArgumentException ex) {
+            String uuidError = "Failed to parse ID from: ";
+            LOGGER.error(uuidError, ex);
+            // send a 404 error when invalid certificate
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
     /**
      * This method takes the parameter and looks for this information in the
      * Database.
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
index 67e3e02a..c0e44451 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
@@ -19,18 +19,15 @@
         <c:set var="endorsementIcon" value="${icons}/ic_vpn_key_black_24dp.png"/>
         <div class="aca-input-box-header">
             <form:form method="POST"  action="${portal}/certificate-request/platform-credentials/upload" enctype="multipart/form-data">
-                Import Platform Credentials
+                Platform Credentials
                 <my:file-chooser id="platformCredentialEditor" label="Import Platform Credentials">
                     <input id="importFile" type="file" name="file" multiple="multiple" />
                 </my:file-chooser>
+                <a href="${portal}/certificate-request/platform-credentials/bulk">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+                </a>
             </form:form>
         </div>
-        <div class="aca-input-box-header">
-            Bulk Platform Credentials Download
-            <a href="${portal}/certificate-request/platform-credentials/bulk">
-                <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
-            </a>
-        </div>
         <br/>
         <div class="aca-data-table">
             <table id="platformTable" class="display" width="100%">
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp
index 4c090170..dee517ad 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/reference-manifests.jsp
@@ -18,10 +18,13 @@
         <!-- text and icon resource variables -->
         <div class="aca-input-box-header">
             <form:form method="POST"  action="${portal}/reference-manifests/upload" enctype="multipart/form-data">
-                Import RIMs
+                Reference Integrity Manifests
                 <my:file-chooser id="referenceManifestsEditor" label="Import RIMs">
                     <input id="importFile" type="file" name="file" multiple="multiple" />
                 </my:file-chooser>
+                <a href="${portal}/reference-manifests/bulk">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download All RIMs">
+                </a>
             </form:form>
         </div>
         <br/>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
index 3e19cd67..0e7eb26f 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
@@ -71,20 +71,16 @@
         </a>
         <div class="aca-input-box-header">
             <form:form method="POST" action="${portal}/certificate-request/trust-chain/upload" enctype="multipart/form-data">
-                Import Trust Chain CA Certificates
+                Trust Chain CA Certificates
                     <my:file-chooser id="tc-editor" label="Import Trust Chain Certificates">
                         <input id="importFile" type="file" name="file" multiple="multiple" />
                     </my:file-chooser>
+                <a href="${portal}/certificate-request/trust-chain/bulk">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+                </a>
             </form:form>
         </div>
         <br/>
-        <div class="aca-input-box-header">
-            Bulk Trust Chain CA Credentials Download
-            <a href="${portal}/certificate-request/trust-chain/bulk">
-                <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
-            </a>
-        </div>
-        <br/>
         <div class="aca-data-table">
             <table id="trustChainTable" class="display" width="100%">
                 <thead>

From bd5d9059906b41fad0a51c77b33fc0b41583c26e Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:55:55 -0400
Subject: [PATCH 4/4] Updated the code to include bulk downloads for issued,
 eks.

---
 .../CertificateRequestPageController.java     | 94 ++++++++++++++++++-
 .../jsp/endorsement-key-credentials.jsp       |  3 +
 .../WEB-INF/jsp/issued-certificates.jsp       |  8 +-
 .../WEB-INF/jsp/platform-credentials.jsp      |  2 +-
 .../main/webapp/WEB-INF/jsp/trust-chain.jsp   |  2 +-
 5 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
index 312b3d04..684f903b 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificateRequestPageController.java
@@ -401,7 +401,7 @@ public class CertificateRequestPageController extends PageController<NoPageParam
             for (CertificateAuthorityCredential ca : CertificateAuthorityCredential
                     .select(certificateManager)
                     .getCertificates()) {
-                zipFileName = String.format("ca-certificate[%s].cer",
+                zipFileName = String.format("ca-certificates[%s].cer",
                         Integer.toHexString(ca.getCertificateHash()));
                 // configure the zip entry, the properties of the 'file'
                 ZipEntry zipEntry = new ZipEntry(zipFileName);
@@ -445,7 +445,7 @@ public class CertificateRequestPageController extends PageController<NoPageParam
             // get all files
             for (PlatformCredential pc : PlatformCredential.select(certificateManager)
                     .getCertificates()) {
-                zipFileName = String.format("Platform_Certificate[%s].cer",
+                zipFileName = String.format("Platform_Certificates[%s].cer",
                         Integer.toHexString(pc.getCertificateHash()));
                 // configure the zip entry, the properties of the 'file'
                 ZipEntry zipEntry = new ZipEntry(zipFileName);
@@ -466,6 +466,96 @@ public class CertificateRequestPageController extends PageController<NoPageParam
         }
     }
 
+    /**
+     * Handles request to download the certs by writing it to the response stream
+     * for download in bulk.
+     *
+     * @param response the response object (needed to update the header with the
+     * file name)
+     * @throws java.io.IOException when writing to response output stream
+     */
+    @RequestMapping(value = "/issued-certificates/bulk", method = RequestMethod.GET)
+    public void icBulkDownload(final HttpServletResponse response)
+            throws IOException {
+        LOGGER.info("Handling request to download all issued certificates");
+        String fileName = "issued_certificates.zip";
+        String zipFileName;
+
+        // Set filename for download.
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        response.setContentType("application/zip");
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
+            // get all files
+            for (IssuedAttestationCertificate ic : IssuedAttestationCertificate
+                    .select(certificateManager)
+                    .getCertificates()) {
+                zipFileName = String.format("Issued_Certificates[%s].cer",
+                        Integer.toHexString(ic.getCertificateHash()));
+                // configure the zip entry, the properties of the 'file'
+                ZipEntry zipEntry = new ZipEntry(zipFileName);
+                zipEntry.setSize((long) ic.getRawBytes().length * Byte.SIZE);
+                zipEntry.setTime(System.currentTimeMillis());
+                zipOut.putNextEntry(zipEntry);
+                // the content of the resource
+                StreamUtils.copy(ic.getRawBytes(), zipOut);
+                zipOut.closeEntry();
+            }
+            zipOut.finish();
+            // write cert to output stream
+        } catch (IllegalArgumentException ex) {
+            String uuidError = "Failed to parse ID from: ";
+            LOGGER.error(uuidError, ex);
+            // send a 404 error when invalid certificate
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    /**
+     * Handles request to download the certs by writing it to the response stream
+     * for download in bulk.
+     *
+     * @param response the response object (needed to update the header with the
+     * file name)
+     * @throws java.io.IOException when writing to response output stream
+     */
+    @RequestMapping(value = "/endorsement-key-credentials/bulk", method = RequestMethod.GET)
+    public void ekBulkDownload(final HttpServletResponse response)
+            throws IOException {
+        LOGGER.info("Handling request to download all endorsement certificates");
+        String fileName = "endorsement_certificates.zip";
+        String zipFileName;
+
+        // Set filename for download.
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        response.setContentType("application/zip");
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
+            // get all files
+            for (EndorsementCredential ek : EndorsementCredential
+                    .select(certificateManager)
+                    .getCertificates()) {
+                zipFileName = String.format("Endorsement_Certificates[%s].cer",
+                        Integer.toHexString(ek.getCertificateHash()));
+                // configure the zip entry, the properties of the 'file'
+                ZipEntry zipEntry = new ZipEntry(zipFileName);
+                zipEntry.setSize((long) ek.getRawBytes().length * Byte.SIZE);
+                zipEntry.setTime(System.currentTimeMillis());
+                zipOut.putNextEntry(zipEntry);
+                // the content of the resource
+                StreamUtils.copy(ek.getRawBytes(), zipOut);
+                zipOut.closeEntry();
+            }
+            zipOut.finish();
+            // write cert to output stream
+        } catch (IllegalArgumentException ex) {
+            String uuidError = "Failed to parse ID from: ";
+            LOGGER.error(uuidError, ex);
+            // send a 404 error when invalid certificate
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
     /**
      * Upload and processes a credential.
      *
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
index 7abd8c27..e2030a3c 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/endorsement-key-credentials.jsp
@@ -21,6 +21,9 @@
                 <my:file-chooser id="ek-editor" label="Import Endorsement Key Credentials">
                     <input id="importFile" type="file" name="file" multiple="multiple" />
                 </my:file-chooser>
+                <a href="${portal}/certificate-request/endorsement-key-credentials/bulk">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download All Endorsement Certificates">
+                </a>
             </form:form>
         </div>
         <br/>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
index 04c7ad79..2beacdff 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/issued-certificates.jsp
@@ -13,8 +13,14 @@
         <script type="text/javascript" src="${lib}/jquery.spring-friendly/jquery.spring-friendly.js"></script>
     </jsp:attribute>
     <jsp:attribute name="pageHeaderTitle">Issued Certificates</jsp:attribute>
-
     <jsp:body>
+        <div class="aca-input-box-header">
+            Issued Credentials
+            <a href="${portal}/certificate-request/issued-certificates/bulk">
+                <img src="${icons}/ic_file_download_black_24dp.png" title="Download All Issued Certificates">
+            </a>
+        </div>
+        <br />
         <div class="aca-data-table">
             <table id="issuedTable" class="display" width="100%">
                 <thead>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
index c0e44451..54b6ce35 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/platform-credentials.jsp
@@ -24,7 +24,7 @@
                     <input id="importFile" type="file" name="file" multiple="multiple" />
                 </my:file-chooser>
                 <a href="${portal}/certificate-request/platform-credentials/bulk">
-                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download All Platform Certificates">
                 </a>
             </form:form>
         </div>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
index 0e7eb26f..1870a0b1 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/trust-chain.jsp
@@ -76,7 +76,7 @@
                         <input id="importFile" type="file" name="file" multiple="multiple" />
                     </my:file-chooser>
                 <a href="${portal}/certificate-request/trust-chain/bulk">
-                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download Certificates">
+                    <img src="${icons}/ic_file_download_black_24dp.png" title="Download All Trust Chain Certificates">
                 </a>
             </form:form>
         </div>