ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-19 04:58:00 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,638 Commits 259 Branches 0 Tags 287 MiB
d908fda065
Commit Graph

371 Commits

Author SHA1 Message Date
Cyrus
17bd7d9021 New branch because there seemed to be issues with the previous branch 
merges.
 2024-02-02 08:07:08 -05:00
iadgovuser58
2db795de44 Merging latest changes into branch prior to PR 
Merge branch 'main' into v3_issue_693-unittest
 2024-02-01 14:42:47 -05:00
iadgovuser58
0fd8620098 trying to fix spotbug issues 2024-02-01 14:40:25 -05:00
iadgovuser58
257b242c87 trying to fix spotbug issues 2024-02-01 14:33:57 -05:00
iadgovuser58
41193793b5 trying to fix spotbug issues 2024-02-01 14:32:16 -05:00
Cyrus
566248b244
Merge pull request #688 from nsacyber/v3_issue-684 
[#684] Green Check mark fix
 2024-02-01 10:20:31 -05:00
iadgovuser58
8a440d0d39 getting latest updates from main 
Merge branch 'main' into v3_issue_693-unittest
 2024-02-01 09:53:50 -05:00
iadgovuser58
0aab69871f try adding more require non nulls 2024-02-01 09:47:26 -05:00
Cyrus
7c1f43c19b Updated the reference to the getObject for a Tagged Object. this is 
current causing the build to fail in reference to #693 Unit test
 2024-02-01 06:47:46 -05:00
Cyrus
06dc119702 ASN1UTF8String change to DERUTF8String so that the vendor string aren't 
throwing exceptions because ANS1UTF8String.getInstance does not take
Strings
 2024-02-01 06:31:02 -05:00
Cyrus
66130bacea
Merge pull request #683 from nsacyber/v3_bouncycastle-version-update 
Bouncy Castle version update
 2024-02-01 06:23:51 -05:00
iadgovuser58
085fd6e1c8 fixed bugfinder issues 2024-01-31 10:22:22 -05:00
iadgovuser58
b5a790caf6 added springframework to gradle 2024-01-29 10:54:49 -05:00
iadgovuser58
8e2d8a0463 added resources 2024-01-29 10:53:47 -05:00
iadgovuser58
77f5d13c1b added new test 2024-01-29 10:52:47 -05:00
iadgovuser58
ca83d8556b added resources 2024-01-25 09:51:06 -05:00
iadgovuser58
620982ee72 added 2 new unit tests 2024-01-25 09:48:14 -05:00
Cyrus
5c20b6b9c3 Updated the code to properly check for database values that are archived 
vs not archived
 2024-01-24 16:02:46 -05:00
Cyrus
1d0a71a1a2 While expecting a StackOverFlow error from uploading an EK certificate, 
this is not occurring.  A unit test had to be updated because the
previous BouncyCastle X500Compare.equals() method returned false for 2
empty string compares.  Now it returns true.
 2024-01-24 09:48:44 -05:00
Cyrus
ab4c608d8d Initial Commit. This sets up the update bouncy castle for testing. 2024-01-24 09:09:12 -05:00
Cyrus
d6af9fdad0 Code checked in from the last spotbugs PR push caused issues with the 
DeviceTest unit test.  The issue revolved around the equals and hashCode
mehtods that were initially be done by lombok.  Auto generated by an IDE
also failed (using Objects).  The issue came up because the methods all
called super.equals().  I took this out and all issues were resolved.
Lastly the null timestamp unit test was changed because the value will
never be null.
 2024-01-23 10:43:09 -05:00
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