Commit Graph

506 Commits

Author SHA1 Message Date
chubtub
4da6020260 Modify BaseReferenceManifest to handle namespace prefixes in the swidtag XML. Modify the rimtool and ReferenceManifestValidator to properly prefix Directory and File under Payload and handle them for validation. 2024-05-07 17:28:37 -04:00
iadgovuser58
9f097f391c changing string and other comments 2024-04-29 11:49:25 -04:00
iadgovuser58
766d1eb3e0 changed name of DeviceSecurityEventData parent and ..HEADER parent to make the naming more clear 2024-04-29 09:17:18 -04:00
iadgovuser58
de6edaee3d updated comments in ..HeaderBase to be more clear 2024-04-29 08:49:07 -04:00
iadgovuser58
9a8552d720 consolidated a line 2024-04-26 14:25:45 -04:00
iadgovuser58
1941e4dd86 fixed spotbug errors 2024-04-26 14:12:39 -04:00
iadgovuser58
2e98e31a09 Merge branch 'main' into v3_issue_747-spdm
Merging latest changes from main into the spdm branch
2024-04-26 13:56:41 -04:00
iadgovuser58
cf6019d863 fixed issue caused by change to version method 2024-04-26 12:54:56 -04:00
iadgovuser58
e3e1e1c7b1 small fix to output 2024-04-26 12:16:05 -04:00
iadgovuser58
2c3987e6bc cleaned up comments 2024-04-24 10:46:32 -04:00
iadgovuser58
8b3336e565 fixed DeviceContext to include either/or PCI USB 2024-04-24 10:07:50 -04:00
iadgovuser58
0f33fdf4cd remove tests vendorid/deviceid 2024-04-23 17:12:23 -04:00
iadgovuser58
d6a255012a temporarily add test vendorid/deviceid 2024-04-23 17:08:10 -04:00
iadgovuser58
8558546ff5 spdm processing - added Device Security Event Data Pci Context 2024-04-22 19:09:01 -04:00
iadgovuser58
a2737f59d0 spdm processing - output is complete 2024-04-22 14:35:58 -04:00
iadgovuser58
13b90c09f5 spdm processing 2024-04-19 18:38:25 -04:00
iadgovuser58
f4c52271f5 spdm processing 2024-04-19 18:36:58 -04:00
iadgovuser58
c129522768 spdm processing 2024-04-19 18:32:59 -04:00
iadgovuser58
605dbe536a spdm processing 2024-04-19 18:07:00 -04:00
iadgovuser58
53267ec381 spdm processing 2024-04-19 17:21:30 -04:00
iadgovuser58
26c102c205 spdm processing 2024-04-18 17:08:36 -04:00
iadgovuser58
1b6109c107 spdm processing 2024-04-18 12:27:44 -04:00
iadgovuser58
e8bcb0ec0d spdm initial output 2024-04-17 17:49:14 -04:00
iadgovuser58
4547998384 spdm initial output 2024-04-17 17:28:17 -04:00
iadgovuser58
49108ab144 spdm processing 2024-04-16 19:38:32 -04:00
iadgovuser58
e96da43a48 spdm processing 2024-04-15 17:56:23 -04:00
iadgovuser58
e1844dedbd SPDM processing 2024-04-10 12:02:01 -04:00
iadgovuser58
a1534a9c7b SPDM processing 2024-04-10 11:46:37 -04:00
iadgovuser58
f1d75beb3a parsing event 2024-04-09 18:02:53 -04:00
iadgovuser58
11297d26c2 additional descriptions for data structures 2024-04-09 16:41:13 -04:00
iadgovuser58
72be21705e completed descriptions for data structures 2024-04-09 16:23:59 -04:00
iadgovuser58
f5031efb42 spdm event structures 2024-04-08 12:28:03 -04:00
iadgovuser58
07c7b52a64 added files for EvEfiSpdmFirmwareBlob 2024-04-05 10:45:21 -04:00
chubtub
fab56eb0e9 Remove commented lines 2024-03-15 14:37:09 -04:00
chubtub
1947b70a1b Clean up javadocs; change System.out.println to log messages 2024-03-07 00:43:10 -05:00
chubtub
54f3e4bfca Modify swidtag validation to use the public signing cert to verify <KeyName> in a signature and the truststore 2024-03-06 12:40:54 -05:00
chubtub
5445278723
Merge pull request #715 from nsacyber/v3_issue-661_updated
[#661] Output handling should be more concise
2024-03-06 12:40:03 -05:00
Cyrus
eada242284 These changes have been moved over from updates made for issue-705. The
primary function implemented in this set of changes is to track more
specifically what failed when the components of a certificate are
compared.  The implementation required a couple of new DB classes to be
created to store this information.  This is also to set up a better
visual comparison of what was expected vs what was actually found.  This
is similar to the RIM event compare failure page.
2024-03-01 15:29:10 -05:00
chubtub
adb1da93b4 Log an error instead of throwing an exception when the truststore is omitted 2024-02-23 02:11:31 -05:00
chubtub
f6f1ab4ee7 Log an error instead of throwing an exception when a signing key cannot be located in the provided truststore 2024-02-23 02:11:29 -05:00
Cyrus
80ba01a3d0 This commit is for the 3rd listed issue on #705. The green check mark
test was causing an error from ASN1UTF8String.getInstance.  And did some
checkstyle fixes.
2024-02-06 16:34:20 -05:00
Cyrus
6dc3c691e1 Updated some more checkstyle issues and removed the line call from the
settings.gradle file
2024-02-05 13:29:24 -05:00
Cyrus
e819dad52b This commit sets up the suppression filter file. The locations previous
established have been removed.  The configuration is the root directory
2024-02-05 10:50:12 -05:00
Cyrus
ab5036982f Updated version for suppressions file 2024-02-02 08:37:44 -05:00
Cyrus
17bd7d9021 New branch because there seemed to be issues with the previous branch
merges.
2024-02-02 08:07:08 -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
29dd1254da
Merge pull request #679 from nsacyber/issue-642-spotbugs-p3
[#642] HIRS_Utils spotbugs fixes
2024-01-23 12:59:25 -05:00
Cyrus
a8756e187e Missed removing an annotation 2024-01-19 09:03:28 -05:00
Cyrus
60729164c8 Last changes that resolve remaining spotbugs issues 2024-01-19 07:45:36 -05:00
Cyrus
575baa3409 Spotsbugs HIRS_Utils initial fixes 2024-01-18 16:02:32 -05:00
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
chubtub
e4c9150b07
Merge pull request #650 from nsacyber/v3_issue-646
[#646] Fix broken rimtool validation
2024-01-11 10:52:42 -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
7ccfa28f59 Missed adding new file for HIRS_Utils 2023-12-20 13:16:04 -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
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
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
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
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
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
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
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
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
31066694ee Updates to the location of default property files and setting the
deviceName
2023-09-29 08:18:54 -04:00
Cyrus
a08c007bba Some additional updates and changes while debugging 2023-09-22 11:50:28 -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
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
iadgovuser26
c1917f03ae
Merge pull request #577 from nsacyber/v3_issue_576_pt1-unittest
[#546] (Part 1) Migrating tests in /data/persist/ folder in HIRS_Utils
2023-09-01 14:48:20 -04:00
iadgovuser59
d5af444605 Minor code cleanup 2023-09-01 12:44:04 -04:00
iadgovuser59
0e6450da7f Adding PolicyTest and associated changes 2023-09-01 12:30:09 -04:00
iadgovuser59
8386864195 Adding OSInfoTest 2023-09-01 10:50:44 -04:00
iadgovuser59
86a9d886c1 Adding NetworkInfoTest 2023-08-31 19:15:56 -04:00
iadgovuser59
894b13acf8 Adding HardwareInfoTest 2023-08-28 17:11:00 -04:00
iadgovuser59
3e0176d35a Adding FirmwareInfoTest 2023-08-28 16:50:48 -04:00
iadgovuser59
9136725994 Migrating unit test 2023-08-28 15:43:59 -04: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
D2B8CA1B27286366A8607B6858C0565962613D18D0546480078B520CD7AD705A
30c9ddbf7c
Merge branch 'main' into v3_issue_546-unittest 2023-07-21 13:36:29 -04:00
iadgovuser58
a0238abe8b minor updates to replace deprecated function, swap actual/expected in assertthat, and use lombok Getter 2023-07-19 16:21:16 -04:00
iadgovuser59
dbc11f15c4 Adding resources for unit tests 2023-07-17 16:17:24 -04:00
iadgovuser59
7a24d2c79b Adding UEFI unit tests 2023-07-17 16:15:57 -04:00
iadgovuser58
435ce61a5a minor comment updates 2023-07-13 18:16:37 -04:00
iadgovuser58
166391c4d4 minor comment changes to TCGEventLogTest 2023-07-13 17:48:34 -04:00
iadgovuser58
2db07c7c77 updated build.gradle with a few necessary libraries for tests 2023-07-13 17:47:49 -04:00
iadgovuser58
2b21ecfeb7 added one function to TCGEventLog that was from master 2023-07-13 17:47:07 -04:00
iadgovuser58
3826ef7834 added TCGEventLogTest.java and 4 resource files 2023-07-13 17:21:17 -04:00
Cyrus
c55c148da7 Not sure why but constants didn't get pushed. 2023-06-30 09:10:05 -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
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
iadgovuser26
59a2b7ea4f Updated HIRS_Utils.gradle [no ci] 2023-05-03 18:44:38 +00:00
root
6763e4a87d Merge remote-tracking branch 'origin/codebase-reset' into gradle-package 2023-04-25 18:37:28 +00: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
iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil
ef65c6ad8b updated with package for tcg_rim_tool [no ci] 2023-03-17 14:47:10 -04:00
iadgovuser26
d862e95708 Added build and package creation for tcg_eventlog_tool [no ci] 2023-03-14 16:46:31 -04:00
Cyrus
3a5f210b2f I missed pushing up the manually modified xjc files. [no ci] 2023-03-13 06:39:57 -04:00
Cyrus
9be3f3b3be Update the build.gradle and settings.gradle files [no-ci] 2023-03-07 09:23:55 -05:00
Cyrus
86ef7d9356 Added back in HIRS_Utils 2023-03-06 20:48:51 -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
dad4a2e02c addessed checkstyle errors 2022-08-02 17:29:00 -04:00
iadgovuser26
9e90356c25 addessed checkstyle errors 2022-08-02 17:03:53 -04:00
iadgovuser26
96354113a5 addessed checkstyle errors 2022-08-02 13:52:22 -04:00
iadgovuser26
505f62ce39 added sha384 processing for event logs 2022-08-02 11:52:05 -04:00
Cyrus
8b365bed34 This is a re-creation of tls-settings-update #366 2022-04-14 06:35:49 -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
f19916c454
Merge pull request #444 from nsacyber/ski-prefix-truncate
Truncate 4 bytes from SKI
2022-02-24 16:48:06 -05:00
Cyrus
2e0b83f4fe Updated the upload function for support RIM. The store happened before
the linkage and nothing was being saved.
2022-02-24 09:54:59 -05:00
Cyrus
f28daa9144 Found another issue using the SKID that isn't matching up 2022-02-23 15:44:45 -05:00
Cyrus
a1ebd2f962 Fixed null pointer found in git actions` 2022-02-23 10:13:20 -05:00
Cyrus
4cf08ef38a Updated unit tests and removed magic number 2022-02-23 08:45:16 -05:00
Cyrus
00d8dfb3b5 Updated the CA certificate to truncate the prefix of the subject key identifier 2022-02-23 07:53:07 -05:00
Cyrus
9d27923d6d Added null checks for a unit test 2022-02-18 13:52:14 -05:00
chubtub
bf989bbee7 Merge branch 'issue-395' of github.com:nsacyber/HIRS into issue-395 2022-02-17 16:55:59 -05:00
chubtub
96200f57c2 Revert "Decode the event content for display on the frontend."
This reverts commit 2671a572ba.
2022-02-17 16:51:44 -05:00
chubtub
1cbe50b401 Decode the event content for display on the frontend. 2022-02-17 16:51:44 -05:00
Cyrus
d02be16ced The event selector was removed. It was not needed, but the event
manager was modified to pull the right data.
2022-02-17 16:49:08 -05:00
Cyrus
aabeb4e37f Updated code allows the tpm event table to be searched and information
updated when the swidtag is added.
2022-02-17 16:49:06 -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
chubtub
ddada80add WIP: frontend hangs while getting records from backend 2022-02-17 13:08:07 -05:00
chubtub
7d8df398e7 Controller class for returning TPM Event data to jsp 2022-02-17 13:08:06 -05:00
chubtub
1d57ab0d09 Revert "Decode the event content for display on the frontend."
This reverts commit 2671a572ba.
2022-02-16 11:17:25 -05:00
chubtub
2671a572ba Decode the event content for display on the frontend. 2022-02-14 17:24:33 -05:00
Cyrus
fc3f59adce Updated RIM lookup to use manufacturer and model instead of deviceName 2022-02-11 09:09:39 -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
Cyrus
13e8074e88 Updated the database size of the bytes field in the ReferenceManifest
table.
2022-02-09 07:35:46 -05:00
Cyrus
c5e3823acd The event selector was removed. It was not needed, but the event
manager was modified to pull the right data.
2022-02-02 09:28:35 -05:00
Cyrus
035efad9d2 Updated code allows the tpm event table to be searched and information
updated when the swidtag is added.
2022-01-31 14:11:36 -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
chubtub
fc7d8b5dd1 Merge branch 'master' into issue-395 2022-01-07 09:36:50 -05:00
chubtub
a71e7130ab WIP: frontend hangs while getting records from backend 2022-01-04 11:07:18 -05:00
iadgovuser26
bf8ef387c1
Merge pull request #407 from nsacyber/issue-381
[#381] Update RIM validation in ACA
2021-12-16 10:39:58 -05:00
iadgovuser29
da9c8469ba Re-creating the componentidentifer here lost important information. 2021-12-10 20:58:44 -05:00
iadgovuser29
e22d95c2e6 Modified so PCI ID translation will highlight delta certs and show in Tooltips 2021-12-10 09:07:28 -05:00
Cyrus
9b790cb805 checking for class cast now. Highlighting appears. 2021-12-03 17:01:18 -05:00
Cyrus
6337367ba9 Added Pci IDs translate to the HIRS_Util module for the supply chain validator process so that the hash can match up for highlighting failed components. 2021-12-03 16:01:04 -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
483099a273 Updated the policy code to modify the measurement array length and ignore PCR 10 as well. 2021-11-23 10:06:21 -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