working version of the demo on GCP

Roy Kaufman · Roy Kaufman · commit c84a30a93df2 · 2025-11-16T16:04:41.000+02:00
diff --git a/configs/trustee-gcp.bu b/configs/trustee-gcp.bu
@@ -42,7 +42,7 @@ storage:
     - path: /var/kbs/config/kbs-config.toml
       mode: 0644
       contents:
-        local: config/kbs-config.toml
+        local: kbs-config.toml
     - path: /etc/containers/systemd/kbs.container
       mode: 0644
       contents:
diff --git a/configs/trustee-gcp/containers/kbc.container b/configs/trustee-gcp/containers/kbc.container
@@ -4,7 +4,7 @@ After=key-generation.container
 
 [Container]
 ContainerName=kbs-client
-Image=quay.io/rkaufman/kbs-tpm-snp:latest
+Image=quay.io/rkaufman/kbs-tpm-snp:v1
 Network=host
 Volume=user-keys:/opt/confidential-containers/kbs/user-keys
 Exec=tail -f /dev/null
diff --git a/configs/trustee-gcp/containers/kbs.container b/configs/trustee-gcp/containers/kbs.container
@@ -4,7 +4,7 @@ After=key-generation.container
 
 [Container]
 ContainerName=kbs
-Image=quay.io/rkaufman/kbs-tpm-snp:latest
+Image=quay.io/rkaufman/kbs-tpm-snp:v1
 Network=host
 Entrypoint=/usr/local/bin/kbs
 PublishPort=8080:8080
diff --git a/configs/trustee-gcp/containers/key-generation.container b/configs/trustee-gcp/containers/key-generation.container
diff --git a/configs/trustee-gcp/containers/nginx.container b/configs/trustee-gcp/containers/nginx.container
diff --git a/configs/trustee-gcp/kbs-config.toml b/configs/trustee-gcp/kbs-config.toml
diff --git a/configs/trustee-gcp/populate_kbs.sh b/configs/trustee-gcp/populate_kbs.sh
@@ -2,27 +2,22 @@
 
 set -xe
 
-KBS=kbs:8080
 SECRET_PATH=${SECRET_PATH:=default/machine/root}
 KEY=${KEY:=/opt/confidential-containers/kbs/user-keys/private.key}
 
 
 ## set reference values for TPM 
-podman exec -ti kbs-client \
-	kbs-client --url http://${KBS}  config \
-		--auth-private-key ${KEY} \
-		set-sample-reference-value tpm_svn "1"
 for i in {7,14}; do
     value=$(sudo tpm2_pcrread sha256:${i} | awk -F: '/0x/ {sub(/.*0x/, "", $2); gsub(/[^0-9A-Fa-f]/, "", $2); print tolower($2)}')
 	podman exec -ti kbs-client \
-		 kbs-client --url http://${KBS}  config \
+		 kbs-client  config \
 			--auth-private-key ${KEY} \
 			set-sample-reference-value tpm_pcr${i} "${value}"
 done
 
 # Check reference values
 podman exec -ti kbs-client \
-	kbs-client --url http://${KBS}  config \
+	kbs-client  config \
 		--auth-private-key ${KEY} \
 		get-reference-values
 
@@ -41,30 +36,29 @@ default configuration := 2
 ##### TPM
 
 hardware := 2 if {
-	input.tpm.svn in data.reference.tpm_svn
-	input.tpm.pcrs[7] in data.reference.tpm_pcr7
-    input.tpm.pcrs[14] in data.reference.tpm_pcr14
+	input.tpm.pcr07 in data.reference.tpm_pcr7
+    input.tpm.pcr14 in data.reference.tpm_pcr14
 }
 
 hardware := 2 if {
-	input.snp.reported_tcb_snp == 25
+	input.snp.reported_tcb_snp == 27
 }
 
 
 ##### Final decision
