Commit Graph

126 Commits

Author SHA1 Message Date
chubtub
f530b2222b Declare namespace for TimeStamp element 2024-05-07 17:28:37 -04:00
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
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
d83c34f4ad Create VerifyArgumentValidator 2024-03-06 12:40:54 -05:00
chubtub
6b76d873e6 Upgrade JCommander to support global argument validation. Replace CredentialArgumentValidator with CreateArgumentValidator. 2024-03-06 12:40:54 -05:00
chubtub
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
chubtub
63e184f9a3 Parse the signing cert authority key identifier during signing and place in <KeyName> 2024-02-23 14:48:06 -05:00
chubtub
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
chubtub
2554b7d453 Clean up help menu 2024-02-23 02:17:14 -05:00
chubtub
808e05b71c Do not assign the default attributes file in the absence of a user-provided argument 2024-02-23 02:17:14 -05:00
chubtub
fbf3de2517 Validate signature and validation arguments, and output appropriate error messages 2024-02-23 02:17:08 -05:00
chubtub
6b44c550dc Exit with an error code if validate fails 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
chubtub
3fbc0e743c Validate file arguments with FileArgumentValidator 2024-02-23 02:02:19 -05:00
chubtub
d7823b6b0b Log error messages instead of printing to console 2024-02-16 11:34:59 -05:00
chubtub
eb77981e41 Unknown options are caught and reported to the user instead of throwing an exception 2024-02-16 11:34:59 -05:00
chubtub
81575ee08a Print command line arguments only if --verbose option is given 2024-02-16 11:34:59 -05:00
chubtub
0ffb931112 Add commandline support for output verbosity --verbose 2024-02-16 11:34:59 -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
chubtub
5e3ab59dad Clean up Main class for readability 2024-01-23 13:36:01 -05:00
chubtub
ea79dbfddf Read rimtool version from /opt/rimtool/VERSION or jar filename if VERSION not found 2024-01-19 00:39:38 -05:00
chubtub
9172bd96ad Revert previous changes to Main and SwidTagConstants 2024-01-19 00:39:38 -05:00
chubtub
c79434eb57 Add -V|--version for easy access to rimtool version number 2024-01-19 00:39:38 -05:00
iadgovuser26
3f7cac13c7 added VERSION file to /opt/hirs 2024-01-16 18:28:40 -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
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
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
c0cee9d597 Fixed a typo and included files I didn't on the initial push 2023-12-20 13:10:58 -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
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
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
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
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
chubtub
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
iadgovuser26
9998fa7f22 Merge branch 'main' into v3_issue_578-rpm_update 2023-09-19 16:31:21 -04:00
chubtub
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
chubtub
38894e7ce5 WIP: migrate RIM classes from ACA to rimtool 2023-09-12 11:30:05 -04:00
iadgovuser26
cb4ad4d51a Updated gradle to v8.3 and nebula to 11.4.0 2023-09-06 16:10:16 -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
chubtub
7fdd4b1e44 Added unit tests for timestamps 2023-01-09 11:47:30 -05:00
chubtub
b7f9c52fcb Consolidate timestamp parameters into --timestamp RFC3(339|852). Added a validator class for the parameter arguments. 2022-12-29 01:55:19 -05:00
chubtub
6a84bb50c5 Merge branch 'java_xml_timestamp' into issue-493 2022-12-19 18:32:40 -05:00
chubtub
f74bc49120 Suppoort user input for RFC3339 timestamps 2022-12-19 10:39:10 -05:00
chubtub
307d0b3fe4 Read in counter signature file contents, encode in base64, and place in Timestamp element 2022-12-08 08:15:55 -05:00
chubtub
054699d14d Add commandline support for passing in a countersignature file for RFC3852 timestamps 2022-12-08 08:15:55 -05:00
chubtub
2252270d94 Modify help text 2022-12-08 08:15:55 -05:00
chubtub
b5681411c0 Updated references of RFC3161 to RFC3852 2022-12-08 08:15:55 -05:00
chubtub
075d68664f If no timestamp format is given a timestamp is not included in the resulting XML. Updated unit tests. 2022-12-08 08:15:55 -05:00
chubtub
fcf59290fe Modify gateway class to insert a timestamp according to user selected format 2022-12-08 08:15:55 -05:00