Commit Graph

400 Commits

Author SHA1 Message Date
Cyrus
49eb2753fb
Merge pull request #670 from nsacyber/v3_bouncycastle-preq
BouncyCastle Prerequisite changes
2024-01-22 16:34:26 -05:00
iadgovuser26
2efb1a98f3
Merge pull request #658 from nsacyber/v3_issue_618-unittest
HIRS_Utils Unit Tests Migration from /hirs/data/persist directory
2024-01-22 08:22:06 -05:00
Cyrus
f3b0be9ef9
Merge pull request #657 from nsacyber/issue-642-spotbugs-p2
[#642] HIRS_AttestationCA spotbug fixes
2024-01-19 07:58:57 -05:00
Cyrus
832bac4b93 Finally found a fix for the StackOverFlow error 2024-01-16 15:30:28 -05:00
Cyrus
331e0f54f7 Resolved an illegal argument with the ASN1UTF8String object in the
componentIdentifier
2024-01-16 13:21:03 -05:00
Cyrus
577f3c7035 Added some changes to fix some issues causing a stackoverflow 2024-01-12 14:42:14 -05:00
Cyrus
f7103517d2 All changes that were deprecated for the updated 1.77 version. This is
to set up for updating the actual version.
2024-01-12 13:44:11 -05:00
Cyrus
799a9922f4 ACA was throwing up errors because of serialization for the Platform
Cert, undid code for spotbugs to resolve the issue
2024-01-12 10:18:38 -05:00
Cyrus
8aef4b5bac Missed some Getter and Setter 2024-01-12 07:32:04 -05:00
Cyrus
c6dcf36e04 Removed changes because the PC is not loading URIReference 2024-01-12 07:23:13 -05:00
iadgovuser62
18a8f42699 Fixed expected/actual order in tests, added ExaminableRecord tests to TPMMeasurementRecordTest 2024-01-11 11:35:50 -05:00
iadgovuser62
09284caa57 Undoing addition to HIRS_AttestationCA build.gradle file; Adding tests to DeviceTest 2024-01-10 14:57:56 -05:00
iadgovuser62
2b594571b5 Removing SpringPersistenceTest after concluding it is unnecessary; Modifying DeviceInfoReportTest after removal of SpringPersistenceTest. Adding TPMMeasurementRecordTest 2024-01-10 14:37:35 -05:00
Cyrus
3197f4a818 Removing null pointer on URI object 2024-01-08 14:44:55 -05:00
Cyrus
4eafb655ba Pulled back some additional changes because the initialization of
endorsement through issued was not happening due to the spotbug change
for the lombok getter.
2024-01-05 11:03:44 -05:00
Cyrus
10343398d4 These are the finally changes that produced a successful build. all
unit tests pass and no spotbugs patterns appear for HIRS_AttestationCA.
2024-01-05 09:23:52 -05:00
Cyrus
03055d29a6 Continuing to update to fix ACA issues 2024-01-04 11:48:46 -05:00
Cyrus
021e975074 Last touches 2024-01-02 15:59:29 -05:00
Cyrus
98e9fae754 Resolving the unit tests 2024-01-02 15:09:18 -05:00
Cyrus
b7ac1e06da Additional changes 2024-01-02 12:45:16 -05:00
Cyrus
0a89846f4c Updates to the Unit Test based on spotbug changes 2024-01-02 10:01:43 -05:00
Cyrus
0e9b2dbd26 Additional changes 2024-01-02 08:41:11 -05:00
Cyrus
bc71285442 Additional updates 2023-12-29 07:20:27 -05:00
iadgovuser62
412ac2bb75 Adding DeviceTest 2023-12-29 06:59:06 -05:00
iadgovuser62
91abb7b9a5 Adding DeviceInfoReportTest and necessary resource file 2023-12-29 06:57:27 -05:00
iadgovuser62
df83fb6064 Adding SpringPersistenceTest and necessary implementation in HIRS_AttestationCA build.gradle file 2023-12-29 06:53:09 -05:00
Cyrus
e75a4c2128 Additional updates to clear issues spotbugs have found. While I am
going to put in an exclude for what is left, I am attempting to
resolving some of these that make sense.
2023-12-29 06:28:34 -05:00
Cyrus
39da434f1f Continuing fixing spotbugs for AttestationCA 2023-12-26 08:37:52 -05:00
Cyrus
8c573b0bcd Added some more updates 2023-12-22 08:53:20 -05:00
Cyrus
0d25599c80 Initial set of changes for #642 that are fixes for HIRS_AttestationCA.
In addition, this and the following pushes will have changes for #651
because spot bugs doesn't like how Lombok handles hashCode and equals
2023-12-22 07:44:47 -05:00
Cyrus
e2247735f0
Merge pull request #653 from nsacyber/issue-642-spotbugs
[#642] Initial Spotbugs Setup
2023-12-22 07:21:29 -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 #652. 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
c0cee9d597 Fixed a typo and included files I didn't on the initial push 2023-12-20 13:10:58 -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 (#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
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
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
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
6191c5b086
Merge pull request #630 from nsacyber/v3_server-ui-fixes
V3 server UI fixes
2023-11-17 11:41:19 -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
Cyrus
f01b5a2060 This push has changes to resolve archivable items not updating the
archiveTime element.
2023-11-08 13:10:40 -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
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
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
chubtub
55f80fe0e6 Migrate CertificateTest class to HIRS_Utils and update unit test dependencies following migration 2023-10-20 08:39:28 -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
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
chubtub
bfa30ca186 Change references in ACA and ACAPortal to HIRS_Utils package for migrated classes. Revert change to gradle.properties file. 2023-10-16 13:50:49 -04:00
Cyrus
f64d884abf
Merge pull request #605 from nsacyber/v3_provision-integration
HIRS ACA Provisioning
2023-10-16 12:21:03 -04:00
Cyrus
ec39bf55a3 Corrected an issue with the root CA looking itself causing an issue
because the one root CA had an illegal character.
2023-10-10 13:31:45 -04:00
Cyrus
556322ad39 Some additional changes to fix UI errors after I was able to test
against another machine.
2023-10-06 15:07:12 -04:00
iadgovuser62
10c28845d7
[#593] HIRS_Utils Unit Tests (#603)
* Added test path to HIRS_AttestationCA, including PortalInfoTest. Also added testImplementation lines to the subproject's build.gradle to give those classes access to JUnit5.

* Adding PlatformCredentialTest and CertificateTest, along with necessary resources in test path of HIR_AttestationCA

* Adding SupplyChainValidationTest
2023-10-05 14:31:29 -04:00
Cyrus
65a1105ff5 Minor changes, mostly syntax and log message removals 2023-10-05 10:54:25 -04:00
Cyrus
4de125c0f8 After some code review, there are changes and removals for the
provisioning process.  IdentityRequest is an old structure for the
provisioner and it has been removed and some preliminary code file
renames.
2023-10-03 09:53:48 -04:00
Cyrus
31066694ee Updates to the location of default property files and setting the
deviceName
2023-09-29 08:18:54 -04:00
Cyrus
8be945035d Some additional updates to fix visual changes on the screen. This one
is mainly with deviceName
2023-09-28 17:11:34 -04:00
Cyrus
c046851e07 Latest changes that fixes little issues 2023-09-28 06:47:43 -04:00
iadgovuser29
b3481f1668 Use protobuf-gradle-plugin to replace a system dependency 2023-09-24 11:59:32 -04:00
Cyrus
a08c007bba Some additional updates and changes while debugging 2023-09-22 11:50:28 -04:00
Cyrus
cb5b281d03 Missed updated constructor for Device 2023-09-21 16:25:01 -04:00
Cyrus
310102bc8a Missed files 2023-09-21 16:13:31 -04:00
Cyrus
4b67747e3e Updated the bulk of the code that does all provisioning from a client.
There is some parsed functionality to ease sorting through the changes
and updates needed in the future.
2023-09-21 15:02:24 -04:00
iadgovuser26
9fea7788ed
Merge pull request #584 from nsacyber/v3_provision-init-setup
Initial Setup for ACA provisioning
2023-09-18 09:01:31 -04:00
iadgovuser29
a56fd3a8fa Context change to enable path control [no ci] 2023-09-15 15:34:15 -04:00
Cyrus
771d5588d5 Updated the code to print out the available Restful URIs. Added some
modifications to the provisioner code for testing and updated the
Restful base mapping
2023-09-14 09:14:11 -04:00
Cyrus
1b7ba564d8 Messed up merging in versus other changes 2023-09-11 16:10:34 -04:00
Cyrus
a685e987ef Forgot to add updated new java 2023-09-11 16:08:30 -04:00
Cyrus
6bc6fa1cf1 Added code to check for multi pem single files 2023-09-11 16:03:01 -04:00
Cyrus
7337c115ca Copying the json files for component class and vendor table were taken
out of the set up script.  They are now causing errors because the files
can't be found.
2023-09-08 07:59:58 -04:00
Cyrus
6629a87d56 Looking into the DN missing from the certificate details page I
recognized that the setting of the variable for the portal page was
using the wrong getter method.
2023-09-07 15:24:16 -04:00
Cyrus
6b063d44e0 Updated a couple of files to resolve aca load issues 2023-09-06 11:10:57 -04:00
5B96790E3664F40075A67E6ADF737EDB15B4408DBC91A81228B31537B0CE3E26
58b5de3bbb
Merge pull request #574 from nsacyber/v3_issue_560-db_tls
[#560] Adds TLS to the hirs DB connector
2023-09-06 06:31:29 -04:00
iadgovuser59
0e6450da7f Adding PolicyTest and associated changes 2023-09-01 12:30:09 -04:00
Cyrus
d2963ef99a Resolved an issue with createTPMInfo. Created a new static class to
contain most of the generic generation code instead of the standard
provision handler classes.
2023-08-31 15:01:05 -04:00
Cyrus
6a2c5d246b This is a series of code changes to begin setting up for provisioning.
The code has not been tested to provision. The url linkage needs to be
worked on again.
2023-08-29 15:15:34 -04:00
iadgovuser26
88aa10010b cleaned up unused file 2023-08-18 16:38:53 +00:00
Cyrus
751a8104fc Updated all page controllers that were causing an issue to display
content based on the page allocations.
2023-08-04 10:13:25 -04:00
Cyrus
391a4691c5 This push fixes the dataTable ajax error when navigating to the device
page. And it incorporates Trust Chain acaCertificate.
2023-07-28 12:49:24 -04:00
Cyrus
6e96c32a5e Please enter the message for your changes.ssociated event values to the
support rim and delete them properly and to not also upload duplicate
issues. [no ci]
2023-07-11 07:07:13 -04:00
Cyrus
34aa54100e This push resolves the parsing issue of swidtags that may not meet the
validation based on an attribute not matching the spec.
2023-06-30 09:03:19 -04:00
Cyrus
67681c0227 This push fixes the issues with parsing the file tag and getting the
hash value for the support rim and as well for getting the collapsible
file link on the details page to operate. [no ci]
2023-06-29 07:49:32 -04:00
Cyrus
27e55ab2c7 Updated the RIM details page to search for the associated support rim if
the base doesn't have it.  This is a temp measure before completing #526 [no ci]
2023-06-29 07:38:57 -04:00
Cyrus
5ff5650be1 Small addition [no ci] 2023-06-29 07:38:57 -04:00
Cyrus
57632e0923 the DN compare of bouncy castle utils throws and exception if the object
is null.  Added additional condition to the if statement to check null
status.
2023-06-29 07:38:57 -04:00
Cyrus
2d5836b8b6
Merge pull request #541 from nsacyber/v3_filestore-bean-removal
Filestore Service Removal
2023-06-23 07:05:37 -04:00
Cyrus
520c18fcdf This check in updates the code to list the certificates on their
specific page, rather than all on any of them.  Next will be introducing
the new parsing code for RIM and TLS so that Trust Chains show up [no ci]
2023-06-21 16:12:26 -04:00
Cyrus
17e01d4e72 Removed FileStorageService autowiring 2023-06-16 13:48:12 -04:00
Cyrus
6dbbee1420 Fixed display issue on PlatformCredentials page and included 'fn' tag
reference on details pages.  Removed additional files that are not being
used. [no ci]
2023-06-16 07:51:30 -04:00
Cyrus
9fe89232a8 Second commit mainly containing new files 2023-06-13 10:12:25 -04:00
Cyrus
3a72583836 First commit with modified files [no ci] 2023-06-13 09:29:29 -04:00
Cyrus
0f8f266569 Missed small updates to imports and implementation lines in the
build.gradle. [no ci]
2023-04-26 08:32:45 -04:00
Cyrus
7d9f3d72f4 Updating the branch with additional code. The ACA loads, however
trust-chain does not.  I backed out x509 Certificate changes. [no ci]
2023-04-21 10:30:51 -04:00
Cyrus
9be3f3b3be Update the build.gradle and settings.gradle files [no-ci] 2023-03-07 09:23:55 -05:00
Cyrus
17a8732908 added in finished files 2023-03-06 20:56:34 -05:00
Cyrus
72aa426018 This is a complete refactor. This uses Hibernate 6, Springboot Framework
3, Java 17, Jakarta
2023-02-14 07:30:16 -05:00
iadgovuser26
0917b9a872
Merge pull request #460 from nsacyber/issue-448
[#448] Visual Updates for Firmware Validation
2022-04-29 12:36:26 -04:00
Cyrus
0b91c1e39a Updated the link from a failed validation to the base rim when the path
for the measurement can't be found.
2022-04-04 14:21:44 -04:00
Cyrus
f6bcb0c9ed Due to some testing, in situations were the client doesn't seen certain
files, this causes null pointers
2022-03-24 15:18:34 -04:00
Cyrus
dea58b1f07 The issue was resolved with the code changes. Removing comments 2022-03-21 14:43:52 -04:00
Cyrus
308064089c Checking git hub action error 2022-03-21 14:29:48 -04:00
Cyrus
6f71f48ad2 Removed comments and updated notes for Patching values 2022-03-21 10:11:23 -04:00
Cyrus
2e26823fc1 Did some testing on manual/curl uploading. This produced an error
because device name was being used to pull objects in the validation
quote part of the provision.  This was changed.  The event log is
deleted each time so that only one event log per device is maintained.
2022-03-21 09:51:32 -04:00
Cyrus
d4c35e09ab Updated the code to correctly include the supplemental digestvalues in
the firmware validation.
2022-03-16 09:06:04 -04:00
iadgovuser26
65471c87f1
Merge pull request #447 from nsacyber/issue-442
[#442] Provisioning Status Impl
2022-03-02 08:31:32 -05:00
Cyrus
6a8c0f47c0 Removed unused variables 2022-03-02 06:22:58 -05:00
Cyrus
7738a47b99 Updated the provisioner to respond to failed status instead of blank
certificates.  Updated the proto to use enum instead of bytes
2022-02-28 14:18:48 -05:00
Cyrus
acef2ea5b8 Added the new status for the state of the provision 2022-02-18 10:16:32 -05:00
chubtub
1fced3aa61 Resolve merge conflicts 2022-02-18 09:59:45 -05:00
chubtub
bf989bbee7 Merge branch 'issue-395' of github.com:nsacyber/HIRS into issue-395 2022-02-17 16:55:59 -05:00
Cyrus
470e6eccdf Refactored the Reference Digest code so that the ReferenceDigestValue
table is accessible and upated the contoller for the getOrderedList.
2022-02-17 16:48:08 -05:00
Cyrus
10915bdc3b Prelminary changes to remove ReferenceDigestRecord as a database object. 2022-02-17 13:11:41 -05:00
Cyrus
6abd87a192 Removed debug statements 2022-02-15 13:43:33 -05:00
Cyrus
99ba840a54 Fixed debug statement 2022-02-15 11:25:25 -05:00
Cyrus
0f839ebd08 This is a test commit. Changes will be removed. 2022-02-15 11:17:07 -05:00
Cyrus
e16f009294 Removed if check for the matching file name of the support RIM from the
Base RIMs meta data.  Only keying off hash.
2022-02-15 10:03:25 -05:00
Cyrus
caa2a7c55b Removed the RIM controller tests 2022-02-14 10:26:07 -05:00
Cyrus
fc3f59adce Updated RIM lookup to use manufacturer and model instead of deviceName 2022-02-11 09:09:39 -05:00
Cyrus
1f2be7ce18 Updated the live log information if the base and support rim are not
uploaded together.
2022-02-11 08:01:28 -05:00
Cyrus
2db5b86da1 Some minor updates. Fixed a null pointer exception in the
SupplyChainValidationServiceImpl.  Updated warnings when files are
missing from the device claim
2022-02-11 07:32:07 -05:00
chubtub
ea6bb48d06 Merge branch 'master' into issue-395 2022-01-27 10:58:16 -05:00
chubtub
c4b6aca667 Merge branch 'issue-395' of github.com:nsacyber/HIRS into issue-395 2022-01-24 14:35:01 -05:00
Cyrus
f503457bd4 Refactored the Reference Digest code so that the ReferenceDigestValue
table is accessible and upated the contoller for the getOrderedList.
2022-01-21 06:29:53 -05:00
Cyrus
6d8392da45 Prelminary changes to remove ReferenceDigestRecord as a database object. 2022-01-11 10:02:38 -05:00
Cyrus
5858e36313 Updated the implementation to return a blank identity claim response.
The provisioner tests the blob and if it is empty, exit
2022-01-05 16:49:27 -05:00
Cyrus
139e4c8972 Added null pointer check to RDR variable. 2021-11-24 14:27:15 -05:00
iadgovuser29
95c5e40f89 Utilize protobuf to parse claim response. Work on array handling on ACA. 2021-11-23 22:01:16 -05:00
Cyrus
cf4e641273 Added log statement for quote. 2021-11-23 09:40:11 -05:00
Cyrus
4c46758d9a This commit is a feature update. The IMA PCR enable/diable is being enhanced to update the mask the provisioner uses to pull the quote from the TPM. This code will send down a string range of PCR values that excludes PCR 10. The quote that is returned should be a composite without the PCR 10. There will be a log statement in this commit that should be removed. 2021-11-23 09:36:00 -05:00
chubtub
d183504a3f Merge branch 'master' into issue-381 2021-11-10 10:08:42 -05:00
Cyrus
2d9fb19d38 Updated the new polices after doing a bit of testing to make sure that they do ignore when there is a failure on that specific bit. 2021-11-10 07:27:33 -05:00
chubtub
e0a1e53d93 Handle an exception thrown when the provisioner fails to send RIM files to the ACA 2021-11-08 14:51:38 -05:00
chubtub
962ca45bb7 Modify ACA RIM validation to search for a signing cert if the base RIM does not have an embedded cert. Validate the ca chain of the found signing cert. 2021-11-08 14:46:04 -05:00