diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/tpm/TPM2ProvisionerState.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/tpm/TPM2ProvisionerState.java index 18b50f08..fc44115d 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/tpm/TPM2ProvisionerState.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/tpm/TPM2ProvisionerState.java @@ -20,7 +20,7 @@ import java.util.Date; @NoArgsConstructor @Entity public class TPM2ProvisionerState { - private static final int MAX_BLOB_SIZE = 65535; + private static final int MAX_BLOB_SIZE = 16777215; @Id private Long firstPartOfNonce; @@ -88,7 +88,7 @@ public class TPM2ProvisionerState { /** * Convenience method for finding the {@link TPM2ProvisionerState} associated with the nonce. * - * @param TPM2ProvisionerStateRepository the {@link TPM2ProvisionerStateRepository} to use when looking for the + * @param tpm2ProvisionerStateRepository the {@link TPM2ProvisionerStateRepository} to use when looking for the * {@link TPM2ProvisionerState} * @param nonce the nonce to use as the key for the {@link TPM2ProvisionerState} * @return the {@link TPM2ProvisionerState} associated with the nonce; diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java index d969114c..05e1ad77 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java @@ -464,8 +464,8 @@ public class IdentityClaimProcessor extends AbstractProcessor { if (baseRim != null) { // pull the base versions of the swidtag and rimel and set the // event log hash for use during provision - SupportReferenceManifest sBaseRim = (SupportReferenceManifest) referenceManifestRepository - .findByBase64Hash(baseRim.getBase64Hash()); + SupportReferenceManifest sBaseRim = referenceManifestRepository + .getSupportRimEntityById(baseRim.getAssociatedRim()); baseRim.setEventLogHash(temp.getHexDecHash()); sBaseRim.setEventLogHash(temp.getHexDecHash()); referenceManifestRepository.save(baseRim); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java index 8168d623..1bbac7ff 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java @@ -52,7 +52,7 @@ import java.util.Properties; @PropertySource(value = "classpath:hibernate.properties"), // detects if file exists, if not, ignore errors - @PropertySource(value = "file:/etc/hirs/aca/application.properties", + @PropertySource(value = "file:/etc/hirs/aca/aca.properties", ignoreResourceNotFound = true) }) @ComponentScan({"hirs.attestationca.portal", "hirs.attestationca.portal.page.controllers", "hirs.attestationca.persist", "hirs.attestationca.persist.entity", "hirs.attestationca.persist.service"}) diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java index 7a58df69..7e71de79 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java @@ -228,6 +228,7 @@ public class CertificatePageController extends PageController { }; int currentPage = input.getStart() / input.getLength(); + int itemCount = 0; Pageable paging = PageRequest.of(currentPage, input.getLength(), Sort.by(orderColumnName)); // special parsing for platform credential @@ -242,9 +243,10 @@ public class CertificatePageController extends PageController { org.springframework.data.domain.Page pagedResult = this.platformCertificateRepository.findAll(paging); if (pagedResult.hasContent()) { records.addAll(pagedResult.getContent()); + itemCount = records.size(); } - records.setRecordsTotal(input.getLength()); - records.setRecordsFiltered(platformCertificateRepository.count()); + records.setRecordsTotal(platformCertificateRepository.count()); + records.setRecordsFiltered(itemCount); EndorsementCredential associatedEC; if (!records.isEmpty()) { @@ -274,10 +276,11 @@ public class CertificatePageController extends PageController { org.springframework.data.domain.Page pagedResult = this.endorsementCredentialRepository.findAll(paging); if (pagedResult.hasContent()) { records.addAll(pagedResult.getContent()); + itemCount = records.size(); } - records.setRecordsTotal(input.getLength()); - records.setRecordsFiltered(endorsementCredentialRepository.count()); + records.setRecordsTotal(endorsementCredentialRepository.count()); + records.setRecordsFiltered(itemCount); log.debug("Returning list of size: " + records.size()); return new DataTableResponse<>(records, input); @@ -290,9 +293,10 @@ public class CertificatePageController extends PageController { if (pagedResult.hasContent()) { records.addAll(pagedResult.getContent()); + itemCount = records.size(); } - records.setRecordsTotal(input.getLength()); - records.setRecordsFiltered(caCredentialRepository.count()); + records.setRecordsTotal(caCredentialRepository.count()); + records.setRecordsFiltered(itemCount); log.debug("Returning list of size: " + records.size()); return new DataTableResponse<>(records, input); @@ -301,9 +305,10 @@ public class CertificatePageController extends PageController { org.springframework.data.domain.Page pagedResult = this.issuedCertificateRepository.findAll(paging); if (pagedResult.hasContent()) { records.addAll(pagedResult.getContent()); + itemCount = records.size(); } - records.setRecordsTotal(input.getLength()); - records.setRecordsFiltered(issuedCertificateRepository.count()); + records.setRecordsTotal(issuedCertificateRepository.count()); + records.setRecordsFiltered(itemCount); log.debug("Returning list of size: " + records.size()); return new DataTableResponse<>(records, input); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java index 693e85a2..9153f21f 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/DevicePageController.java @@ -96,8 +96,8 @@ public class DevicePageController extends PageController { if (pagedResult.hasContent()) { deviceList.addAll(pagedResult.getContent()); } - deviceList.setRecordsTotal(input.getLength()); - deviceList.setRecordsFiltered(deviceRepository.count()); + deviceList.setRecordsTotal(deviceRepository.count()); + deviceList.setRecordsFiltered(deviceList.size()); FilteredRecordsList> records = retrieveDevicesAndAssociatedCertificates(deviceList); 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 6a83348f..49690f99 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 @@ -119,6 +119,7 @@ public class ReferenceManifestPageController extends PageController records = new FilteredRecordsList<>(); + int itemCount = 0; int currentPage = input.getStart() / input.getLength(); Pageable paging = PageRequest.of(currentPage, input.getLength(), Sort.by(orderColumnName)); org.springframework.data.domain.Page pagedResult = referenceManifestRepository.findAll(paging); @@ -127,11 +128,12 @@ public class ReferenceManifestPageController extends PageController(records, input); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RestfulAttestationCertificateAuthority.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RestfulAttestationCertificateAuthority.java deleted file mode 100644 index 74213318..00000000 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RestfulAttestationCertificateAuthority.java +++ /dev/null @@ -1,35 +0,0 @@ -package hirs.attestationca.portal.page.controllers; - -/** - * Restful implementation of the {@link }. - * Exposes the ACA methods as REST endpoints. - */ -//@RestController -//@RequestMapping("/") -public class RestfulAttestationCertificateAuthority { -// private final ReferenceManifestRepository referenceManifestRepository; -// private final ReferenceDigestValueRepository referenceDigestValueRepository; -// -// @Autowired -// public RestfulAttestationCertificateAuthority( -// final ReferenceManifestRepository referenceManifestRepository, -// final ReferenceDigestValueRepository referenceDigestValueRepository) { -// -// this.referenceManifestRepository = referenceManifestRepository; -// this.referenceDigestValueRepository = referenceDigestValueRepository; -// -// } -// -// -// @ResponseBody -// @RequestMapping(value = "/upload-swidtag", method = RequestMethod.POST, consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE) -// public byte[] uploadSwidtag(@RequestBody final byte[] request) { -// return null; -// } -// -// @ResponseBody -// @RequestMapping(value = "/upload-rimel", method = RequestMethod.POST, consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE) -// public byte[] uploadRimel(@RequestBody final byte[] request) { -// return null; -// } -} diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java index 0a2e76ed..474ce59e 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java @@ -117,8 +117,8 @@ public class RimDatabasePageController extends PageController { if (pagedResult.hasContent()) { referenceDigestValues.addAll(pagedResult.getContent()); } - referenceDigestValues.setRecordsTotal(input.getLength()); - referenceDigestValues.setRecordsFiltered(referenceDigestValueRepository.count()); + referenceDigestValues.setRecordsTotal(referenceDigestValueRepository.count()); + referenceDigestValues.setRecordsFiltered(referenceDigestValues.size()); // FilteredRecordsList referenceDigestValues = // OrderedListQueryDataTableAdapter.getOrderedList(