Commit Graph

242 Commits

Author SHA1 Message Date
77de04b45f Merge pull request #751 from nsacyber/v3_issue-737
[#737] Resolve RIM upload parse error
2024-05-15 23:07:51 -04:00
89369aaa27 added variable to track file status through the object calls, specifically vendor-table.json file 2024-05-14 15:06:20 -04:00
93c3109b29 propogated the error where vendor-table is not accessible through the classes, so that it can be printed out at the beginning of the list of event printouts 2024-05-14 13:22:03 -04:00
99f93d521a check for signature type validity; if not valid, don't process and don't print 2024-05-08 17:41:10 -04:00
f530b2222b Declare namespace for TimeStamp element 2024-05-07 17:28:37 -04:00
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
3da69f11ad updated build to include HIRS_UTILS 2024-04-25 13:43:26 -04:00
1947b70a1b Clean up javadocs; change System.out.println to log messages 2024-03-07 00:43:10 -05:00
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
d83c34f4ad Create VerifyArgumentValidator 2024-03-06 12:40:54 -05:00
6b76d873e6 Upgrade JCommander to support global argument validation. Replace CredentialArgumentValidator with CreateArgumentValidator. 2024-03-06 12:40:54 -05:00
74ab262bc0 Revert "Parse the signing cert authority key identifier during signing and place in <KeyName>"
This reverts commit 63e184f9a3.
2024-02-29 10:43:11 -05:00
63e184f9a3 Parse the signing cert authority key identifier during signing and place in <KeyName> 2024-02-23 14:48:06 -05:00
c6bbe00d0f Merge changes from issue-692. Implement CredentialArgumentValidator. Remove extraneous code with the additions of exitWithErrorCode(String) and FileArgumentValidator. 2024-02-23 02:28:13 -05:00
2554b7d453 Clean up help menu 2024-02-23 02:17:14 -05:00
808e05b71c Do not assign the default attributes file in the absence of a user-provided argument 2024-02-23 02:17:14 -05:00
fbf3de2517 Validate signature and validation arguments, and output appropriate error messages 2024-02-23 02:17:08 -05:00
6b44c550dc Exit with an error code if validate fails 2024-02-23 02:11:31 -05:00
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
3fbc0e743c Validate file arguments with FileArgumentValidator 2024-02-23 02:02:19 -05:00
d7823b6b0b Log error messages instead of printing to console 2024-02-16 11:34:59 -05:00
eb77981e41 Unknown options are caught and reported to the user instead of throwing an exception 2024-02-16 11:34:59 -05:00
81575ee08a Print command line arguments only if --verbose option is given 2024-02-16 11:34:59 -05:00
0ffb931112 Add commandline support for output verbosity --verbose 2024-02-16 11:34:59 -05:00
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
ab5036982f Updated version for suppressions file 2024-02-02 08:37:44 -05:00
17bd7d9021 New branch because there seemed to be issues with the previous branch
merges.
2024-02-02 08:07:08 -05:00
5e3ab59dad Clean up Main class for readability 2024-01-23 13:36:01 -05:00
ea79dbfddf Read rimtool version from /opt/rimtool/VERSION or jar filename if VERSION not found 2024-01-19 00:39:38 -05:00
9172bd96ad Revert previous changes to Main and SwidTagConstants 2024-01-19 00:39:38 -05:00
c79434eb57 Add -V|--version for easy access to rimtool version number 2024-01-19 00:39:38 -05:00
3f7cac13c7 added VERSION file to /opt/hirs 2024-01-16 18:28:40 -05:00
e4c9150b07 Merge pull request #650 from nsacyber/v3_issue-646
[#646] Fix broken rimtool validation
2024-01-11 10:52:42 -05:00
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
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
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
ae1c1f82f3 Missed a change 2023-12-20 14:03:56 -05:00
7d1d92417f Updates to spot bugs found 2023-12-20 13:52:05 -05:00
c0cee9d597 Fixed a typo and included files I didn't on the initial push 2023-12-20 13:10:58 -05:00
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
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
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
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
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
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
5f6a620ec2 Revert "Merge pull request #583 from nsacyber/v3_issue-563"
This reverts commit f725f90392, reversing
changes made to 25101314a2.
2023-09-27 09:32:58 -04:00
9998fa7f22 Merge branch 'main' into v3_issue_578-rpm_update 2023-09-19 16:31:21 -04:00
66501c9444 Revert rimtool SwidTagValidator class changes, these will be in issue-582.
Revert SupportReferenceManifest migration to rimtool, this class will remain
in the ACA.
2023-09-14 00:05:50 -04:00
38894e7ce5 WIP: migrate RIM classes from ACA to rimtool 2023-09-12 11:30:05 -04:00
cb4ad4d51a Updated gradle to v8.3 and nebula to 11.4.0 2023-09-06 16:10:16 -04:00