Gramin Integration with Avalon

Author: ntk97

docker/compose/avalon-fib-gsgx.yaml

@@ -18,7 +18,4 @@ services:
   graphene-python-workload:
     image: gsc-avalon-fibonacci-workload-dev
     devices:
-      - "/dev/gsgx:/dev/gsgx"
-      - "/dev/isgx:/dev/isgx"
-    volumes:
-      - /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket
+      - "/dev/sgx_enclave:/dev/sgx_enclave"

docs/graphene-workload-tutorial/create_workload.py

@@ -45,7 +45,8 @@
     os.path.join("src","my_workload.py.template"),
     os.path.join("tests","test_work_orders.json.template"),
     "workload.json.template",
-    "Makefile.template"
+    "Makefile.template",
+    "setup.py.template"
 }
 
 IN_DIR = "workload"

docs/graphene-workload-tutorial/workload/avalon-workload-gsgx.yaml.template

@@ -18,7 +18,4 @@ services:
   graphene-python-workload:
     image: gsc-avalon-{{ my_workload }}-workload-dev
     devices:
-      - "/dev/gsgx:/dev/gsgx"
-      - "/dev/isgx:/dev/isgx"
-    volumes:
-      - /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket
+      - "/dev/sgx_enclave:/dev/sgx_enclave"

docs/graphene-workload-tutorial/workload/compose/graphene-sgx.yaml.template

@@ -18,7 +18,4 @@ services:
   process-work-order:
     image: gsc-avalon-{{ my_workload }}-workload-dev
     devices:
-      - "/dev/gsgx:/dev/gsgx"
-      - "/dev/isgx:/dev/isgx"
-    volumes:
-      - /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket
+      - "/dev/sgx_enclave:/dev/sgx_enclave"

docs/graphene-workload-tutorial/workload/graphene_sgx/build_gsc_workload.sh.template

@@ -38,29 +38,13 @@ if [ "$GSC_IMAGE_EXISTS" = "yes" ]; then
 fi
 
 # Manifest files
-MANIFEST_FILE_DIR="${TCF_HOME}/tc/graphene/python_worker/graphene_sgx/manifest"
-MANIFEST_FILES="python.manifest
-sh.manifest
-gcc.manifest
-collect2.manifest
-ld.manifest"
-# Generate list of manifest files
-LIST_MANIFEST_FILES=""
-for f in $MANIFEST_FILES
-do
-  FILE_NAME=${MANIFEST_FILE_DIR}/$f
-  if [ ! -f $FILE_NAME ]; then
-    echo "ERROR:Manifest file $FILE_NAME doesn't exist"
-    exit
-  fi
-  LIST_MANIFEST_FILES+=${MANIFEST_FILE_DIR}/$f
-  LIST_MANIFEST_FILES+=" "
-done
-echo $LIST_MANIFEST_FILES
+
+MANIFEST_FILE="${TCF_HOME}tc/graphene/python_worker/graphene_sgx/manifest/avalon.manifest"
+echo $MANIFEST_FILE
 
 # Build image
 echo "Build unsigned GSC image"
-./gsc build --insecure-args $IMAGE_NAME $LIST_MANIFEST_FILES
+sudo ./gsc build --insecure-args $IMAGE_NAME $MANIFEST_FILE
 
 # Generate signing key if it doesn't exists
 SIGN_KEY_FILE=enclave-key.pem
@@ -70,4 +54,7 @@ fi
 
 # Sign image to generate final GSC image
 echo "Generate Signed GSC image"
-./gsc sign-image $IMAGE_NAME $SIGN_KEY_FILE
+sudo ./gsc sign-image $IMAGE_NAME  $SIGN_KEY_FILE
+
+# Retrieve SGX-related information from graphenized image using gsc info-image
+# sudo ./gsc info-image $IMAGE_NAME

docs/graphene-workload-tutorial/workload/setup.py.template

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+# Copyright 2020 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+# This should only be run with python3
+if sys.version_info[0] < 3:
+    print('ERROR: must run with python3')
+    sys.exit(1)
+
+from setuptools import setup, find_packages
+
+setup(name='avalon_python_{{ my_workload }}_workload',
+      version=0.6,
+      description='Avalon python workload for Graphene',
+      author='Hyperledger Avalon',
+      url='https://github.com/hyperledger/avalon',
+      packages=find_packages(),
+      data_files=[],
+      entry_points={}
+      )

enclave_manager/Dockerfile-graphene

