You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2020/02/11 02:00:03 UTC
[incubator-teaclave] 02/02: [build] Update cmake to support DCAP
attestation service
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 153e8a187b9bd342ee2b6b0651fb009b5bf17eac
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Mon Feb 10 17:01:49 2020 -0800
[build] Update cmake to support DCAP attestation service
---
.drone.yml | 7 +++---
CMakeLists.txt | 40 +++++++++++++++++++----------------
cmake/MesaTEEGenVars.cmake | 5 +++++
cmake/scripts/parse_cargo_packages.py | 6 ++++--
cmake/scripts/prep.sh | 13 +++++++++---
cmake/tomls/Cargo.unix_app.toml | 5 +++--
dcap/Cargo.toml | 6 +++---
dcap/Rocket.toml | 4 ++--
third_party/crates-io | 2 +-
9 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 819b8d8..773c636 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -59,7 +59,7 @@ steps:
commands:
- . /root/.cargo/env
- mkdir -p build
- - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DTEST_MODE=ON ..
+ - cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DTEST_MODE=ON -DDCAP=ON ..
- name: check
image: teaclave/teaclave-build-ubuntu-1804-dcap:0.1.0
commands:
@@ -71,7 +71,6 @@ steps:
- . /root/.cargo/env
- . /opt/sgxsdk/environment
- sed -i 's/ias_root_ca_cert/dcap_root_ca_cert/' config/build.config.toml
- - (cd dcap && cargo build)
- cd build && make VERBOSE=1 -j2
- name: test
image: teaclave/teaclave-build-ubuntu-1804-dcap:0.1.0
@@ -93,10 +92,10 @@ steps:
- name: qcnl
path: /etc/sgx_default_qcnl.conf
commands:
- - apt-get update && apt-get install -y iputils-ping iproute2 curl
+ - apt-get update && apt-get install -y iproute2
- echo "$(ip route | awk 'NR==1 {print $3}') pccs-server" >> /etc/hosts
- . /root/.cargo/env
- - (cd dcap && target/debug/teaclave_dcap_ref_as &)
+ - (cd release/dcap && ./teaclave_dcap_ref_as &)
- cd build && make run-tests
volumes:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f4e722..adbccda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ option(COV "Turn on/off coverage" OFF)
option(OFFLINE "Turn on/off cargo offline" ON)
option(TEST_MODE "Turn on/off test mode" OFF)
option(SGX_SIM_MODE "Turn on/off sgx simulation mode" OFF)
+option(DCAP "Turn on/off DCAP attestation" OFF)
if(TEST_MODE)
set(RUSTFLAGS "${RUSTFLAGS} --cfg test_mode")
@@ -33,10 +34,10 @@ set(UNIX_LIBS mesatee_sdk protected_fs_rs)
# ================ VARIABLES FOR MANUAL CHANGE END ================
# UNIX_APPS, SGX_APPS and SGX_LIBS are parsed from corresponding toml files
-# parse_cargo_packages(UNIX_APPS
-# CARGO_TOML_PATH ${PROJECT_SOURCE_DIR}/cmake/tomls/Cargo.unix_app.toml
-# CATEGORIES UNIX_APP_CATEGORIES
-# )
+parse_cargo_packages(UNIX_APPS
+ CARGO_TOML_PATH ${PROJECT_SOURCE_DIR}/cmake/tomls/Cargo.unix_app.toml
+ CATEGORIES UNIX_APP_CATEGORIES
+)
parse_cargo_packages(SGX_APPS
CARGO_TOML_PATH ${PROJECT_SOURCE_DIR}/cmake/tomls/Cargo.sgx_untrusted_app.toml
@@ -60,20 +61,23 @@ generate_env_file()
include(UtilTargets)
# unix_app
-# list(LENGTH UNIX_APPS UNIX_APP_LEN)
-# math(EXPR UNIX_APP_LAST_INDEX "${UNIX_APP_LEN} - 1")
-# foreach(_i RANGE ${UNIX_APP_LAST_INDEX})
-# list(GET UNIX_APPS ${_i} _pkg_name)
-# list(GET UNIX_APP_CATEGORIES ${_i} _category)
-# add_cargo_build_target(${_pkg_name}
-# TARGET_NAME "${UNIXAPP_PREFIX}-${_pkg_name}"
-# TOML_DIR ${MT_UNIX_TOML_DIR}
-# TARGET_DIR ${UNIX_TARGET_DIR}
-# INSTALL_DIR ${MESATEE_INSTALL_DIR}/${_category}
-# EXTRA_CARGO_FLAGS ${EXTRA_CARGO_FLAGS}
-# DEPENDS prep
-# )
-# endforeach()
+list(LENGTH UNIX_APPS UNIX_APP_LEN)
+math(EXPR UNIX_APP_LAST_INDEX "${UNIX_APP_LEN} - 1")
+foreach(_i RANGE ${UNIX_APP_LAST_INDEX})
+ list(GET UNIX_APPS ${_i} _pkg_name)
+ list(GET UNIX_APP_CATEGORIES ${_i} _category)
+ if(${_category} STREQUAL "dcap" AND NOT DCAP)
+ continue()
+ endif()
+ add_cargo_build_target(${_pkg_name}
+ TARGET_NAME "${UNIXAPP_PREFIX}-${_pkg_name}"
+ TOML_DIR ${MT_UNIX_TOML_DIR}
+ TARGET_DIR ${UNIX_TARGET_DIR}
+ INSTALL_DIR ${MESATEE_INSTALL_DIR}/${_category}
+ EXTRA_CARGO_FLAGS ${EXTRA_CARGO_FLAGS}
+ DEPENDS prep
+ )
+endforeach()
# sgx_untrusted_app
list(LENGTH SGX_APPS SGX_APP_LEN)
diff --git a/cmake/MesaTEEGenVars.cmake b/cmake/MesaTEEGenVars.cmake
index 0c04fcb..c4c8c21 100644
--- a/cmake/MesaTEEGenVars.cmake
+++ b/cmake/MesaTEEGenVars.cmake
@@ -5,6 +5,8 @@ set(MESATEE_INSTALL_DIR ${PROJECT_SOURCE_DIR}/release)
set(MESATEE_SERVICE_INSTALL_DIR ${MESATEE_INSTALL_DIR}/services)
set(MESATEE_EXAMPLE_INSTALL_DIR ${MESATEE_INSTALL_DIR}/examples)
set(MESATEE_BIN_INSTALL_DIR ${MESATEE_INSTALL_DIR}/bin)
+set(MESATEE_CLI_INSTALL_DIR ${MESATEE_INSTALL_DIR}/cli)
+set(MESATEE_DCAP_INSTALL_DIR ${MESATEE_INSTALL_DIR}/dcap)
set(MESATEE_LIB_INSTALL_DIR ${MESATEE_INSTALL_DIR}/lib)
set(MESATEE_DOC_INSTALL_DIR ${MESATEE_INSTALL_DIR}/docs)
set(MESATEE_TEST_INSTALL_DIR ${MESATEE_INSTALL_DIR}/tests)
@@ -94,6 +96,8 @@ set(MESATEE_COMMON_ENVS
MESATEE_SERVICE_INSTALL_DIR=${MESATEE_SERVICE_INSTALL_DIR}
MESATEE_EXAMPLE_INSTALL_DIR=${MESATEE_EXAMPLE_INSTALL_DIR}
MESATEE_BIN_INSTALL_DIR=${MESATEE_BIN_INSTALL_DIR}
+ MESATEE_CLI_INSTALL_DIR=${MESATEE_CLI_INSTALL_DIR}
+ MESATEE_DCAP_INSTALL_DIR=${MESATEE_DCAP_INSTALL_DIR}
MESATEE_LIB_INSTALL_DIR=${MESATEE_LIB_INSTALL_DIR}
MESATEE_DOC_INSTALL_DIR=${MESATEE_DOC_INSTALL_DIR}
MESATEE_TEST_INSTALL_DIR=${MESATEE_TEST_INSTALL_DIR}
@@ -122,6 +126,7 @@ MESAPY_VERSION=${MESAPY_VERSION}
SGX_EDGER8R=${SGX_EDGER8R}
MT_EDL_FILE=${MT_EDL_FILE}
CMAKE_AR=${CMAKE_AR}
+DCAP=${DCAP}
)
set(TARGET_SGXLIB_ENVS
diff --git a/cmake/scripts/parse_cargo_packages.py b/cmake/scripts/parse_cargo_packages.py
index edbc595..bd32cb5 100644
--- a/cmake/scripts/parse_cargo_packages.py
+++ b/cmake/scripts/parse_cargo_packages.py
@@ -52,7 +52,7 @@ def parse_package_name(package_toml_path):
def pkg_path_2_category(pkg_path):
"""
Take pkg path and return its category.
- Return services/examples/tests/bin depends on the beginning of pkg_path.
+ Return services/examples/tests/cli/dcap depends on the beginning of pkg_path.
(lib not used by this function)
"""
if pkg_path.startswith('services/'):
@@ -62,7 +62,9 @@ def pkg_path_2_category(pkg_path):
elif pkg_path.startswith('tests/'):
return 'tests'
elif pkg_path == 'cli':
- return 'bin'
+ return 'cli'
+ elif pkg_path == 'dcap':
+ return 'dcap'
else:
sys.stderr.write('[Error]: Unknown category for package_path {}\n'.format(pkg_path))
sys.exit(-1)
diff --git a/cmake/scripts/prep.sh b/cmake/scripts/prep.sh
index 7e9d385..5a30743 100755
--- a/cmake/scripts/prep.sh
+++ b/cmake/scripts/prep.sh
@@ -5,8 +5,8 @@ REQUIRED_ENVS=("CMAKE_SOURCE_DIR" "CMAKE_BINARY_DIR"
"SGX_EDGER8R" "MT_EDL_FILE" "SGX_SDK" "RUST_SGX_SDK" "CMAKE_C_COMPILER"
"CMAKE_AR" "SGX_UNTRUSTED_CFLAGS" "SGX_TRUSTED_CFLAGS" "MT_SCRIPT_DIR"
"MESATEE_SERVICE_INSTALL_DIR" "MESATEE_EXAMPLE_INSTALL_DIR" "MESATEE_BIN_INSTALL_DIR"
-"MESATEE_LIB_INSTALL_DIR" "MESATEE_TEST_INSTALL_DIR"
-"MESATEE_AUDITORS_DIR" "MESATEE_EXAMPLE_AUDITORS_DIR"
+"MESATEE_CLI_INSTALL_DIR" "MESATEE_DCAP_INSTALL_DIR" "MESATEE_LIB_INSTALL_DIR" "MESATEE_TEST_INSTALL_DIR"
+"MESATEE_AUDITORS_DIR" "MESATEE_EXAMPLE_AUDITORS_DIR" "DCAP"
)
for var in "${REQUIRED_ENVS[@]}"; do
@@ -15,8 +15,15 @@ done
${MT_SCRIPT_DIR}/setup_cmake_tomls ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
mkdir -p ${MESATEE_OUT_DIR} ${MESATEE_TARGET_DIR} ${MESATEE_SERVICE_INSTALL_DIR} \
- ${MESATEE_EXAMPLE_INSTALL_DIR} ${MESATEE_BIN_INSTALL_DIR} ${MESATEE_LIB_INSTALL_DIR} \
+ ${MESATEE_EXAMPLE_INSTALL_DIR} ${MESATEE_CLI_INSTALL_DIR} \
+ ${MESATEE_BIN_INSTALL_DIR} ${MESATEE_LIB_INSTALL_DIR} \
${MESATEE_TEST_INSTALL_DIR} ${MESATEE_AUDITORS_DIR} ${MESATEE_EXAMPLE_AUDITORS_DIR}
+if [ -n "$DCAP" ]; then
+ mkdir -p ${MESATEE_DCAP_INSTALL_DIR}
+ cp ${CMAKE_SOURCE_DIR}/dcap/Rocket.toml ${MESATEE_DCAP_INSTALL_DIR}/Rocket.toml
+ cp ${CMAKE_SOURCE_DIR}/keys/dcap_server_cert.pem ${MESATEE_DCAP_INSTALL_DIR}/
+ cp ${CMAKE_SOURCE_DIR}/keys/dcap_server_key.pem ${MESATEE_DCAP_INSTALL_DIR}/
+fi
# copy auditors to install directory to make it easy to package all built things
cp -RT ${CMAKE_SOURCE_DIR}/keys/auditors/ ${MESATEE_AUDITORS_DIR}/
cp ${CMAKE_SOURCE_DIR}/config/runtime.config.toml ${MESATEE_SERVICE_INSTALL_DIR}
diff --git a/cmake/tomls/Cargo.unix_app.toml b/cmake/tomls/Cargo.unix_app.toml
index 9526b29..60d7ca6 100644
--- a/cmake/tomls/Cargo.unix_app.toml
+++ b/cmake/tomls/Cargo.unix_app.toml
@@ -4,6 +4,7 @@
# and for those to exclude from cmake build, just append the '# ignore'
# annotation suffix
members = [
+ "dcap"
]
exclude = [
@@ -11,6 +12,6 @@ exclude = [
[patch.crates-io]
-# We cannot remove these crates, because proto crates depend on them
-sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk", rev = "v1.1.0" }
+# sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk", rev = "v1.1.0" }
sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk", rev = "v1.1.0" }
+sgx_ucrypto = { git = "https://github.com/apache/teaclave-sgx-sdk", rev = "v1.1.0" }
diff --git a/dcap/Cargo.toml b/dcap/Cargo.toml
index c6c8980..3ea423b 100644
--- a/dcap/Cargo.toml
+++ b/dcap/Cargo.toml
@@ -16,11 +16,11 @@ libc = { version = "0.2.66" }
rand = { version = "0.7.3" }
ring = { version = "0.16.11" }
untrusted = { version = "0.7.0" }
-uuid = { version = "0.8.1", features = ["v4"] }
+uuid = { version = "0.7.4", features = ["v4"] }
chrono = { version = "0.4.10" }
lazy_static = { version = "1.4.0" }
percent-encoding = { version = "2.1.0" }
pem = { version = "0.7.0" }
-sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-sgx_ucrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
+sgx_types = { version = "1.1.0" }
+sgx_ucrypto = { version = "1.1.0" }
diff --git a/dcap/Rocket.toml b/dcap/Rocket.toml
index ddc7237..3226156 100644
--- a/dcap/Rocket.toml
+++ b/dcap/Rocket.toml
@@ -3,5 +3,5 @@ port = 8080
# The certificate is self-signed. DO NOT use in production.
[global.tls]
-certs = "../keys/dcap_server_cert.pem"
-key = "../keys/dcap_server_key.pem"
+certs = "dcap_server_cert.pem"
+key = "dcap_server_key.pem"
diff --git a/third_party/crates-io b/third_party/crates-io
index 21edfad..0794d02 160000
--- a/third_party/crates-io
+++ b/third_party/crates-io
@@ -1 +1 @@
-Subproject commit 21edfadc861ee0b95eed696d31e75d952b4465e5
+Subproject commit 0794d02ff4d1ba0ad0ec6decca3236f0d84899bc
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org