Commit Graph

1184 Commits

Author SHA1 Message Date
5B96790E3664F40075A67E6ADF737EDB15B4408DBC91A81228B31537B0CE3E26
2ab1e548ce
V3 json file platform (#631)
* Look for Component Class json on Windows. Update aca-windows

* Removed TPM from the ACA on Rocky image, changed container detection

* Change healthcheck function on windows.

* Remove commented code lines from aca_bootRun.ps1

* Added SWTPM to v3 ACA images. 

* Add build arg to the aca-windows Dockerfile to select base image tag

* Make ACA accessible from localhost
2023-12-06 10:20:56 -05:00
iadgovuser62
748d7a317f
HIRS_Utils Unit Tests Migration from /hirs/data/persist directory (#632)
* Adding TPMInfoTest with necessary resources, and adding EndorsementCredentialTest with approved fix to EndorsementCredential

* Adding CertificateAuthorityCredentialTest and adding mockito import to build.gradle
2023-12-05 15:09:01 -05:00
D2B8CA1B27286366A8607B6858C0565962613D18D0546480078B520CD7AD705A
b52eb770f5
[#634] Updated Page Controller series integration tests and added new ones (#647)
* updated PageTestConfiguration

* updated PageControllerTest

* updated DevicePageControllerTest

* added 3 new tests

* added test resources
2023-12-05 15:04:06 -05:00
chubtub
c2a150e6b9
Merge pull request #629 from nsacyber/v3_issue-627
[#627] Migrate rimtool to Jakarta
2023-12-05 12:41:12 -05:00
Cyrus
fa95eb4974
Merge pull request #635 from nsacyber/v3_provision-fixes
ACA Provisioning Clean up
2023-11-30 18:46:43 -05:00
chubtub
d325c04764 Migrate javax.xml.bind to jakarta. Delete hirs.swid.xjc package and update SwidTagConstants class to reference hirs.utils.xjc. 2023-11-30 15:08:25 -05:00
Cyrus
e1f846d3ae Upon a quick test, the truststorefile was throwing errors because it is
not just empty but null.  Added null check first.
2023-11-29 14:12:36 -05:00
Cyrus
6d4dad2fee Updated the code so that the icon for firmware validation links to a RIM 2023-11-29 13:35:42 -05:00
Cyrus
8ae0745ac5 Fixed issues that caused the ACA to not complete a provision.
FWvalidator was using an object used by the tool and not the portal.
Updated a few repository calls
2023-11-28 15:39:33 -05:00
Cyrus
995d69cc8f Fixed delete mix up 2023-11-28 08:01:30 -05:00
Cyrus
0a215d7973 Minor changes the main one is adding deviceName so that it is associated
with the platform certificate.  Added code for the componentInfo using
asText which isn't pulling the field value, to textValue
2023-11-27 16:10:51 -05:00
Cyrus
96bd8b97a2
Merge pull request #633 from nsacyber/v3_db-uuid-adjustment
DB Returning non-null but blank Objects
2023-11-22 07:30:08 -05:00
Cyrus
0422ad96b3 The query to search for a subject that matches the issuer was incorrect,
instead it was looking for the issuer, using the issuer.  This fixes
that problem and now the CA certificates link properly and draw a green
check mark
2023-11-21 10:21:32 -05:00
Cyrus
cf6b3a556e The useage of getReferenceById returns an object regardless if the uuid
is valid.  This causes an issue when a false uuid is used and then
produces a EntityNotFoundException when trying to access an attribute of
the object returned.  These changes address either not using that
specific call and changing to one that will return null if the uuid is
invalid.  But also using the exists function of the repository to verify
an invalid uuid.
2023-11-17 11:53:31 -05:00
Cyrus
6191c5b086
Merge pull request #630 from nsacyber/v3_server-ui-fixes
V3 server UI fixes
2023-11-17 11:41:19 -05:00
iadgovuser62
59a4ff0f1a
HIRS_Utils Unit Tests Migration from /hirs/utils/ directory (#621)
* Adding HexUtilsTest

* Adding StringValidatorTest

* Adding VersionHelperTest and necessary resource

* Adding BouncyCastleUtilsTest
2023-11-16 12:51:30 -05:00
Cyrus
3a8b564da1
Merge pull request #619 from nsacyber/v3_page-controller-parse-fix
Uploading Platform Credential IllegalStateException Fix
2023-11-14 10:15:39 -05:00
Cyrus
861508c0ef Added finally touches to not display archived items. As well display
the correct count that doesn't include the archived items.  Also added
additional exception checks after testing uploading the wrong element to
the wrong /list page
2023-11-14 08:54:08 -05:00
Cyrus
cfb30d9a4b Updated code after recognizing an issue with archiving items. This
doesn't include updating the values displayed at the bottom of the list
page.
2023-11-13 16:56:16 -05:00
5B96790E3664F40075A67E6ADF737EDB15B4408DBC91A81228B31537B0CE3E26
1e3c7c78b0
Dockerfiles for v3 ACA. Also Powershell Package Scripts (#628)
* Package scripts for powershell

* Adding dockerfiles
2023-11-09 11:54:51 -05:00
chubtub
6aba9b9c5d
Merge pull request #624 from nsacyber/v3_issue-607
[#607] Rimtool uses ReferenceManifestValidator for validation
2023-11-08 15:13:44 -05:00
Cyrus
f01b5a2060 This push has changes to resolve archivable items not updating the
archiveTime element.
2023-11-08 13:10:40 -05:00
Cyrus
548d6bb1eb There was an issue with finding the support RIM with the base RIM
information.  Changed how it finds the support RIM to using the hash for
the swid resource.
2023-11-07 10:05:35 -05:00
Cyrus
433087961c Tested uploading a rimel that had multiple matching manufacturer and
model.  The repo to check for this wasn't returning a single unique result
and causes and error
2023-11-06 15:36:34 -05:00
chubtub
0236a6b9c6 Add methods to ReferenceManifestValidator to facilitate swidtag XML validation. Modify rimtool classes to reference ReferenceManifestValidator. Modify build.gradle to build a fat jar. 2023-11-03 13:27:12 -04:00
chubtub
1a26802ee0 Modify ReferenceManifestValidator to incorporate necessary methods from SwidtagValidator 2023-11-03 13:22:41 -04:00
chubtub
90add23025
Merge pull request #622 from nsacyber/revert_v3_issue-596
Revert v3 issue 596
2023-11-01 13:56:58 -04:00
chubtub
071981dcb0 Repeat changes to ReferenceManifestValidator from reverted commit 2023-11-01 11:54:29 -04:00
chubtub
55936806d7 Revert "Merge pull request #606 from nsacyber/v3_issue-596"
This reverts commit 071e89a44f, reversing
changes made to 45d550729f.
2023-11-01 10:03:34 -04:00
Cyrus
316f3ec99e
Merge pull request #620 from nsacyber/v3_rim-validator-update
Update to the RIM Validator
2023-11-01 06:48:48 -04:00
Cyrus
ab11c8e81a
Merge pull request #614 from nsacyber/v3_issue_612-integrationtest
[#612] Migrate integration test for DevicePageController and associated classes
2023-10-31 16:07:43 -04:00
Cyrus
14c34b759b
Merge pull request #611 from nsacyber/v3_issue_610-unittest
[#610] HIRS_Utils Unit Tests Migration
2023-10-31 14:29:11 -04:00
Cyrus
1867e00301 Updated the Rim Validator to remove direct object parameters from the
database and pass in the information the methods needed to function
2023-10-31 10:48:37 -04:00
Cyrus
52bcbc6707 I tested manually uploading a series of certificates to test the list
pages functionality when it comes to sorting and other visual aspects of
the data table.  I encountered a certificate that
caused the ACA to throw a 500 error.  This was due to an
IllegalStateException while parsing a certificate that contained an
'unexpected object'.  Since this is a bouncy castle error, it is hard to
parse out what the object actually is that is causing the error to be
thrown.  For now, the parsing method in the certificate page controller
is being updated to catch the exception, at least, so that the ACA
doesn't crash. The platform in question is a Dell Power Edge R640 base
SCV.
2023-10-31 08:19:46 -04:00
chubtub
071e89a44f
Merge pull request #606 from nsacyber/v3_issue-596
[#596] Migrate RIM classes to HIRS_Utils
2023-10-24 22:58:18 -04:00
chubtub
55f80fe0e6 Migrate CertificateTest class to HIRS_Utils and update unit test dependencies following migration 2023-10-20 08:39:28 -04:00
iadgovuser58
e2507d5641 Merge remote-tracking branch 'origin/main' into v3_issue_612-integrationtest 2023-10-19 13:50:31 -04:00
iadgovuser58
5a42ec379e cleaned up code, added comments 2023-10-19 13:46:15 -04:00
iadgovuser26
45d550729f
Merge pull request #609 from iadgovuser26/v3_Issue_608-package_action
Creates a build/package action for V3
2023-10-18 10:52:40 -04:00
chubtub
f96fa87138 Update import statements for dependents of RIM classes. Move PcIds class to HIRS_AttestationCA package. 2023-10-18 09:45:19 -04:00
iadgovuser26
51ae60e639 Added a war file artifact 2023-10-18 08:40:52 -04:00
iadgovuser58
a0662f75e6 added dummy beans to PageTestConfiguration to override beans not needed in PersistenceJPAConfig 2023-10-17 16:57:43 -04:00
chubtub
98a56a3f41 Merge branch 'main' into v3_issue-596 2023-10-17 16:50:40 -04:00
iadgovuser62
e8814af9f7 Adding TPMSecurityAssertionsTest 2023-10-17 12:10:51 -04:00
iadgovuser62
e5f655a069 Adding ComponentClassTest with necessary resources 2023-10-17 12:06:33 -04:00
iadgovuser26
561280a263 removed debug statments 2023-10-16 15:24:45 -04:00
iadgovuser26
329f5afb91 updated another upload-artifact version 2023-10-16 14:23:27 -04:00
iadgovuser26
279b3f6f41 updated upload-artifact version 2023-10-16 14:11:35 -04:00
iadgovuser26
7313d98c52 combined jobs 2023-10-16 14:04:10 -04:00
iadgovuser26
0c851c593f updated referenced actions 2023-10-16 13:56:27 -04:00