Commit Graph

1216 Commits

Author SHA1 Message Date
Cyrus
8dee0a94ea Update code to pull from 2 different locations 2024-01-18 08:09:13 -05:00
Cyrus
3134a165fa Changes were missing from the unit test file, updated and should pass
now
2024-01-17 14:36:05 -05:00
Cyrus
3d6504743f Update the Version parsing to read the file from a configuration
location rather than the code bases resource location.
2024-01-17 14:18:26 -05:00
iadgovuser26
493d2bd2a4
Added scripts for acceptance testing ()
* Added scripts for acceptance testing

* Updated enthernet check

* Set Policy for Acceptance Tests

* Updated links for hat scripts
2024-01-17 12:54:26 -05:00
iadgovuser26
c5467d8a6c
Merge pull request from nsacyber/v3_issue_668-version
[] Added VERSION file to /opt/hirs
2024-01-17 12:11:08 -05:00
5B96790E3664F40075A67E6ADF737EDB15B4408DBC91A81228B31537B0CE3E26
355cec9e9a
Updated compose files for the acceptance test for Windows and Linux ()
* Linux will require different network driver for the acceptance test
container.

* default compose network does not work the same on Windows
2024-01-17 11:16:31 -05:00
iadgovuser26
3f7cac13c7 added VERSION file to /opt/hirs 2024-01-16 18:28:40 -05:00
chubtub
e4c9150b07
Merge pull request from nsacyber/v3_issue-646
[] Fix broken rimtool validation
2024-01-11 10:52:42 -05:00
Cyrus
9b9da1b708
Merge pull request from nsacyber/v3_issue_655-integrationtest
[] Added the final 3 Page Controller integration tests
2023-12-22 07:21:47 -05:00
Cyrus
e2247735f0
Merge pull request from nsacyber/issue-642-spotbugs
[] Initial Spotbugs Setup
2023-12-22 07:21:29 -05:00
chubtub
ab01bb8647 Add KeyName to all signed base RIMs, and modify all unit test files to reflect this change. 2023-12-21 20:21:38 -05:00
iadgovuser58
c1bb2da847 cleaning up comments 2023-12-21 18:03:54 -05:00
Cyrus
07b8bea085
Merge pull request from nsacyber/v3_minor-unittest-updates
Creation Date fix
2023-12-21 10:49:32 -05:00
Cyrus
0432646445 The initial issue found in the tcg event log code is present in the
rest, updating all exclude files to ignore this specific bug for the
time being
2023-12-20 15:53:32 -05:00
Cyrus
b52128a0b1 These are fixes for issues found via unit test that are in PR . But
that PR is currently still WIP and these changes have nothing to do with
why that PR is WIP.  Therefore PR just covers these changes to the
creation time not being saved/reset.
2023-12-20 15:15:27 -05:00
Cyrus
3fa2512427 The current issue that spot bugs is finding is an error upon itself. it
isn't resolved in this current version of the gradle plugin spotbugs.
2023-12-20 14:11:12 -05:00
Cyrus
ae1c1f82f3 Missed a change 2023-12-20 14:03:56 -05:00
Cyrus
7d1d92417f Updates to spot bugs found 2023-12-20 13:52:05 -05:00
Cyrus
7ccfa28f59 Missed adding new file for HIRS_Utils 2023-12-20 13:16:04 -05:00
Cyrus
c0cee9d597 Fixed a typo and included files I didn't on the initial push 2023-12-20 13:10:58 -05:00
Cyrus
4a9c579822 This is the first step for adding spotbugs (formerly findbugs) back into
the build.  The configuration is in place but the majority of the
projects are being excluded.  The eventlog (a small sample size) is
however being run with the proper corrections commited.
2023-12-20 12:55:50 -05:00
chubtub
6c5a17a2f7 In ReferenceManifestValidator, set the truststore for swidtag XML files, and check if it has already been set for signature validation; removed a duplicate digest command for calculating file hashes. 2023-12-20 11:04:46 -05:00
Cyrus
a30b81a68e
Merge pull request from nsacyber/v3_issue_615-unittest
HIRS_Utils Unit Tests Migration from /hirs/persist/ and /hirs/appraiser/ directories
2023-12-18 11:42:56 -05:00
iadgovuser58
6c180f6825 added NullPointerException capability to Appraiser name 2023-12-15 12:32:56 -05:00
iadgovuser58
1f00a8833e switched expected/actuals 2023-12-15 11:17:54 -05:00
iadgovuser58
560ee83eba switched expected/actual 2023-12-15 10:53:40 -05:00
iadgovuser58
0222ba2cf8 changed name of TPM2ProvisionerStateTest 2023-12-15 10:50:18 -05:00
iadgovuser58
7e749c49ab added back in 2 tests that were left out: testAppraiserNullName and testSetNameNull; will need main code fix to get tests to work 2023-12-15 09:51:16 -05:00
iadgovuser58
a51dd5f7df switched expected/actual; some of the functions were only testing junit equals instead of the lombok/external function equals so changed those back 2023-12-15 09:31:48 -05:00
iadgovuser62
2e8569d0c3 Adding AppraiserTest and TestAppraiser 2023-12-06 10:58:55 -05:00
iadgovuser62
6b12e3d894 Adding TestTPM2ProvisionerState 2023-12-06 10:52:22 -05:00
iadgovuser62
f78c84a19a Fixing deprecated method in CertificateTest 2023-12-06 10:43:55 -05:00
5B96790E3664F40075A67E6ADF737EDB15B4408DBC91A81228B31537B0CE3E26
2ab1e548ce
V3 json file platform ()
* 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 ()
* 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
[] Updated Page Controller series integration tests and added new ones ()
* 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 from nsacyber/v3_issue-627
[] Migrate rimtool to Jakarta
2023-12-05 12:41:12 -05:00
Cyrus
fa95eb4974
Merge pull request 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 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 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 ()
* Adding HexUtilsTest

* Adding StringValidatorTest

* Adding VersionHelperTest and necessary resource

* Adding BouncyCastleUtilsTest
2023-11-16 12:51:30 -05:00
Cyrus
3a8b564da1
Merge pull request 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