diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/CertificateService.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/CertificateService.java index f3a572c6..ad8b8479 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/CertificateService.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/CertificateService.java @@ -102,12 +102,13 @@ public class CertificateService { } /** - * Store the given certificate in the database. + * Stored the given certificate in the database. * * @param certificateType String containing the certificate type * @param fileName contain the name of the file of the certificate to * be stored - * @param successMessages contains any messages that will be display on the page + * @param successMessages contains any success messages that will be displayed on the page + * @param errorMessages contains any error messages that will be displayed on the page * @param certificate the certificate to store */ public void storeCertificate( @@ -217,6 +218,14 @@ public class CertificateService { log.error(failMessage); } + /** + * Soft deletes the provided certificate from the database. + * + * @param uuid the UUId of the cert to delete + * @param certificateType the type of certificate + * @param successMessages contains any success messages that will be displayed on the page + * @param errorMessages contains any error messages that will be displayed on the page + */ public void deleteCertificate(UUID uuid, String certificateType, final List successMessages, final List errorMessages) { @@ -285,7 +294,7 @@ public class CertificateService { } /** - * Gets the certificate by the platform serial number. + * Retrieves the platform certificate by the platform serial number. * * @param serialNumber the platform serial number * @return the certificate or null if none is found @@ -321,7 +330,6 @@ public class CertificateService { ComponentResult componentResult; if (platformCredential.getPlatformConfigurationV1() != null) { - List componentIdentifiers = platformCredential.getComponentIdentifiers(); @@ -335,7 +343,6 @@ public class CertificateService { componentResultRepository.save(componentResult); } } else if (platformCredential.getPlatformConfigurationV2() != null) { - List componentIdentifiersV2 = platformCredential.getComponentIdentifiersV2(); @@ -359,7 +366,6 @@ public class CertificateService { } } - /** * Helper method that deletes component results based on the provided platform serial number. * @@ -374,5 +380,4 @@ public class CertificateService { componentResultRepository.save(componentResult); } } - } diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/EndorsementCredentialPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/EndorsementCredentialPageController.java index ffbac483..8442eddb 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/EndorsementCredentialPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/EndorsementCredentialPageController.java @@ -52,7 +52,7 @@ import java.util.zip.ZipOutputStream; @RequestMapping("/HIRS_AttestationCAPortal/portal/certificate-request/endorsement-key-credentials") public class EndorsementCredentialPageController extends PageController { - private static final String ENDORSEMENTCREDENTIAL = "endorsement-key-credentials"; + private static final String ENDORSEMENT_CREDENTIALS = "endorsement-key-credentials"; private final CertificateRepository certificateRepository; private final EndorsementCredentialRepository endorsementCredentialRepository; @@ -131,7 +131,7 @@ public class EndorsementCredentialPageController extends PageController certificates = this.certificateRepository.findByType("EndorsementCredential"); - // convert the list of certificates to a list of endorsement certificates + // convert the list of certificates to a list of endorsement credentials List uploadedEKs = certificates.stream() .filter(eachPC -> eachPC instanceof EndorsementCredential) .map(eachPC -> (EndorsementCredential) eachPC).toList(); // get all files - bulkDownload(zipOut, uploadedEKs); + bulkDownloadEndorsementCredentials(zipOut, uploadedEKs); // write cert to output stream } catch (IllegalArgumentException ex) { String uuidError = "Failed to parse ID from: "; @@ -220,7 +220,7 @@ public class EndorsementCredentialPageController extends PageController model = new HashMap<>(); PageMessages messages = new PageMessages(); @@ -241,13 +241,13 @@ public class EndorsementCredentialPageController extends PageController successMessages = new ArrayList<>(); for (MultipartFile file : files) { - //Parse certificate + //Parse endorsement credential EndorsementCredential parseEndorsementCredential = parseEndorsementCredential(file, messages); //Store only if it was parsed if (parseEndorsementCredential != null) { certificateService.storeCertificate( - ENDORSEMENTCREDENTIAL, + ENDORSEMENT_CREDENTIALS, file.getOriginalFilename(), successMessages, errorMessages, parseEndorsementCredential); } @@ -260,9 +260,9 @@ public class EndorsementCredentialPageController extends PageController model = new HashMap<>(); PageMessages messages = new PageMessages(); @@ -283,7 +283,7 @@ public class EndorsementCredentialPageController extends PageController endorsementCredentials) throws IOException { + private void bulkDownloadEndorsementCredentials(final ZipOutputStream zipOut, + final List endorsementCredentials) + throws IOException { String zipFileName; final String singleFileName = "Endorsement_Certificates"; - // get all files + // get all endorsement credentials for (EndorsementCredential endorsementCredential : endorsementCredentials) { zipFileName = String.format("%s[%s].cer", singleFileName, Integer.toHexString(endorsementCredential.getCertificateHash())); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IssuedCertificateController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IssuedCertificateController.java index 1c13c811..464cce43 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IssuedCertificateController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/IssuedCertificateController.java @@ -114,7 +114,6 @@ public class IssuedCertificateController extends PageController { log.debug("Returning the size of the list of issued certificates: {}", records.size()); return new DataTableResponse<>(records, input); - } /** @@ -127,11 +126,11 @@ public class IssuedCertificateController extends PageController { * @throws IOException when writing to response output stream */ @GetMapping("/download") - public void download( + public void issuedCertificateSingleDownload( @RequestParam final String id, final HttpServletResponse response) throws IOException { - log.info("Handling request to download {}", id); + log.info("Handling request to download issued certificate id {}", id); try { UUID uuid = UUID.fromString(id); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PlatformCredentialPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PlatformCredentialPageController.java index 3c418c77..232ee47f 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PlatformCredentialPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PlatformCredentialPageController.java @@ -54,7 +54,7 @@ import java.util.zip.ZipOutputStream; @RequestMapping("/HIRS_AttestationCAPortal/portal/certificate-request/platform-credentials") public class PlatformCredentialPageController extends PageController { - private static final String PLATFORMCREDENTIAL = "platform-credentials"; + private static final String PLATFORM_CREDENTIALS = "platform-credentials"; private final CertificateRepository certificateRepository; private final PlatformCertificateRepository platformCertificateRepository; @@ -134,7 +134,7 @@ public class PlatformCredentialPageController extends PageController certificates = this.certificateRepository.findByType("PlatformCredential"); - // convert the list of certificates to a list of platform certificates + // convert the list of certificates to a list of platform credentials List uploadedPCs = certificates.stream() .filter(eachPC -> eachPC instanceof PlatformCredential) .map(eachPC -> (PlatformCredential) eachPC).toList(); @@ -232,7 +232,7 @@ public class PlatformCredentialPageController extends PageController model = new HashMap<>(); PageMessages messages = new PageMessages(); @@ -261,13 +261,13 @@ public class PlatformCredentialPageController extends PageController successMessages = new ArrayList<>(); for (MultipartFile file : files) { - //Parse certificate + //Parse platform credential PlatformCredential parsedPlatformCredential = parsePlatformCredential(file, messages); //Store only if it was parsed if (parsedPlatformCredential != null) { certificateService.storeCertificate( - PLATFORMCREDENTIAL, + PLATFORM_CREDENTIALS, file.getOriginalFilename(), successMessages, errorMessages, parsedPlatformCredential); } @@ -281,9 +281,9 @@ public class PlatformCredentialPageController extends PageController model = new HashMap<>(); PageMessages messages = new PageMessages(); @@ -304,7 +304,7 @@ public class PlatformCredentialPageController extends PageController +<%@page contentType="text/html" pageEncoding="UTF-8"%> <%-- JSP TAGS --%> <%@taglib prefix="c" uri="jakarta.tags.core" %> @@ -6,7 +6,7 @@ <%@taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@taglib prefix="my" tagdir="/WEB-INF/tags"%> -<%-- CONTENT --%> --> +<%-- CONTENT --%>