105 Commits

Author SHA1 Message Date
chubtub
198d6a54b8 Applied checkstyles config to rimtool files 2025-02-20 15:02:23 -05:00
TheSilentCoder
1bc9affcf1 issue_872: I believe I was able to lombok all the files that had the default setters and getters.
Some checks are pending
Dotnet Provisioner Unit Tests / Restore and Run Unit Tests (ubuntu-20.04) (push) Waiting to run
Dotnet Provisioner Unit Tests / Restore and Run Unit Tests (windows-2022) (push) Waiting to run
Dotnet Provisioner Unit Tests / Evaluate Tests (push) Blocked by required conditions
HIRS Build and Unit Test / ACA_Provisioner_Unit_Tests (push) Waiting to run
HIRS System Tests / DockerTests (push) Waiting to run
2025-01-13 18:28:55 -05:00
ThatSilentCoder
11691e5b29
[#863] Placed Dependencies and Dependency Versions In TOML file (#885)
Some checks failed
Dotnet Provisioner Unit Tests / Restore and Run Unit Tests (ubuntu-20.04) (push) Has been cancelled
Dotnet Provisioner Unit Tests / Restore and Run Unit Tests (windows-2022) (push) Has been cancelled
HIRS Build and Unit Test / ACA_Provisioner_Unit_Tests (push) Has been cancelled
HIRS System Tests / DockerTests (push) Has been cancelled
Dotnet Provisioner Unit Tests / Evaluate Tests (push) Has been cancelled
* issue_863: Successfully moved all the dependencies to toml file and currently replacing dependencies listed in the build.gradle file with the ones referenced in the toml file

* issue_863: finished updating dependency versions. Ready for PR

* issue_863: downgraded versions since there was an issue with the dependencies versions and the ci/cd pipeline in git. will update each depedency slowly to ensure that upgrades are down correctly.

* issue_863: upgrading this slowly but surely

* issue_863: upgrading this slowly but surely again. testing to see if github's ci/cd is happy still with these set of changes.

* issue_863: upgrading this slowly but surely again. testing to see if github's ci/cd is happy still with these set of changes (again)

* issue_863: upgrading this slowly but surely again. testing to see if github's ci/cd is happy still with these set of changes (again) partIII

* issue_863: Part IV of upgrading this slowly  to see if github's ci/cd is happy still with these set of changes (again)

* issue_863: Part V of upgrading this slowly  to see if github's ci/cd is happy still with these set of changes (again)

* issue_863: Part VI of updating dependencies slowly

* issue_863: Part VII of updating dependencies

* issue_863: Part 8 of updating dependencies

* issue_863: Part 9 of updating dependencies

* issue_863: Part 10 of updating dependencies

* issue_863: Part 12 of updating dependencies

* issue_863: Part 13 of updating dependencies

* issue_863: Part 14 of updating dependencies

* issue_863: Part 15 of updating dependencies

* issue_863: Updating tomcat core.

* issue_863: removed some critical vulnerable dependencies

* issue_863: updated spring boot version. second try at it.

* issue_863: undid spring update. need to figure out how to smoothly transition to newer spring.

* issue_863: updated spring boot, hibernate, and spring retry. Removed an unused dependency.

* issue_863: removed unused dependencies and am currently resolving critical vulnerable dependendcies

* issue_863: reverted changes from last commit. let's see if that makes a difference

* issue_863: Updated gradle version, fixed more vulnerabilities, now figuring what to do with the remaining vulnerabilities.

* issue_863: Updated gradle plugins version, fixed more vulnerabilities, now figuring what to do with the remaining vulnerabilities.

* issue_863: Updated gradle plugins version again. Ready for PR. Vulnerability issues will be addressed in another PR. I've cut down vulnerabilities by quite a lot and I want to test the new OWASP plugin against the remaining vulnerabilities.

* issue_863: Finishing touches to the PR. Upgraded some more dependencies and removed unused one.

* issue_863: Removed testng from codebase. Has been officially replaced with spring junit.
2025-01-13 09:53:04 -05:00
chubtub
5d10dc4b1c Modify rimtool to properly namespace timestamp elements 2024-06-20 08:45:32 -04:00
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 63e184f9a36d1676f712f711c58e415f4032acf5.
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
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
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
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 071e89a44f31e005c5e73f233b7c55643521d9e3, reversing
changes made to 45d550729f38dea75290d53b7439dfbc0795bd17.
2023-11-01 10:03:34 -04:00
chubtub
5f6a620ec2 Revert "Merge pull request #583 from nsacyber/v3_issue-563"
This reverts commit f725f90392c6cbb85c9437b04a6767b0c8d63a09, reversing
changes made to 25101314a21ddc016ed41cb8392d83ecd11b42b5.
2023-09-27 09:32:58 -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
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
chubtub
464abbf156 Modify Main and Commander classes to support options for RFC3161 and RFC3339 2022-12-08 08:15:55 -05:00
chubtub
233171893b Add constants to support separate namespaces for RFC3161 and RCF3339. 2022-12-08 08:15:55 -05:00
chubtub
106e1fef76 Clean up SwidTagConstants class values 2022-12-08 08:15:55 -05:00
chubtub
dffcbf59bd Add support for timestamping a signature 2022-12-08 08:15:50 -05:00
chubtub
59ef355326 Modify help text 2022-12-06 06:50:53 -05:00