From f8a3ccd9626d3d0101b52cb40556c1c58bccdb09 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Fri, 17 Sep 2021 07:55:44 -0400 Subject: [PATCH 1/2] This is an initial commit updates the policy page. Adds additional policies for generating a DevID. The underlying code doesn't actually generate one yet. But the SupplyChainPolicy holds the flags. --- .../java/hirs/attestationca/AcaDbInit.java | 9 +- .../portal/model/PolicyPageModel.java | 148 +++++++++++++- .../hirs/attestationca/portal/page/Page.java | 2 +- .../controllers/PolicyPageController.java | 183 ++++++++++++++++++ .../src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- .../WEB-INF/jsp/issued-certificates.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/policy.jsp | 58 +++++- .../hirs/data/persist/SupplyChainPolicy.java | 81 +++++++- 8 files changed, 463 insertions(+), 24 deletions(-) diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AcaDbInit.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AcaDbInit.java index b5bc03da..cde3ac79 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AcaDbInit.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AcaDbInit.java @@ -28,8 +28,7 @@ public final class AcaDbInit { public static synchronized void insertDefaultEntries( final AppraiserManager appraiserManager, final DeviceGroupManager deviceGroupManager, - final PolicyManager policyManager - ) { + final PolicyManager policyManager) { LOG.info("Ensuring default ACA database entries are present."); // Ensure the default group exists. It may have already been created by the Server RPM @@ -38,8 +37,7 @@ public final class AcaDbInit { LOG.info("Default group not found; saving..."); defaultGroup = deviceGroupManager.saveDeviceGroup(new DeviceGroup( DeviceGroup.DEFAULT_GROUP, - "This is the default group" - )); + "This is the default group")); LOG.info("Saved default group."); } @@ -61,8 +59,7 @@ public final class AcaDbInit { // Create the SupplyChainPolicy LOG.info("Saving default supply chain policy..."); SupplyChainPolicy supplyChainPolicy = new SupplyChainPolicy( - SupplyChainPolicy.DEFAULT_POLICY - ); + SupplyChainPolicy.DEFAULT_POLICY); policyManager.savePolicy(supplyChainPolicy); policyManager.setDefaultPolicy(supplyChainAppraiser, supplyChainPolicy); policyManager.setPolicy(supplyChainAppraiser, defaultGroup, supplyChainPolicy); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/model/PolicyPageModel.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/model/PolicyPageModel.java index 86da4b6e..310872ba 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/model/PolicyPageModel.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/model/PolicyPageModel.java @@ -14,7 +14,9 @@ public class PolicyPageModel { private boolean enablePcCertificateAttributeValidation; private boolean enableFirmwareValidation; private boolean issueAttestationCertificate; + private boolean issueDevIdCertificate; private boolean generateOnExpiration; + private boolean devIdExpirationFlag; private boolean enableIgnoreIma; private boolean enableIgnoreTboot; private boolean enableIgnoreGpt; @@ -25,14 +27,19 @@ public class PolicyPageModel { private String ecValidate; private String fmValidate; private String attestationCertificateIssued; + private String devIdCertificateIssued; private String generationExpirationOn; + private String devIdExpirationChecked; private String numOfValidDays; private String reissueThreshold; + private String devIdReissueThreshold; private String ignoreIma; private String ignoretBoot; private String ignoreGpt; private String expirationValue; + private String devIdExpirationValue; private String thresholdValue; + private String devIdThresholdValue; /** * Constructor. Sets fields from policy. @@ -45,7 +52,9 @@ public class PolicyPageModel { this.enablePcCertificateAttributeValidation = policy.isPcAttributeValidationEnabled(); this.enableFirmwareValidation = policy.isFirmwareValidationEnabled(); this.issueAttestationCertificate = policy.isIssueAttestationCertificate(); + this.issueDevIdCertificate = policy.isIssueDevIdCertificate(); this.generateOnExpiration = policy.isGenerateOnExpiration(); + this.devIdExpirationFlag = policy.isDevIdExpirationFlag(); this.numOfValidDays = policy.getValidityDays(); this.reissueThreshold = policy.getReissueThreshold(); this.enableIgnoreIma = policy.isIgnoreImaEnabled(); @@ -53,6 +62,9 @@ public class PolicyPageModel { this.enableIgnoreGpt = policy.isIgnoreGptEnabled(); this.expirationValue = policy.getValidityDays(); this.thresholdValue = policy.getReissueThreshold(); + this.devIdExpirationValue = policy.getDevIdValidityDays(); + this.devIdReissueThreshold = policy.getDevIdReissueThreshold(); + this.devIdThresholdValue = policy.getDevIdReissueThreshold(); } /** @@ -106,6 +118,15 @@ public class PolicyPageModel { return issueAttestationCertificate; } + /** + * Gets the Dev ID Certificate issued State. + * + * @return the issued state. + */ + public boolean isIssueDevIdCertificate() { + return issueDevIdCertificate; + } + /** * Gets the state of generating a certificate. * @@ -185,12 +206,12 @@ public class PolicyPageModel { } /** - * Gets the attestation certificate issued state. + * Gets the DevID certificate issued state. * * @return the model string representation of this field. */ - public String getGenerationExpirationOn() { - return generationExpirationOn; + public String getDevIdCertificateIssued() { + return devIdCertificateIssued; } /** @@ -211,6 +232,15 @@ public class PolicyPageModel { return reissueThreshold; } + /** + * Gets the number of selected threshold days. + * + * @return the number of the days for reissue + */ + public String getDevIdReissueThreshold() { + return devIdReissueThreshold; + } + /** * Gets the Ignore IMA validation value. * @@ -280,11 +310,19 @@ public class PolicyPageModel { * * @param issueAttestationCertificate true if generating Certificates. */ - public void setIssueAttestationCertificate( - final boolean issueAttestationCertificate) { + public void setIssueAttestationCertificate(final boolean issueAttestationCertificate) { this.issueAttestationCertificate = issueAttestationCertificate; } + /** + * Sets the Dev ID Certificate Issued state. + * + * @param issueDevIdCertificate true if generating Certificates. + */ + public void setIssueDevIdCertificate(final boolean issueDevIdCertificate) { + this.issueDevIdCertificate = issueDevIdCertificate; + } + /** * Setter for the state of generating a certificate. * @@ -367,6 +405,24 @@ public class PolicyPageModel { this.attestationCertificateIssued = attestationCertificateIssued; } + /** + * Sets the Issued DevID Certificate state. + * + * @param devIdCertificateIssued "checked" if generating certificates. + */ + public void setDevIdCertificateIssued(final String devIdCertificateIssued) { + this.devIdCertificateIssued = devIdCertificateIssued; + } + + /** + * Gets the attestation certificate issued state. + * + * @return the model string representation of this field. + */ + public String getGenerationExpirationOn() { + return generationExpirationOn; + } + /** * Sets the generation expiration state. * @@ -377,6 +433,43 @@ public class PolicyPageModel { this.generationExpirationOn = generationExpirationOn; } + /** + * Gets the attestation certificate issued state. + * + * @return the model string representation of this field. + */ + public String getDevIdExpirationChecked() { + return devIdExpirationChecked; + } + + /** + * Sets the generation expiration state. + * + * @param devIdExpirationChecked "checked" if generating expiration is on. + */ + public void setDevIdExpirationChecked( + final String devIdExpirationChecked) { + this.devIdExpirationChecked = devIdExpirationChecked; + } + + /** + * Gets the DevID certificate issued state. + * + * @return the model string representation of this field. + */ + public boolean getDevIdExpirationFlag() { + return devIdExpirationFlag; + } + + /** + * Sets the generation expiration state. + * + * @param devIdExpirationFlag "checked" if generating expiration is on. + */ + public void setDevIdExpirationFlag(final boolean devIdExpirationFlag) { + this.devIdExpirationFlag = devIdExpirationFlag; + } + /** * Sets the Ignore IMA state. * @@ -420,6 +513,22 @@ public class PolicyPageModel { this.expirationValue = expirationValue; } + /** + * Getter for the DevID expiration value. + * @return the value + */ + public String getDevIdExpirationValue() { + return devIdExpirationValue; + } + + /** + * Setter for the DevID expiration value. + * @param devIdExpirationValue string value + */ + public void setDevIdExpirationValue(final String devIdExpirationValue) { + this.devIdExpirationValue = devIdExpirationValue; + } + /** * Getter for the expiration value. * @return the thresholdValue @@ -436,6 +545,22 @@ public class PolicyPageModel { this.thresholdValue = thresholdValue; } + /** + * Getter for the expiration value. + * @return the devIdThresholdValue + */ + public String getDevIdThresholdValue() { + return devIdThresholdValue; + } + + /** + * Setter for the expiration value. + * @param devIdThresholdValue string value + */ + public void setDevIdThresholdValue(final String devIdThresholdValue) { + this.devIdThresholdValue = devIdThresholdValue; + } + @Override public String toString() { return "PolicyPageModel{" @@ -445,7 +570,18 @@ public class PolicyPageModel { + enablePcCertificateAttributeValidation + ", enableFirmwareValidation=" + enableFirmwareValidation + ", issueAttestationCertificate=" + issueAttestationCertificate + + ", issueDevIdCertificate=" + issueDevIdCertificate + ", generateOnExpiration=" + generateOnExpiration - + ", numOfValidDays=" + numOfValidDays + "}"; + + ", numOfValidDays=" + numOfValidDays + + ", reissueThreshold=" + reissueThreshold + + ", enableIgnoreIma=" + enableIgnoreIma + + ", enableIgnoreTboot=" + enableIgnoreTboot + + ", enableIgnoreGpt=" + enableIgnoreGpt + + ", expirationValue=" + expirationValue + + ", thresholdValue=" + thresholdValue + + ", devIdExpirationValue=" + devIdExpirationValue + + ", devIdReissueThreshold=" + devIdReissueThreshold + + ", devIdThresholdValue=" + devIdThresholdValue + + "}"; } } diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java index 52d9a196..64ca8f5e 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java @@ -30,7 +30,7 @@ public enum Page { /** * Page to display issued certificates. */ - ISSUED_CERTIFICATES("Issued Attestation Certificates", "ic_library_books", + ISSUED_CERTIFICATES("Issued Certificates", "ic_library_books", null, "certificate-request/"), /** * Page to display certificate validation reports. diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java index 2f97a01d..7e55be67 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java @@ -246,6 +246,50 @@ public class PolicyPageController extends PageController { return redirectToSelf(new NoPageParams(), model, attr); } + /** + * Updates the DevID Certificate generation policy setting and redirects + * back to the original page. + * + * @param ppModel The data posted by the form mapped into an object. + * @param attr RedirectAttributes used to forward data back to the original page. + * @return View containing the url and parameters + * @throws URISyntaxException if malformed URI + */ + @RequestMapping(value = "update-issue-devid", method = RequestMethod.POST) + public RedirectView updateDevIdVal(@ModelAttribute final PolicyPageModel ppModel, + final RedirectAttributes attr) + throws URISyntaxException { + + // set the data received to be populated back into the form + Map model = new HashMap<>(); + PageMessages messages = new PageMessages(); + String successMessage; + boolean issuedDevIdOptionEnabled + = ppModel.getDevIdCertificateIssued() + .equalsIgnoreCase(ENABLED_CHECKED_PARAMETER_VALUE); + + try { + SupplyChainPolicy policy = getDefaultPolicyAndSetInModel(ppModel, model); + + if (issuedDevIdOptionEnabled) { + successMessage = "DevID Certificate generation enabled."; + } else { + successMessage = "DevID Certificate generation disabled."; + policy.setDevIdExpirationFlag(false); + } + + policy.setIssueDevIdCertificate(issuedDevIdOptionEnabled); + savePolicyAndApplySuccessMessage(ppModel, model, messages, successMessage, policy); + } catch (PolicyManagerException e) { + handlePolicyManagerUpdateError(model, messages, e, + "Error changing ACA DevID Certificate generation policy", + "Error updating policy. \n" + e.getMessage()); + } + + // return the redirect + return redirectToSelf(new NoPageParams(), model, attr); + } + /** * Updates the state of the policy setting that indicates that the generation * will occur in a set time frame and redirects @@ -316,6 +360,76 @@ public class PolicyPageController extends PageController { return redirectToSelf(new NoPageParams(), model, attr); } + /** + * Updates the state of the policy setting that indicates that the generation + * will occur in a set time frame and redirects + * back to the original page. + * + * @param ppModel The data posted by the form mapped into an object. + * @param attr RedirectAttributes used to forward data back to the original page. + * @return View containing the url and parameters + * @throws URISyntaxException if malformed URI + */ + @RequestMapping(value = "update-devid-expire-on", method = RequestMethod.POST) + public RedirectView updateDevIdExpireOnVal(@ModelAttribute final PolicyPageModel ppModel, + final RedirectAttributes attr) + throws URISyntaxException { + + // set the data received to be populated back into the form + Map model = new HashMap<>(); + PageMessages messages = new PageMessages(); + String successMessage; + String numOfDays; + + boolean generateDevIdCertificateEnabled = false; + // because this is just one option, there is not 'unchecked' value, so it is either + // 'checked' or null + if (ppModel.getDevIdExpirationChecked() != null) { + generateDevIdCertificateEnabled + = ppModel.getDevIdExpirationChecked() + .equalsIgnoreCase(ENABLED_CHECKED_PARAMETER_VALUE); + } + + try { + SupplyChainPolicy policy = getDefaultPolicyAndSetInModel(ppModel, model); + boolean issuedDevIdOptionEnabled + = policy.isIssueDevIdCertificate(); + + if (issuedDevIdOptionEnabled) { + if (generateDevIdCertificateEnabled) { + successMessage = "DevID Certificate generation expiration time enabled."; + } else { + successMessage = "DevID Certificate generation expiration time disabled."; + } + + if (generateDevIdCertificateEnabled) { + numOfDays = ppModel.getDevIdExpirationValue(); + if (numOfDays == null) { + numOfDays = SupplyChainPolicy.TEN_YEARS; + } + } else { + numOfDays = policy.getDevIdValidityDays(); + } + + policy.setDevIdValidityDays(numOfDays); + } else { + generateDevIdCertificateEnabled = false; + successMessage = "DevID Certificate generation is disabled, " + + "can not set time expiration"; + } + + policy.setDevIdExpirationFlag(generateDevIdCertificateEnabled); + savePolicyAndApplySuccessMessage(ppModel, model, messages, successMessage, policy); + } catch (PolicyManagerException e) { + handlePolicyManagerUpdateError(model, messages, e, + "Error changing ACA DevID Certificate generation policy", + "Error updating policy. \n" + e.getMessage()); + } + + // return the redirect + return redirectToSelf(new NoPageParams(), model, attr); + } + /** * Updates the state of the policy setting that indicates that the generation * will occur in a set time frame from the end validity date and redirects @@ -386,6 +500,75 @@ public class PolicyPageController extends PageController { return redirectToSelf(new NoPageParams(), model, attr); } + /** + * Updates the state of the policy setting that indicates that the generation + * will occur in a set time frame from the end validity date and redirects + * back to the original page. + * + * @param ppModel The data posted by the form mapped into an object. + * @param attr RedirectAttributes used to forward data back to the original page. + * @return View containing the url and parameters + * @throws URISyntaxException if malformed URI + */ + @RequestMapping(value = "update-devid-threshold", method = RequestMethod.POST) + public RedirectView updateDevIdThresholdVal(@ModelAttribute final PolicyPageModel ppModel, + final RedirectAttributes attr) + throws URISyntaxException { + // set the data received to be populated back into the form + Map model = new HashMap<>(); + PageMessages messages = new PageMessages(); + String successMessage; + String threshold; + + boolean generateDevIdCertificateEnabled = false; + // because this is just one option, there is not 'unchecked' value, so it is either + // 'checked' or null + if (ppModel.getDevIdExpirationChecked() != null) { + generateDevIdCertificateEnabled + = ppModel.getDevIdExpirationChecked() + .equalsIgnoreCase(ENABLED_CHECKED_PARAMETER_VALUE); + } + + try { + SupplyChainPolicy policy = getDefaultPolicyAndSetInModel(ppModel, model); + boolean issuedDevIdOptionEnabled + = policy.isIssueDevIdCertificate(); + + if (issuedDevIdOptionEnabled) { + if (generateDevIdCertificateEnabled) { + successMessage = "DevID Certificate generation threshold time enabled."; + } else { + successMessage = "DevID Certificate generation threshold time disabled."; + } + + if (generateDevIdCertificateEnabled) { + threshold = ppModel.getDevIdThresholdValue(); + if (threshold == null) { + threshold = SupplyChainPolicy.YEAR; + } + } else { + threshold = ppModel.getDevIdReissueThreshold(); + } + + policy.setDevIdReissueThreshold(threshold); + } else { + generateDevIdCertificateEnabled = false; + successMessage = "DevID Certificate generation is disabled, " + + "can not set time expiration"; + } + + policy.setDevIdExpirationFlag(generateDevIdCertificateEnabled); + savePolicyAndApplySuccessMessage(ppModel, model, messages, successMessage, policy); + } catch (PolicyManagerException e) { + handlePolicyManagerUpdateError(model, messages, e, + "Error changing ACA DevID Certificate generation policy", + "Error updating policy. \n" + e.getMessage()); + } + + // return the redirect + return redirectToSelf(new NoPageParams(), model, attr); + } + /** * Updates the Endorsement Credential Validation policy setting and * redirects back to the original page. diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp index 2997069c..5fdd2f58 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp @@ -55,10 +55,10 @@

