I poc

i-poc/Makefile

@@ -12,11 +12,12 @@
 #
 
 IMAGE_SUBDIRS=vaas-server ccfaas-app iotex-s3-app
+VERACRUZ_NITRO_IMAGE=veracruz/veracruz-nitro:v1.3.3
 
 all: veracruz-client k8s-config
 
 veracruz-client:
-	CONTAINERID=$(shell docker create veracruz/veracruz-nitro:v1.2.0); \
+	CONTAINERID=$(shell docker create $(VERACRUZ_NITRO_IMAGE)); \
 	docker cp $$CONTAINERID:/work/veracruz-client/veracruz-client veracruz-client; \
 	docker cp $$CONTAINERID:/work/veracruz-client/hash hash; \
 	docker rm $$CONTAINERID

i-poc/ccfaas-app/Dockerfile

@@ -10,7 +10,7 @@
 # and copyright information.
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update -y;apt-get upgrade -y;apt-get install -y netcat curl python3-pip;apt-get -y clean
 

i-poc/ccfaas-app/Makefile

@@ -10,15 +10,15 @@
 # example repository root directory for copyright and licensing information.
 #
 #
-VERSION=0.87.26
+VERSION=0.87.28
 
 all: image
 
 veracruz-client: ../veracruz-client
 	cp ../veracruz-client veracruz-client
 
 veracruz-ccfaas-server.imageOK: Dockerfile ccfaas-server.py ccfaas-server.sh veracruz-client load_program.sh load_data.sh
-	docker build -t veracruz-ccfaas-server:$(VERSION) .
+	docker build --output type=docker -t veracruz-ccfaas-server:$(VERSION) .
 	touch veracruz-ccfaas-server.imageOK
 
 image: veracruz-ccfaas-server.imageOK

i-poc/iotex-s3-app/Dockerfile

@@ -10,7 +10,7 @@
 # and copyright information.
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update -y;apt-get upgrade -y;apt-get install -y openssl netcat curl python3-pip;apt-get -y clean
 

i-poc/iotex-s3-app/Makefile

@@ -11,15 +11,15 @@
 #
 #
 
-VERSION=0.8.4
+VERSION=0.8.6
 
 all: image
 
 veracruz-client: ../veracruz-client
 	cp ../veracruz-client veracruz-client
 
 iotex-s3-veracruz-app.imageOK: Dockerfile iotex-s3-app.py veracruz-client
-	docker build -t iotex-s3-veracruz-app:$(VERSION) .
+	docker build --output type=docker -t iotex-s3-veracruz-app:$(VERSION) .
 	touch iotex-s3-veracruz-app.imageOK
 
 image: iotex-s3-veracruz-app.imageOK

i-poc/iotex-user-app/execute_program.sh

