Commit Graph

1507 Commits

Author SHA1 Message Date
chubtub
7de7f47f95 Implement --create, --attributes, --out, and --help in JCommander 2020-03-11 13:02:43 -04:00
chubtub
8b36d2636b
Merge pull request #232 from nsacyber/issue-231
[#231] Last minute tcg_rim_tool CLI changes
2020-03-06 08:55:14 -05:00
Cyrus
21db725815
[#230] Update RIM details page to display PCRs (#233)
* This is an update to the display of the Reference Integrity Manifest code base that'll allow a user to upload a swidtag.  This code includes some additions from #217, slightly modified.

* This code update include changes to import, archive and delete a swidtag into the RIM object.

* Updated the code with additional checks on the uploaded file locations.  Added the number associated with the PCR value to the detail page.

* This change fixes the bug that caused the rim detail page to go blank if the associated event log file associated with the resource file doesn't exist.

Co-authored-by: lareine <lareine@tycho.ncsc.mil>
2020-03-06 07:06:09 -05:00
Cyrus
5dbbbafafe
Updated a check on the SERIAL_INDEX in certificate string map builder. (#235) 2020-03-06 07:04:13 -05:00
chubtub
3692262055 Clean up unit tests 2020-03-05 12:11:59 -05:00
chubtub
094efb37df Added CLI arg to control hiding/showing signature cert (default=hide) 2020-02-27 08:44:26 -05:00
chubtub
6dd9615ee0
Merge pull request #207 from nsacyber/packaging_install_error
Fix HIRS_Provisioner install error
2020-02-25 14:38:31 -05:00
busaboy1340
b73b7f218b
[#228] Update TPM Provisioner Docker images with latest PACCOR (v1.1.4r2) (#229)
* Update Docker TPMProvisioner images to latest PACCOR.

* Test updated docker images from hirs Docker Hub

* Update TPM Provisioner Docker images with latest PACCOR (v1.1.4r1)

* Updated TPM images on Docker Hub.

* Update TPM provisioner docker images with PACCOR v1.1.4r2

* Updated docker-compose files

* Updated TPM provisioner images in Docker Hub.
2020-02-25 10:30:37 -05:00
busaboy1340
b899e0bbe0
[#224] Update TPM Provisioner Docker images with latest PACCOR (v1.1.4r1) (#225)
* Update Docker TPMProvisioner images to latest PACCOR.

* Test updated docker images from hirs Docker Hub

* Update TPM Provisioner Docker images with latest PACCOR (v1.1.4r1)

* Updated TPM images on Docker Hub.
2020-02-25 09:51:45 -05:00
Cyrus
4a6115f443
[#212] Added functionality to process and display RIM files. (#226)
* Some initial additions to the details page for displaying Rim information.

* Initial changes for uploading a rim file.

* This is an update to the display of the Reference Integrity Manifest code base that'll allow a user to upload a swidtag.  This code includes some additions from #217, slightly modified.

* This code update include changes to import, archive and delete a swidtag into the RIM object.

* This commit consolidated the SwidTagGatway code and Constants into Reference Manifest.

* This is the final main push of code that will upload, process, store, retrive/delete and display the contents of a RIM swid tag.

* Interim commit for demo purposes.

* Updated Unit Tests

* This commit adds the unit tests that weren't added in the previous commit

* Updated code to reduce execution time when processing reference manifest objects.

* Updated code for better GUI performance.

* Removed previously added suppression entries.
2020-02-21 11:16:46 -05:00
chubtub
1f52dd3c27
[#217] Support reading conf settings from a json file (#218)
* Support reading conf settings from a json file

* Add optional RIM attributes

* Add xml signature element

* New commandline arguments for attributes conf file and privatekey or cert specification

* Add fields to satisfy NIST checks

* Print generated base rim contents to console also
2020-02-21 07:43:40 -05:00
iadgovuser26
9a835d8923
[222] Added TCG Event Log Processing that converts TCG Event Logs to HIRS T… (#223)
* Added TCG Event Log Processing that converts TCG Event Logs to HIRS TPM Baselines

* Some minor formating, syntax and code refactoring updates.

* Updated checkstyle failures.

* String format was missing additional %s.

Co-authored-by: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
2020-02-21 06:37:43 -05:00
busaboy1340
6838a38fbc
[#220] Update TPM Provisioner Docker images with latest PACCOR (v1.1.3r4) (#221)
* Update Docker TPMProvisioner images to latest PACCOR.

* Test updated docker images from hirs Docker Hub
2020-02-20 06:29:48 -05:00
busaboy1340
da836a0862
[#216] Upgrade docker images and system tests to support python3 (#219)
* Updated docker images to use python3

* Updated docker compose files.

* Test Travis CI

* Test Travis CI

* Updated Dockerfiles.

* Updated .travis.yml

* Cleaned up scripts.

* Cleaned up scripts.

* Updated docker-compose files.

* Updated amazonlinux2 image with python3.

* Updated system test driver.

* Updated system test driver

* Cleaned up import in test driver.

* Updated setup scripts to output python version
2020-01-17 07:05:05 -05:00
Cyrus
84a76608f3
[#198] Reference Integrity Manifest Page List (#210)
* Initial commit of changes to display RIM information.
2020-01-10 13:47:17 -05:00
chubtub
d9b4e6a968
Merge pull request #215 from nsacyber/issue-214
[#214] Create tcg_rim_tools project
2020-01-08 09:55:26 -05:00
Tsai
917ca2dcdc Remove user documents 2020-01-07 12:40:31 -05:00
Tsai
72f2824668 Delete tar file 2020-01-06 16:16:34 -05:00
Tsai
0dd7d8b041 Renamed and moved ACA_SwidTag project 2020-01-06 16:15:03 -05:00
Tsai
68222971b2 Rename project to tcg_rim_tool and move under tools/ directory 2020-01-06 16:14:04 -05:00
busaboy1340
1c6947ca8a
Cleaned up python imports. (#213) 2020-01-06 11:54:28 -05:00
Cyrus
81e13831b2
[#202] Certificate fail to save upon deletion during provisioning FIXED (#206)
* This commit fixes an error produced when provisioning when the certificate from a previous provision is deleted from the ACA.  The error involves doing a look up for an existing certificate and getting nothing however this is due to not using the 'includeArchived' attribute for the Certificate Selector.  Include Archived is used when manually uploading a certificate.
2020-01-06 08:17:04 -05:00
Tsai
0b7b2662de Added javadocs to methods 2019-12-30 10:24:38 -05:00
chubtub
2052599153 Create ACA_SwidTag project 2019-12-26 12:33:59 -05:00
busaboy1340
0f3cfeb7b5
Update system_test.py
Updated the disable_warnings library.
2019-12-23 05:50:21 -05:00
busaboy1340
a2497c064c
[#88] Integrate System Tests with Dockerized TPM 1.2 Provisioner (#208)
* Initial system test for TPM 1.2 emulator.

* Update .travis.yml file.

* Added system test: test_20_tpm_1_2_initial_provision

* Cleaned up files.

* Correct docker location

* Re-arranged system tests.

* Execute test_12_attestation_ca_portal_online for all current collectors.

* Clean up files.

* Cleaned up files.

* Cleaned up files.

* Cleaned up files.

* Cleaned up files

* Updated system test driver.

* Set logging properties to DEBUG.

* Commented out test_13_tpm_1_2_initial_provision. Need to fix it.
2019-12-23 05:28:26 -05:00
Tsai
96e41156c7 Revert previous changes to HIRS_Util classes related to VERSION file 2019-12-11 15:58:02 -05:00
busaboy1340
404f2ab5dd
[#194] Update TPM Provisioner Docker images with latest PACCOR (v1.1.3r3) (#205)
* PACCOR Testing.

* PACCOR Testing.

* PACCOR Testing.

* PACCOR Testing

* PACCOR Testing

* Updated Dockerfile.tpm2provisioner

* Cleaned up files.

* Point to the updated tpm2provisioner in hirs/hirs-ci, on Docker Hub.

* Cleaned up files.

* Used specific PACCOR script(allcomponents_hirs_system_test.sh) for
system tests.

* Added new PACCOR script for review.
Will be moved into the PACCOR project when permissions are granted.
2019-12-10 06:07:05 -05:00
chubtub
0c2005c8df
Merge pull request #204 from nsacyber/issue-203
[#203] New version 1.1.1 for release
2019-11-21 14:35:41 -05:00
chubtub
ad3aa1a6c6 Created sql script to add columns to backend. Call script from spec file. 2019-11-19 11:04:51 -05:00
Tsai
5256c57f13 New version 1.1.1 for release 2019-11-19 10:02:15 -05:00
Cyrus
09aafa8041
[#168] Additional fields added to the Issued AC (#201)
* Added additional code pulled from the original branch for these changes aik-field-additions.
* Updated code to include the TCG Credential Specification, which is a different version from the Platform specification.
2019-11-13 10:46:00 -05:00
busaboy1340
00287725da
[#194] Update TPM Provisioner Docker images with latest PACCOR (v1.1.3r3) (#200)
* [#195] Components identified by Component Class will have hardware IDs translated to names

* Update TPM Docker images to latest PACCOR(v1.1.3r3). Comment out the
failing system tests caused by invalid input to PACCOR.
2019-11-07 09:37:06 -05:00
Cyrus
0ede7191ad
[#191] ACA Processing TPM Quote/PCRs from Certificate Request (#197)
* Updated the ACA to verify that the quote and pcrlist exist before trying to parse them.

* Removed unused methods for the tpmquote process.
2019-10-29 09:34:06 -04:00
Cyrus
c7454c945e
[#190] Provision update for quote and pcrs (#196)
* This commit includes functioning TPM quote code that is sent to the ACA.  In addition it has code to also sent the pcrs list results.

Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.Additional changes to correct code for sending the pcr list over to the ACA.

* Changed the requirement for the field into protobuf to optional from required.
2019-10-29 09:33:35 -04:00
busaboy1340
75b9c2ddf7
[#192] Update TPM Provisioner docker images with latest PACCOR (#193)
* Updated TPM Docker images to use PACOR (v1.1.2r3) and TPM 2.0 Emulator
(v1332)

* Use updated TPM Provisioner docker images from Docker Hub.
2019-10-01 09:53:04 -04:00
chubtub
7ea30e3167
Merge pull request #189 from nsacyber/new_version
Update version from 1.0.4 to 1.1.0
2019-09-12 11:32:45 -04:00
chubtub
a52ab2e112 Update version from 1.0.4 to 1.1.0 2019-09-12 09:19:45 -04:00
chubtub
cdd54c8773
Merge pull request #183 from nsacyber/mysql_upgrade_script
[#180] Upgrade hirs_db schema according to upgrade version
2019-09-12 08:38:09 -04:00
chubtub
6cc2a7815a Slight clean up 2019-09-11 12:35:27 -04:00
Cyrus
91520f4b5f Updated syntax. 2019-09-11 12:35:27 -04:00
Cyrus
a476e0783c Updated spec file to cp the version number of the upgraded package. 2019-09-11 12:35:27 -04:00
chubtub
8af49dc6b7 WIP: update version number in ACA banner following upgrade 2019-09-11 12:35:27 -04:00
chubtub
b140ab46e9 Added scripts to upgrade hirs_db schema according to package upgrade. At the time of writing
there are schema changes when upgrading from 1.0.3 to 1.0.4 but not when upgrading to 1.1.0.
These scripts are called when 'yum upgrade HIRS_AttestationCA' is invoked.

Fixed script file path

Fixed MySQL syntax error

These changes now differentiate between upgrade versions and add respective columns, and also
account for upgrades from 1.0.3 directly to 1.1.0.
2019-09-11 12:34:23 -04:00
busaboy1340
6a59033768
Updated system tests from changes in latest Master build. (#187) 2019-09-11 07:55:24 -04:00
iadgovuser26
7c6a533764
Updated README.md links 2019-09-09 10:40:13 -04:00
iadgovuser26
af3036cbbe
Update README.md 2019-09-05 17:22:41 -04:00
iadgovuser26
62a7c9870f
Updated for the version 1.1 release. 2019-09-05 17:21:58 -04:00
iadgovuser26
f0ec345714
Updated images for version 1.1 2019-09-05 17:03:46 -04:00
Cyrus
f73d65c952
[#181] Delta holder validation (#186)
* This is a quick fix to ensure that a delta that is being uploaded has a holder serial number that exists in the database.

* Fixed syntax issues.

* Through further testing with delta certificates that had differing begin validity dates, the code to test the sorting failed.  This push includes a fix that places the deltas in the proper order.

In addition, this code includes a placeholder for deltas that don't have an existing holder certificate in the database.

* Findbugs is a cumbersome COTS product that generates more hassle than help.  Upon indicating 'dodgy' code about redundant null checks, that didn't exist, it then didn't like using non-short circuit operators to verify that both objects are not null.  It then spells out what non-shorting curcuit operators do, without acknowledges that's what you mean to do.
2019-08-29 13:35:41 -04:00