- Issued Attestation Certificates + Issued Certificates

-

View Attestation Certificates issued by this CA

+

View Certificates issued by this CA

Validation Reports

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 ac5ac248..04c7ad79 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 @@ -12,7 +12,7 @@ - Issued Attestation Certificates + Issued Certificates
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp index 6ac33793..f1fea610 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp @@ -116,6 +116,7 @@

+ <%-- Generate Attestation Certificate--%>
@@ -129,8 +130,8 @@
-
    - +
      +
    • Attestation Certificate Validity period: ${initialData.generateOnExpiration ? 'Enabled' : 'Disabled'}
      @@ -142,8 +143,8 @@
      • -       - + +
    • Attestation Certificate Renewal period: ${initialData.generateOnExpiration ? 'Enabled' : 'Disabled'}
      @@ -155,9 +156,54 @@
      • +       +
    + + +
    + + <%-- Generate DevID Certificate--%> +
    + +
  • Generate DevID Certificate: ${initialData.issueDevIdCertificate ? 'Enabled' : 'Disabled'} + +
    + +
    +
    + +
    +     -
- +
    + +
  • DevID Certificate Validity period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'} + +
    + +
    +     +
    • +     + +
  • DevID Certificate Renewal period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'} + +
    + +
    +     +
    • +     +
+ diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/SupplyChainPolicy.java b/HIRS_Utils/src/main/java/hirs/data/persist/SupplyChainPolicy.java index a51896e6..a8b78bc2 100644 --- a/HIRS_Utils/src/main/java/hirs/data/persist/SupplyChainPolicy.java +++ b/HIRS_Utils/src/main/java/hirs/data/persist/SupplyChainPolicy.java @@ -48,15 +48,27 @@ public class SupplyChainPolicy extends Policy { @Column(nullable = false) private boolean issueAttestationCertificate = true; + @Column(nullable = false) + private boolean issueDevIdCertificate = true; + @Column(nullable = false) private String validityDays = TEN_YEARS; + @Column(nullable = false) + private String devIdValidityDays = TEN_YEARS; + @Column(nullable = false) private String reissueThreshold = YEAR; + @Column(nullable = false) + private String devIdReissueThreshold = YEAR; + @Column(nullable = false) private boolean generateOnExpiration = false; + @Column(nullable = false) + private boolean devIdExpirationFlag = false; + @Embedded private PCRPolicy pcrPolicy = new PCRPolicy(); @@ -238,8 +250,7 @@ public class SupplyChainPolicy extends Policy { * valid if their supply chain is otherwise verified. * * @param enableExpiredCertificateValidation whether or not to allow expired credentials and - * certificates to be considered - * valid + * certificates to be considered valid */ public void setExpiredCertificateValidationEnabled( final boolean enableExpiredCertificateValidation) { @@ -300,6 +311,22 @@ public class SupplyChainPolicy extends Policy { this.issueAttestationCertificate = issueAttestationCertificate; } + /** + * Returns whether or not to generate an DevID Issued Certificate. + * @return current state for generation. + */ + public boolean isIssueDevIdCertificate() { + return issueDevIdCertificate; + } + + /** + * Sets whether or not to generate an DevID Issued Certificate. + * @param issueDevIdCertificate the flag for generation. + */ + public void setIssueDevIdCertificate(final boolean issueDevIdCertificate) { + this.issueDevIdCertificate = issueDevIdCertificate; + } + /** * Getter for the number of days for the certificates validity. * @return number of days @@ -316,6 +343,22 @@ public class SupplyChainPolicy extends Policy { this.validityDays = validityDays; } + /** + * Getter for the number of days for the certificates validity. + * @return number of days + */ + public String getDevIdValidityDays() { + return devIdValidityDays; + } + + /** + * Setter for the number of days for validity. + * @param devIdValidityDays validity. + */ + public void setDevIdValidityDays(final String devIdValidityDays) { + this.devIdValidityDays = devIdValidityDays; + } + /** * Getter for the number of days before the expiration to reissue * a certificate. @@ -334,6 +377,24 @@ public class SupplyChainPolicy extends Policy { this.reissueThreshold = reissueThreshold; } + /** + * Getter for the number of days before the expiration to reissue + * a certificate. + * @return number of days + */ + public String getDevIdReissueThreshold() { + return devIdReissueThreshold; + } + + /** + * Setter for the number of days before the expiration to reissue + * a certificate. + * @param devIdReissueThreshold validity. + */ + public void setDevIdReissueThreshold(final String devIdReissueThreshold) { + this.devIdReissueThreshold = devIdReissueThreshold; + } + /** * Getter for the state of when to generate a certificate. * @return true or false @@ -349,4 +410,20 @@ public class SupplyChainPolicy extends Policy { public void setGenerateOnExpiration(final boolean generateOnExpiration) { this.generateOnExpiration = generateOnExpiration; } + + /** + * Getter for the state of when to generate a certificate. + * @return true or false + */ + public boolean isDevIdExpirationFlag() { + return devIdExpirationFlag; + } + + /** + * Setter for the state of when to generate a certificate. + * @param devIdExpirationFlag sets true or false + */ + public void setDevIdExpirationFlag(final boolean devIdExpirationFlag) { + this.devIdExpirationFlag = devIdExpirationFlag; + } } From e51f01d52e28a5b08d58bdcd8a1f3e7dc3c80c57 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Mon, 4 Oct 2021 10:37:02 -0400 Subject: [PATCH 2/2] Changed DevID to LDevID on the policy page and removed the Attestation reference for LDevID --- .../src/main/webapp/WEB-INF/jsp/policy.jsp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp index f1fea610..da03cdab 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/policy.jsp @@ -162,10 +162,10 @@
- <%-- Generate DevID Certificate--%> + <%-- Generate LDevID Certificate--%>
-
  • Generate DevID Certificate: ${initialData.issueDevIdCertificate ? 'Enabled' : 'Disabled'} +
  • Generate LDevID Certificate: ${initialData.issueDevIdCertificate ? 'Enabled' : 'Disabled'}
    @@ -177,12 +177,12 @@
      -
    • DevID Certificate Validity period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'} +
    • LDevID Certificate Validity period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'}
      @@ -190,12 +190,12 @@
      • -
    • DevID Certificate Renewal period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'} +
    • LDevID Certificate Renewal period: ${initialData.devIdExpirationFlag ? 'Enabled' : 'Disabled'}