@@ -24,7 +24,7 @@ function check_if_file_exists() {
 
 VERACRUZ_CLIENT=$(pwd)/veracruz-client
 
-if [ $# -lt 6 ]
+if [ $# -lt 8 ]
 then
 	echo "$0: <policy> <certificate file out> <key file out> <output file veracruz> <output file name> <program> <decryption key path> <decryption IV path>"
 	exit 1
@@ -42,6 +42,8 @@ DECRYPTION_IV_PATH=$8
 check_if_file_exists "${POLICY}" "Policy"
 check_if_file_exists "${CERTIFICATE_OUT}" "Certificate_out"
 check_if_file_exists "${KEY_OUT}" "Key_out"
+check_if_file_exists "${DECRYPTION_KEY_PATH}" "Decryption key"
+check_if_file_exists "${DECRYPTION_IV_PATH}" "Decryption IV"
 
 VERACRUZ_URL=$(grep veracruz_server_url "${POLICY}" | sed -e 's/^[^:]*: *\"//' -e 's/".*//')
 VERACRUZ_HOST=$(echo "${VERACRUZ_URL}" | cut -d ":" -f 1)

i-poc/iotex-user-app/function_policy_big.json

@@ -7,15 +7,15 @@
     "data_files": [
         {
             "data_file": "/program_data/coco.names",
-            "pi_hash": "634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84"
+            "pi_hash": "COCO_HASH"
         },
         {
             "data_file": "/program_data/yolov3.cfg",
-            "pi_hash": "2ca0ab366618b5c005931e057e9cef2e40a1988e2481b3cbd960047c8ec11995"
+            "pi_hash": "YOLOV3_CFG_HASH"
         },
         {
             "data_file": "/program_data/yolov3.weights",
-            "pi_hash": "523e4e69e1d015393a1b0a441cef1d9c7659e3eb2d7e15f793f060a21b32f297"
+            "pi_hash": "YOLOV3_WEIGHTS_HASH"
         }
     ],
     "programs": [
@@ -51,7 +51,7 @@
                 }
             ],
             "id": 0,
-            "pi_hash": "7612e3490f14a9ee523f357e86f97098a94678f4e06c8202cf307d163db9f7aa",
+            "pi_hash": "PROGRAM_HASH",
             "program_file_name": "/program/detector.wasm"
         }
     ],

i-poc/iotex-user-app/function_policy_small.json

@@ -7,15 +7,15 @@
     "data_files": [
         {
             "data_file": "/program_data/coco.names",
-            "pi_hash": "634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84"
+            "pi_hash": "COCO_HASH"
         },
         {
             "data_file": "/program_data/yolov3.cfg",
-            "pi_hash": "15bd05a05354738b051e5f5b1ad6d2eb800b866c63be3d1766bf168960e8d950"
+            "pi_hash": "YOLOV3_CFG_HASH"
         },
         {
             "data_file": "/program_data/yolov3.weights",
-            "pi_hash": "dccea06f59b781ec1234ddf8d1e94b9519a97f4245748a7d4db75d5b7080a42c"
+            "pi_hash": "YOLOV3_WEIGHTS_HASH"
         }
     ],
     "programs": [
@@ -51,7 +51,7 @@
                 }
             ],
             "id": 0,
-            "pi_hash": "7612e3490f14a9ee523f357e86f97098a94678f4e06c8202cf307d163db9f7aa",
+            "pi_hash": "PROGRAM_HASH",
             "program_file_name": "/program/detector.wasm"
         }
     ],

i-poc/iotex-user-app/register-function-aux.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+function pretty_print_wget() {
+	echo "$1" | jq 2>/dev/null
+	if [ $? -gt 0 ]
+	then
+		echo "$1"
+	else
+		if [ ! -z "$2" ]
+		then
+			echo "$1" | jq 2>/dev/null > $2
+		fi
+	fi
+	if [ ! -z "$3" ]
+	then
+		echo "$1" >  $3
+	fi
+}
+
+function load_file_veracruz() {
+	FUNCTION_NAME=$1
+	TYPE_LOAD=$2 # program or data_file
+	PROGRAM_NAME=$3
+	LOCAL_FILE_NAME=$4
+
+	if [ ! -e "${LOCAL_FILE_NAME}" ]
+	then
+		echo "ERROR: file \"${LOCAL_FILE_NAME}\" does not exist, bailing out"
+		exit 1
+	fi
+
+	pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file="${LOCAL_FILE_NAME}" http://${CCFAAS_HOST}:${CCFAAS_PORT}/function/${FUNCTION_NAME}/${TYPE_LOAD}/$(echo -n "${PROGRAM_NAME}" | base64) 2>&1)"
+}

i-poc/iotex-user-app/register-function-big.sh

@@ -1,41 +1,41 @@
 #!/bin/bash
 
-HOSTIP=127.0.0.1
-HOSTPORT=5010
-JSON_FUNCTION_POLICY=$(cat function_policy_big.json)
+CCFAAS_HOST=${1:-"127.0.0.1"}
+CCFAAS_PORT=${2:-"5010"}
+
+echo "Acessing CCFaaS at ${CCFAAS_HOST}:${CCFAAS_PORT}"
+
 FUNCTION_NAME="vod_big"
 
