136 Commits

Author SHA1 Message Date
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
iadgovuser26
72b37cec61
Merge pull request #815 from SuperPotato27/v3_issue_810
(WIP) Added action to package the RIM tool and the EventLog tool for windows.
2024-09-04 10:30:21 -04:00
iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil
203691e09c Updated README.md and VERSION files 2024-08-22 16:40:03 -04:00
SuperPotato27
f712f2597f fixed jar file name inside zip 2024-07-17 14:27:26 -04:00
SuperPotato27
dfd0c85822 added all rim files needed to gradle build 2024-07-16 15:57:33 -04:00
SuperPotato27
128e2f90ab adjust paths 2024-07-16 11:48:59 -04:00
SuperPotato27
a62b3bbb6f working on windows packaging 2024-07-16 10:02:39 -04:00
SuperPotato27
59e2ac65e7 packaging rimtool for windows 2024-07-15 15:05:31 -04: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
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 071e89a44f31e005c5e73f233b7c55643521d9e3, reversing
changes made to 45d550729f38dea75290d53b7439dfbc0795bd17.
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 f725f90392c6cbb85c9437b04a6767b0c8d63a09, reversing
changes made to 25101314a21ddc016ed41cb8392d83ecd11b42b5.
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