@@ -167,7 +167,7 @@ COPY ./enclave_manager/Makefile-graphene /project/avalon/enclave_manager/
 COPY ./enclave_manager/avalon_enclave_manager/*.py /project/avalon/enclave_manager/avalon_enclave_manager/
 COPY ./enclave_manager/avalon_enclave_manager/${ENCLAVE_TYPE} /project/avalon/enclave_manager/avalon_enclave_manager/${ENCLAVE_TYPE}
 COPY ./enclave_manager/avalon_enclave_manager/wpe_common /project/avalon/enclave_manager/avalon_enclave_manager/wpe_common
-COPY ./wpe_mr_enclave.txt /project/avalon/
+# COPY ./wpe_mr_enclave.txt /project/avalon/
 
 
 WORKDIR /project/avalon/enclave_manager

examples/graphene_apps/python_workloads/fibonacci/Makefile

@@ -32,7 +32,6 @@ build :
 install:
 	@echo INSTALLING WHEEL FILE =================
 	pip3 install $(WHEEL_FILE)
-
 clean:
 	if pip3 uninstall --yes $(WHEEL_FILE); then echo UNINSTALLED $(WHEEL_FILE) WHEEL FILE ; fi
 	rm -rf build deps dist *.egg-info

examples/graphene_apps/python_workloads/fibonacci/README.md

@@ -60,7 +60,7 @@ https://creativecommons.org/licenses/by/4.0/
 
 - To run fibonacci workload as a docker container in Graphene-SGX environment and to use a test application to send work order requests, execute the following command from [fibonacci](https://github.com/hyperledger/avalon/tree/master/examples/graphene_apps/python_workloads/fibonacci) directory.
 
-  `docker-compose -f docker-compose.yaml -f compose/graphene-sgx.yaml up`
+  `docker-compose -f docker-compose.yaml -f compose/graphene-wpe-sgx.yaml up`
 
   Above command will run test work orders listed in file [*test_fib_work_orders.json*](http://github.com/hyperledger/avalon/tree/master/examples/graphene_apps/python_workloads/fibonacci/tests/test_fib_work_orders.json).
 

examples/graphene_apps/python_workloads/fibonacci/graphene_sgx/build_gsc_fibonacci_workload.sh

@@ -18,6 +18,7 @@
 
 # Avalon python worker docker image name.
 IMAGE_NAME=avalon-fibonacci-workload-dev
+echo "Building GSC image $IMAGE_NAME started"
 # Graphenized docker image name for python worker.
 GSC_IMAGE_NAME=gsc-$IMAGE_NAME
 
@@ -38,29 +39,13 @@ if [ "$GSC_IMAGE_EXISTS" = "yes" ]; then
 fi
 
 # Manifest files
-MANIFEST_FILE_DIR="${TCF_HOME}/tc/graphene/python_worker/graphene_sgx/manifest"
-MANIFEST_FILES="python.manifest
-sh.manifest
-gcc.manifest
-collect2.manifest
-ld.manifest"
-# Generate list of manifest files
-LIST_MANIFEST_FILES=""
-for f in $MANIFEST_FILES
-do
-  FILE_NAME=${MANIFEST_FILE_DIR}/$f
-  if [ ! -f $FILE_NAME ]; then
-    echo "ERROR:Manifest file $FILE_NAME doesn't exist"
-    exit
-  fi
-  LIST_MANIFEST_FILES+=${MANIFEST_FILE_DIR}/$f
-  LIST_MANIFEST_FILES+=" "
-done
-echo $LIST_MANIFEST_FILES
+
+MANIFEST_FILE="./avalon.manifest" #"${TCF_HOME}tc/graphene/python_worker/graphene_sgx/manifest/python.manifest"
+echo $MANIFEST_FILE
 
 # Build image
 echo "Build unsigned GSC image"
-./gsc build --insecure-args $IMAGE_NAME $LIST_MANIFEST_FILES
+sudo ./gsc build --insecure-args $IMAGE_NAME $MANIFEST_FILE
 
 # Generate signing key if it doesn't exists
 SIGN_KEY_FILE=enclave-key.pem
@@ -70,13 +55,7 @@ fi
 
 # Sign image to generate final GSC image
 echo "Generate Signed GSC image"
-./gsc sign-image $IMAGE_NAME $SIGN_KEY_FILE
-
-# Extract enclave info from GSC image
-./gsc info-image $GSC_IMAGE_NAME > gsc-info.toml
-
-# Extract mrenclave corresponding to python and persist to file
-python3 $TCF_HOME/scripts/mr_enclave.py
+sudo ./gsc sign-image $IMAGE_NAME  $SIGN_KEY_FILE
 
-# Move MRENCLAVE file to TCF_HOME
-mv wpe_mr_enclave.txt $TCF_HOME
+# Retrieve SGX-related information from graphenized image using gsc info-image
+# sudo ./gsc info-image $IMAGE_NAME