-BUNDLE_PATH="."
-client_path="../../veracruz-client"
-PROGRAM_PATH="."
-
-function pretty_print_wget() {
-	echo "$1" | jq 2>/dev/null
-	if [ $? -gt 0 ]
-	then
-		echo "$1"
-	else
-		if [ ! -z "$2" ]
-		then
-			echo "$1" | jq 2>/dev/null > $2
-		fi
-	fi
-	if [ ! -z "$3" ]
-	then
-		echo "$1" >  $3
-	fi
-}
+
+TAG="iotex-demo-v1.3.3"
+
+BUNDLE_PATH="big-"${TAG}
+
+. register-function-aux.sh
+
+if [ ! -e "${BUNDLE_PATH}/detector.wasm" ]; then
+		echo "=============Downloading tarball containing the program, program data (model and configuration) and example inputs (encrypted video, key, IV)"
+		wget -q --content-on-error -nv https://github.com/veracruz-project/video-object-detection/releases/download/${TAG}/bundle_big.tar.gz
+		mkdir ${BUNDLE_PATH}
+		tar -xf bundle_big.tar.gz -C ${BUNDLE_PATH}
+fi
+PROGRAM_HASH=$(sha256sum "${BUNDLE_PATH}/detector.wasm" | cut -d " "  -f 1)
+COCO_HASH=$(sha256sum "${BUNDLE_PATH}/coco.names" | cut -d " "  -f 1)
+YOLOV3_CFG_HASH=$(sha256sum "${BUNDLE_PATH}/yolov3.cfg" | cut -d " "  -f 1)
+YOLOV3_WEIGHTS_HASH=$(sha256sum "${BUNDLE_PATH}/yolov3.weights" | cut -d " "  -f 1)
+JSON_FUNCTION_POLICY=$(cat function_policy_big.json | sed -e "s/PROGRAM_HASH/${PROGRAM_HASH}/g" -e "s/COCO_HASH/${COCO_HASH}/g" -e "s/YOLOV3_CFG_HASH/${YOLOV3_CFG_HASH}/g" -e "s/YOLOV3_WEIGHTS_HASH/${YOLOV3_WEIGHTS_HASH}/g")
 
 echo "=============Deleting function"
-pretty_print_wget "$(curl -X DELETE http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME} 2>&1)"
+pretty_print_wget "$(curl -X DELETE http://${CCFAAS_HOST}:${CCFAAS_PORT}/function/${FUNCTION_NAME} 2>&1)"
 
 echo "=============Registering function"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-data="${JSON_FUNCTION_POLICY}" --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function 2>&1)"
+pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-data="${JSON_FUNCTION_POLICY}" --header='Content-Type:application/json' http://${CCFAAS_HOST}:${CCFAAS_PORT}/function 2>&1)"
 
 echo "=============Provisioning program"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$PROGRAM_PATH/detector.wasm --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/program/$(echo -n "/program/detector.wasm" | base64) 2>&1)"
+load_file_veracruz "${FUNCTION_NAME}" "program" "/program/detector.wasm" "${BUNDLE_PATH}/detector.wasm" 
 
 echo "=============Provisioning data"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/coco.names --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/coco.names" | base64) 2>&1)"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/yolov3.cfg --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/yolov3.cfg" | base64) 2>&1)"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/yolov3.weights --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/yolov3.weights" | base64) 2>&1)"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/coco.names" "${BUNDLE_PATH}/coco.names"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/yolov3.cfg" "${BUNDLE_PATH}/yolov3.cfg"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/yolov3.weights" "${BUNDLE_PATH}/yolov3.weights"

i-poc/iotex-user-app/register-function-small.sh

@@ -1,41 +1,40 @@
 #!/bin/bash
 
