Commit Graph

949 Commits

Author SHA1 Message Date
Cyrus
640966ae8c Removed debug statement 2020-12-14 11:40:04 -05:00
Cyrus
8fa5dfdd9e Removed unused imports 2020-12-14 10:57:35 -05:00
Cyrus
62c7ca2d90 This PR is to address issue #308. The ACA was pulling Issuer Certificates using the organization RDN of the subject string and getting this from the issuer string of the EC or PC. This presents a problem because it isn't a required field. The organization field cannot be null or empty. Pulling objects from a DB using null or empty would produce bad results. The main change of this issue (which has not been full tested) is pulling using the AKI for the db lookup. If this fails, instead of falling back on potentially left out fields like the O= RDN, the ACA takes the issuer/subject fields, breaks them apart and sorts them based on the key. It also changes the case. This way the lookup can be assured to match in case of some random situation in which the issuer or subject field don't match because RDN keys are just in different positions of the string. 2020-12-11 14:47:46 -05:00
Cyrus
209024c12a Cleaned up some comments and code. 2020-12-07 09:47:54 -05:00
Cyrus
a3de35ed27 The issue with the tpm 1.2 system test failing had to do with the string to integer conversion using getInteger instead of parseInt. 2020-12-07 07:44:48 -05:00
Cyrus
ec47aceedc Merge branch 'master' into aic-policy-rule 2020-12-07 07:40:09 -05:00
Cyrus
11f238f671 Testing system tests 2020-12-04 08:36:42 -05:00
iadgovuser26
408060b1e0
Update README.md
Updated for Release 2.0
2020-12-03 15:40:46 -05:00
Cyrus
e64c6cf772 Merge branch 'master' into aic-policy-rule 2020-12-03 13:34:29 -05:00
Cyrus
e32e9412d8 Merge branch 'master' into Unmatched-component-refactor 2020-12-03 13:20:12 -05:00
Cyrus
0ce8d41f23
Merge pull request #323 from nsacyber/multiple-rim-upload
Multiple RIM upload
2020-12-03 07:57:15 -05:00
Cyrus
b56fb73801 Updated the file to just use the fileName from the ReferenceManifest for the downloaded name. 2020-12-02 19:40:50 -05:00
Cyrus
a07fbbd847 In a previous pull request, the reference manifest manager was not called to update the unarchived base rim. So it appears to never have been uploaded. 2020-12-02 11:46:42 -05:00
Cyrus
7d49f63a9b Merge branch 'master' into multiple-rim-upload 2020-12-02 11:05:12 -05:00
Cyrus
a3f5386b21
Merge pull request #322 from nsacyber/platform_cert_missing_fix
Platform Certificate Upload Modification
2020-12-02 11:01:27 -05:00
Cyrus
70662bddec Updated how the bios measurement file is uploaded. Changed the code to pull the string from the properties file instead of a hard link in the code. 2020-12-01 11:13:41 -05:00
Cyrus
9534d6650f Merge branch 'master' into platform_cert_missing_fix 2020-12-01 09:47:45 -05:00
Cyrus
a32d3a5f02 Remove comments 2020-12-01 09:46:05 -05:00
Cyrus
a3ba12f7b7
Merge pull request #321 from nsacyber/expected_pcr_display_fix
Bug Fix for Base RIM Details Page
2020-12-01 09:45:55 -05:00
Cyrus
6eefb393a3 Updated the code to pull all the files from a swid tag file directory and a rim log file directory, instead of a single file. 2020-11-30 14:16:57 -05:00
Cyrus
857f1eb0ff There was a pull for an object that would be null without any RIMs uploaded. 2020-11-30 10:11:25 -05:00
Cyrus
29b7d466cd Updated wording in validation for failed trust store 2020-11-30 09:23:10 -05:00
Cyrus
bfeff6c867 initial commit 2020-11-30 08:38:46 -05:00
Cyrus
eab88e1ef6 Merge branch 'platform_cert_missing_fix' into multiple-rim-upload 2020-11-30 06:41:52 -05:00
Cyrus
61359e1920 Updated the provisioner to look into the tcg properties file for the location of the certificates that are to be uploaded instead of using the tpm (if the file is not in the tpm). 2020-11-27 13:09:04 -05:00
Cyrus
749a3a2317 When the provisioner sends the rim swidtag and the rimel and they already exists in the db but are archived, they don't unarchive them so they never show up on the RIM page. This change fixes that. 2020-11-25 10:06:56 -05:00
Cyrus
40e744690b The 3 files the provisioner uploads to the ACA are system flat files. If the first or second one dosn't exist or cause an exception to be thrown, the rest aren't executed. This change separates the try catch statements so that each one is executed independently of the previous ones' error. 2020-11-25 08:23:02 -05:00
Cyrus
9433c97dc9 The code now uses a combination of the class value and the platform manufacturer and model to identify mismatches. This now highlights the failured components 2020-11-25 08:02:45 -05:00
Cyrus
781dc92d95 Added a bug fix for support rim and base rim display. If the Support RIM was uploaded, separately, first, then the Base; the base RIM details page would display a linked Support RIM but no expected PCR values. 2020-11-24 10:13:00 -05:00
Cyrus
ffbcebbf11 Found the issue with the isMatch class not working. The component class string for the class value has a pound sign. 2020-11-24 09:12:00 -05:00
Cyrus
fbdcf83840 Continued refactoring to update the failed components part of the attribute validation. The delta mapping needs to be reworked to not use serials. 2020-11-23 14:46:29 -05:00
iadgovuser26
e3b8ce25d7
Merge pull request #319 from nsacyber/rim-update-error
[#318] RIM upload error
2020-11-23 13:05:41 -05:00
chubtub
7be85e5c3a
Merge pull request #320 from nsacyber/fix_rimtool_packaging
Fix path for jar file
2020-11-23 10:47:05 -05:00
chubtub
4679264897 Fix path for jar file 2020-11-20 12:42:07 -05:00
Cyrus
fddc65e6cf Simplified the code to do the same thing 2020-11-20 09:50:57 -05:00
Cyrus
91fbc7cfd2 Initial commit, that adds an additional check to the file being uploaded to the rim page to ensure that it is a valid file. 2020-11-20 09:42:37 -05:00
iadgovuser26
85be3c2fc8
Update VERSION 2020-11-20 08:56:34 -05:00
Cyrus
121b02108f
Update VERSION
Updating release version number.
2020-11-20 08:34:22 -05:00
Cyrus
d99bb1039c
Merge pull request #317 from nsacyber/update-component-failure-highlight
[#316] Update component failure highlight
2020-11-19 10:56:06 -05:00
Cyrus
2b41720ded Merge branch 'master' into update-component-failure-highlight 2020-11-17 15:24:27 -05:00
Cyrus
1339f2b63c
Merge pull request #315 from nsacyber/rim_display_error
[#314] Support RIM bug fixes
2020-11-17 09:34:34 -05:00
chubtub
8579be42cf
Merge pull request #313 from nsacyber/eventLog_typing_fix
Typing conflict when comparing event logs
2020-11-17 09:34:00 -05:00
chubtub
e3b5d164a3 Add SKI to front end. Extract PK from base RIM to validate signature if not found in db 2020-11-16 16:43:11 -08:00
Cyrus
ea03737234 Testing travis 2020-11-16 14:49:53 -05:00
Cyrus
4291059142 Updated the break line option for failed string during firmware validation. 2020-11-16 12:39:57 -05:00
Cyrus
3a3919d9bc Added null checks for the SupplyChainPolicy object 2020-11-13 08:41:33 -05:00
Cyrus
6eeb630a75 This PR addresses the bugs identified in #314. Due to previous changes to the RIM upload process, the suppor RIM was not being updated properly when manually uploaded.
Closes #314
2020-11-12 13:45:38 -05:00
Cyrus
f7912908e0 Final changes to be tested against component failures 2020-11-12 09:58:18 -05:00
chubtub
dbfdcdf9fd Update version to 2.0.0 2020-11-10 15:39:47 -05:00
Cyrus
67b70a386d Added method to combine the manufacturer and the model as an identifier for the component. 2020-11-10 10:04:46 -05:00