ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-20 17:52:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[#138] Add Platform Attribute Validation to System Tests (TPM 2.0 Emulator) (#141)

Browse Source 
* Platform Attribute verification for system tests. Upgrade to latest TPM2 Emulator.

* Corrected docker-compose-tpm2.yml file.
This commit is contained in:
busaboy1340 2019-05-23 05:53:54 -04:00 committed by GitHub
parent 5c0e4e8373
commit 59ad180688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/docker/Dockerfile.tpm2provisioner
View File

@ -9,4 +9,4 @@ RUN yum install -y tpm2-tools libcurl procps-ng vim-common wget dbus python-requ
RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.0.6r3/paccor-1.0.6-3.noarch.rpm && yum -y install paccor-*.rpm && popd
# Install Software TPM for Provisioning
RUN mkdir ibmtpm && pushd ibmtpm && wget https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm974.tar.gz && tar -zxvf ibmtpm974.tar.gz && cd src && make -j5 && popd
RUN mkdir ibmtpm && pushd ibmtpm && wget https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1119.tar.gz && tar -zxvf ibmtpm1119.tar.gz && cd src && make -j5 && popd

11
.ci/docker/docker-compose-tpm2.yml
View File

@ -1,3 +1,6 @@
---
# Run YAML Lint to verify this file prior to check-in.
version: "3.1"
services:
@ -15,7 +18,7 @@ services:
hirs_aca_system_tests:
ipv4_address: ${HIRS_ACA_PORTAL_IP}
aliases:
- ${HIRS_ACA_HOSTNAME}
- ${HIRS_ACA_HOSTNAME}
tpm2provisioner:
image: hirs/hirs-ci:tpm2provisioner
@ -27,6 +30,10 @@ services:
entrypoint: /bin/bash -c
command: [HIRS/.ci/setup/setup-tpm2provisioner.sh;
HIRS/.ci/system-tests/systems-test-centos7-tpm2.sh]
devices:
- "/dev/mem:/dev/mem"
cap_add:
- sys_rawio
networks:
hirs_aca_system_tests:
ipv4_address: ${HIRS_ACA_PROVISIONER_TPM2_IP}
@ -47,4 +54,4 @@ networks:
ipam:
driver: default
config:
- subnet: ${HIRS_SUBNET}
- subnet: ${HIRS_SUBNET}

4
.ci/system-tests/system_test_core.py
View File

@ -307,8 +307,8 @@ class AttestationCAPortal:
expected_status_codes=[404, 200], params={'ecValidate': "checked",})
self.request("post", "portal/policy/update-pc-validation",
expected_status_codes=[404, 200], params={'pcValidate': 'checked'})
#self.request("post", "portal/policy/update-pc-attribute-validation",
# expected_status_codes=[404, 200], params={'pcAttributeValidate': 'checked'})
self.request("post", "portal/policy/update-pc-attribute-validation",
expected_status_codes=[404, 200], params={'pcAttributeValidate': 'checked'})
def enable_ec_validation(self):
self.request("post", "portal/policy/update-ec-validation",