-HOSTIP=127.0.0.1
-HOSTPORT=5010
-JSON_FUNCTION_POLICY=$(cat function_policy_small.json)
+CCFAAS_HOST=${1:-"127.0.0.1"}
+CCFAAS_PORT=${2:-"5010"}
+
+echo "Acessing CCFaaS at ${CCFAAS_HOST}:${CCFAAS_PORT}"
+
 FUNCTION_NAME="vod_small"
 
-BUNDLE_PATH="."
-client_path="../../veracruz-client"
-PROGRAM_PATH="."
-
-function pretty_print_wget() {
-	echo "$1" | jq 2>/dev/null
-	if [ $? -gt 0 ]
-	then
-		echo "$1"
-	else
-		if [ ! -z "$2" ]
-		then
-			echo "$1" | jq 2>/dev/null > $2
-		fi
-	fi
-	if [ ! -z "$3" ]
-	then
-		echo "$1" >  $3
-	fi
-}
+TAG="iotex-demo-v1.3.3"
+
+BUNDLE_PATH="small-"${TAG}
+
+. register-function-aux.sh
+
+if [ ! -e "${BUNDLE_PATH}/detector.wasm" ]; then
+		echo "=============Downloading tarball containing the program, program data (model and configuration) and example inputs (encrypted video, key, IV)"
+		wget -q --content-on-error -nv https://github.com/veracruz-project/video-object-detection/releases/download/${TAG}/bundle_small.tar.gz
+		mkdir ${BUNDLE_PATH}
+		tar -xf bundle_small.tar.gz -C ${BUNDLE_PATH}
+fi
+PROGRAM_HASH=$(sha256sum "${BUNDLE_PATH}/detector.wasm" | cut -d " "  -f 1)
+COCO_HASH=$(sha256sum "${BUNDLE_PATH}/coco.names" | cut -d " "  -f 1)
+YOLOV3_CFG_HASH=$(sha256sum "${BUNDLE_PATH}/yolov3-tiny.cfg" | cut -d " "  -f 1)
+YOLOV3_WEIGHTS_HASH=$(sha256sum "${BUNDLE_PATH}/yolov3-tiny.weights" | cut -d " "  -f 1)
+JSON_FUNCTION_POLICY=$(cat function_policy_small.json | sed -e "s/PROGRAM_HASH/${PROGRAM_HASH}/g" -e "s/COCO_HASH/${COCO_HASH}/g" -e "s/YOLOV3_CFG_HASH/${YOLOV3_CFG_HASH}/g" -e "s/YOLOV3_WEIGHTS_HASH/${YOLOV3_WEIGHTS_HASH}/g")
 
 echo "=============Deleting function"
-pretty_print_wget "$(curl -X DELETE http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME} 2>&1)"
+pretty_print_wget "$(curl -X DELETE http://${CCFAAS_HOST}:${CCFAAS_PORT}/function/${FUNCTION_NAME} 2>&1)"
 
 echo "=============Registering function"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-data="${JSON_FUNCTION_POLICY}" --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function 2>&1)"
+pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-data="${JSON_FUNCTION_POLICY}" --header='Content-Type:application/json' http://${CCFAAS_HOST}:${CCFAAS_PORT}/function 2>&1)"
 
 echo "=============Provisioning program"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$PROGRAM_PATH/detector.wasm --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/program/$(echo -n "/program/detector.wasm" | base64) 2>&1)"
+load_file_veracruz "${FUNCTION_NAME}" "program" "/program/detector.wasm" "${BUNDLE_PATH}/detector.wasm" 
 
 echo "=============Provisioning data"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/coco.names --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/coco.names" | base64) 2>&1)"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/yolov3-tiny.cfg --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/yolov3.cfg" | base64) 2>&1)"