-allow if {
-  hardware == 2
-  executables == 3
-  configuration == 2
+result := {
+	"executables": executables,
+	"hardware": hardware,
+	"configuration": configuration
 }
 EOF
 
 podman cp A_policy.rego kbs-client:/A_policy.rego
 podman exec -ti kbs-client \
-	kbs-client --url http://${KBS}  config \
+	kbs-client  config \
 		--auth-private-key ${KEY} \
 		set-attestation-policy \
-		--policy-file A_policy.rego \
+		--policy-file /A_policy.rego \
 		--type rego --id default_cpu
 
 # Upload resource
@@ -73,7 +67,7 @@ cat > secret << EOF
 EOF
 podman cp secret kbs-client:/secret
 podman exec -ti kbs-client \
-	kbs-client --url http://${KBS}  config \
+	kbs-client  config \
 		--auth-private-key ${KEY} \
 		set-resource --resource-file /secret \
 		--path ${SECRET_PATH}
@@ -98,7 +92,7 @@ EOF
 
 podman cp R_policy.rego kbs-client:/R_policy.rego
 podman exec -ti kbs-client \
-	kbs-client --url http://${KBS}  config \
+	kbs-client  config \
 		--auth-private-key ${KEY} \
 		set-resource-policy \
-		--policy-file R_policy.rego \
+		--policy-file /R_policy.rego \
diff --git a/coreos/justfile b/coreos/justfile
@@ -34,7 +34,7 @@ osbuild:
     SELINUX_STATUS=$(getenforce)
 
     if [ "$SELINUX_STATUS" = "Enforcing" ]; then
-        sudo setenforce 0
+        echo "WARNING: SELinux is in Enforcing mode. Temporarily disabling for osbuild operation..."
     fi
 
     TMPDIR=$(mktemp -d)
@@ -46,6 +46,3 @@ osbuild:
     rm -rf "$TMPDIR"
     sudo chown $USER:$USER {{os}}-{{platform}}.x86_64.*
 
-    if [ "$SELINUX_STATUS" = "Enforcing" ]; then
-        sudo setenforce 1
-    fi
diff --git a/pin-trustee.bu b/pin-trustee.bu
@@ -0,0 +1,21 @@
+variant: fcos
+version: 1.6.0
+storage:
+  luks:
+    - name: root
+      label: luks-root
+      device: /dev/disk/by-partlabel/root
+      uuid: "8ec9cda3-6b77-45d7-bb56-a95cd9e83234"
+      clevis:
+        custom:
+          needs_network: true
+          pin: trustee
+          config: '{"servers":[{"url":"http://demo-trustee:8080","cert":""}],"path":"default/machine/root"}'
+      wipe_volume: true
+  filesystems:
+    - device: /dev/mapper/root
+      format: ext4
+      wipe_filesystem: true
+      label: root
+      uuid: "910678ff-f77e-4a7d-8d53-86f2ac47a823"
+      options: [ "-O", "verity"]
diff --git a/run.sh b/run.sh
@@ -0,0 +1,13 @@
+gcloud compute instances create roy-vm             \
+    --image-family "rhel-9" \
+    --image-project "rhel-cloud" \
+    --metadata "ssh-keys=rkaufman:$(cat ~/.ssh/google_compute_engine.pub)" \
+    --boot-disk-size "100GB"                           \
+    --confidential-compute-type "SEV_SNP"               \
+    --machine-type "n2d-standard-2"                    \
+    --maintenance-policy terminate                      \
+    --zone "us-central1-a"                                 \
+    --subnet "roy-subnet-us-central1"                   \
+    --shielded-vtpm \
+    --shielded-integrity-monitoring \
+    --shielded-secure-boot
diff --git a/scripts/GCP/README.md b/scripts/GCP/README.md
@@ -14,7 +14,7 @@ This guide provides step-by-step instructions for setting up remote attestation
 
 1. To deploy the Trustee server, run:
 ```bash
-./trustee-on-GCP/scripts/deploy-trustee.sh -k <SSH_KEY> -b ./trustee-on-GCP/trustee/trustee.bu -i <IMAGE_NAME>
+./scripts/GCP/deploy-trustee.sh -k <SSH_KEY> -b ./configs/trustee-gcp.bu -i <IMAGE_NAME>
 ```
 2. After the server is up, populate the KBS with the reference value and add the remote ignition file:
 ```bash
@@ -29,17 +29,17 @@ This guide provides step-by-step instructions for setting up remote attestation
     ```bash
     cd coreos
     just clevis_pin_trustee_image=quay.io/rkaufman/clevis-pin-trustee:latest os=scos base=quay.io/okd/scos-content:4.20.0-okd-scos.6-stream-coreos \
-    kbc_image=quay.io/rkaufman/kbs-tpm-snp:latest platform=gcp build oci-archive osbuild
+    kbc_image=quay.io/rkaufman/kbs-tpm-snp:v1 platform=gcp build oci-archive osbuild
     ```
 
 2. Upload the image to GCP by running:
     ```bash
-    ./trustee-on-GCP/scripts/upload_image_gcp.sh <BUCKET_NAME> <IMAGE_NAME>
+    ./scripts/GCP/upload_image_gcp.sh <BUCKET_NAME> <IMAGE_NAME>
     ```
 
 3. Deploy the client by running:
     ```bash
-    ./trustee-on-GCP/scripts/deploy-client.sh -k <SSH_KEY> -b ./rh-coreos/luks.bu -n <VM_NAME> -i <IMAGE_NAME>
+    ./scripts/GCP/deploy-vm.sh -k <SSH_KEY> -b ./configs/luks.bu -n <VM_NAME> -i <IMAGE_NAME> -h <HOSTNAME>
     ```
     This will create the VM, perform attestation, and decrypt the disk using clevis-pin.
 
diff --git a/scripts/GCP/deploy-trustee.sh b/scripts/GCP/deploy-trustee.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IGNITION_FILE="config.ign"
-IGNITION_CONFIG="$(pwd)/trustee-on-GCP/${IGNITION_FILE}"
+IGNITION_CONFIG="$(pwd)/configs/${IGNITION_FILE}"
 
 
 TRUSTEE_PORT=""
@@ -11,7 +11,7 @@ set -xe
 
 VM_NAME="kbs"
 
-while getopts "k:b:n:f p:s:d:t:i:" opt; do
+while getopts "k:b:n:i:" opt; do
   case $opt in
 	k) key=$OPTARG ;;
 	b) butane=$OPTARG ;;
@@ -40,8 +40,8 @@ KEY=$(cat "$key")
 sed "s|<KEY>|$KEY|g" "$butane" >"${bufile}"
 
 podman run --interactive --rm --security-opt label=disable \
-	--volume "$(pwd)/trustee-on-GCP":/pwd -v "${bufile}":/config.bu:z --workdir /pwd quay.io/coreos/butane:release \
-	--pretty --strict /config.bu --output "/pwd/${IGNITION_FILE}" -d /pwd/trustee
+	--volume "$(pwd)/configs":/pwd -v "${bufile}":/config.bu:z --workdir /pwd quay.io/coreos/butane:release \
+	--pretty --strict /config.bu --output "/pwd/${IGNITION_FILE}" -d /pwd/trustee-gcp
 
 chcon --verbose --type svirt_home_t ${IGNITION_CONFIG}
 
diff --git a/scripts/GCP/deploy-vm.sh b/scripts/GCP/deploy-vm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IGNITION_FILE="config.ign"
-IGNITION_CONFIG="$(pwd)/trustee-on-GCP/${IGNITION_FILE}"
+IGNITION_CONFIG="$(pwd)/${IGNITION_FILE}"
 
 
 TRUSTEE_PORT=""
@@ -10,12 +10,13 @@ set -xe
 
 
 force=false
-while getopts "k:b:n:f p:s:d:t:i:" opt; do
+while getopts "k:b:n:i:h:" opt; do
   case $opt in
 	k) key=$OPTARG ;;
 	b) butane=$OPTARG ;;
 	n) VM_NAME=$OPTARG ;;
 	i) IMAGE=$OPTARG ;;
+	h) hostname=$OPTARG ;;
 	\?) echo "Invalid option"; exit 1 ;;
   esac
 done
@@ -41,10 +42,10 @@ fi
 
 KEY=$(cat "$key")
 
-sed "s|<KEY>|$key|g" $butane | sed "s/<IP>/kbs/" > "${bufile}"
+sed "s|<KEY>|$KEY|g" $butane | sed "s/<IP>/$hostname/" > "${bufile}"
 
 podman run --interactive --rm --security-opt label=disable \
-	--volume "$(pwd)/trustee-on-GCP":/pwd -v "${bufile}":/config.bu:z --workdir /pwd quay.io/confidential-clusters/butane:clevis-pin-trustee \
+	--volume "$(pwd)":/pwd -v "${bufile}":/config.bu:z --workdir /pwd quay.io/confidential-clusters/butane:clevis-pin-trustee \
 	--pretty --strict /config.bu --output "/pwd/${IGNITION_FILE}" -d /pwd/rh-coreos
 
 chcon --verbose --type svirt_home_t ${IGNITION_CONFIG}
diff --git a/scripts/GCP/network_setup.sh b/scripts/GCP/network_setup.sh
diff --git a/scripts/GCP/upload_image_gcp.sh b/scripts/GCP/upload_image_gcp.sh
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -7,12 +7,14 @@ create_remote_ign_config ()
 	BUTANE=pin-trustee.bu
 	IGNITION="${BUTANE%.bu}.ign"
 
-	sed "s/<IP>/$IP/" configs/remote-ign/${BUTANE} > tmp/${BUTANE}
+	sed "s/<IP>/$IP/" configs/remote-ign/${BUTANE} > ${BUTANE}
 
 	podman run --interactive --rm --security-opt label=disable \
-		--volume "$(pwd)/tmp:/pwd" \
+		--volume "$(pwd):/pwd" \
 		--workdir /pwd \
 		quay.io/confidential-clusters/butane:clevis-pin-trustee \
 		--pretty --strict /pwd/$BUTANE --output "/pwd/$IGNITION"
-	echo "$IGNITION"
+		
+	echo "./$IGNITION"
+	
 }
diff --git a/scripts/populate-trustee-kbs.sh b/scripts/populate-trustee-kbs.sh
@@ -30,27 +30,16 @@ until ssh core@$IP \
 done
 
 # Setup remote ignition config
-IGNITION=$(create_remote_ign_config)
-BUTANE=pin-trustee.bu
-IGNITION="${BUTANE%.bu}.ign"
-
 HOSTNAME=$3
 if [[ ${HOSTNAME} == "" ]]; then 
 HOSTNAME=${IP}
 fi
-sed "s/<IP>/$HOSTNAME/" configs/remote-ign/${BUTANE} > ${BUTANE}
-
-podman run --interactive --rm --security-opt label=disable \
-	--volume "$(pwd):/pwd" \
-	--workdir /pwd \
-	quay.io/confidential-clusters/butane:clevis-pin-trustee \
-	--pretty --strict /pwd/$BUTANE --output "/pwd/$IGNITION"
-
+IGNITION=$(create_remote_ign_config $HOSTNAME)
 scp -i "${KEY%.*}" \
 	-o StrictHostKeyChecking=no \
 	-o UserKnownHostsFile=/dev/null \
-	/${IGNITION} core@$IP:
-
+	./${IGNITION} core@$IP:
+# Setup remote web server to serve the ignition file
 ssh core@$IP \
 	-i "${KEY%.*}" \
 	-o StrictHostKeyChecking=no \