-pretty_print_wget "$(wget -q --content-on-error -nv  -O- --post-file=$BUNDLE_PATH/input/yolov3-tiny.weights --header='Content-Type:application/json' http://${HOSTIP}:${HOSTPORT}/function/${FUNCTION_NAME}/data_file/$(echo -n "/program_data/yolov3.weights" | base64) 2>&1)"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/coco.names" "${BUNDLE_PATH}/coco.names"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/yolov3.cfg" "${BUNDLE_PATH}/yolov3-tiny.cfg"
+load_file_veracruz "${FUNCTION_NAME}" "data_file" "/program_data/yolov3.weights" "${BUNDLE_PATH}/yolov3-tiny.weights"

i-poc/main-k3s/config.vars.template

@@ -1,6 +1,6 @@
 EXTERNAL_IP_USE=<IP to be used for external access, normally one of the internal IPs of one of the nodes of k8s in AWS (172.31.xxxx)>
 VERACRUZ_MIN_PORT_USE=<Smallest port number to be used for a veracruz instance, default is 3014>
-VERACRUZ_MIN_PORT_USE=<Largest number to be used for a veracruz instance, default is 3016>
+VERACRUZ_MAX_PORT_USE=<Largest number to be used for a veracruz instance, default is 3016>
 VERACRUZ_ENDPOINT_HOSTNAME_USE=<hostname.domainame that will be used on the policy for users to access the endpoint, external name AWS is recommended>
 RUNTIME_HUGHEPAGES_SIZE_USE=2048 # In MBytes
 RUNTIME_POD_SIZE_USE=500 # In MBytes

i-poc/main-k3s/iotex-s3-app-deploy.yaml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: iotex-s3-app
-        image: veracruz/iotex-s3-veracruz-app:0.8.4
+        image: veracruz/iotex-s3-veracruz-app:0.8.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 5000

i-poc/main-k3s/veracruz-ccfaas-app-deploy.yaml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: ccfaas-server-app
-        image: veracruz/veracruz-ccfaas-server:0.87.26
+        image: veracruz/veracruz-ccfaas-server:0.87.28
         imagePullPolicy: IfNotPresent
         env:
         - name: VAAS_ACCESS_URL

i-poc/main-k3s/veracruz-nitro-proxy-deploy.yaml

@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
       - name: veracruz-nitro-proxy
-        image: veracruz/veracruz-nitro:v1.2.0
+        image: veracruz/veracruz-nitro:v1.3.3
         imagePullPolicy: IfNotPresent
         command: ['/work/proxy-attestation-server/proxy-attestation-server','0.0.0.0:3010','--ca-cert','/work/proxy-config-files/CACert.pem','--ca-key','/work/proxy-config-files/CAKey.pem']
         ports:

i-poc/main-k3s/veracruz-vaas-app-deploy.yaml.template

@@ -91,7 +91,7 @@ spec:
           value: |
                REPLACE_CACERT_PEM
         - name: RUNTIME_MANAGER_IMAGE
-          value: "veracruz/veracruz-nitro:v1.2.0"
+          value: "veracruz/veracruz-nitro:v1.3.3"
         - name: RUNTIME_MANAGER_HASH_NITRO
           value: RUNTIME_MANAGER_HASH_NITRO_USE
         ports:

i-poc/vaas-server/Dockerfile

@@ -10,7 +10,7 @@
 # and copyright information.
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update -y;apt-get upgrade -y;apt-get install -y curl python3-pip;apt-get -y clean
 

i-poc/vaas-server/Makefile

@@ -11,12 +11,12 @@
 #
 #
 #
-VERSION=0.86.10
+VERSION=0.86.11
 
 all: image
 
 veracruz-vaas-server.imageOK: Dockerfile vaas-server.py vaas-server.sh veracruz-clean-leftover-k8s-objects.sh
-	docker build -t veracruz-vaas-server:$(VERSION) .
+	docker build --output type=docker -t veracruz-vaas-server:$(VERSION) .
 	touch veracruz-vaas-server.imageOK
 
 .PHONY: