From 7f45726b9068b04b962ead84b238d8b73cb1822f Mon Sep 17 00:00:00 2001
From: Tobin Feldman-Fitzthum <tobin@ibm.com>
Date: Tue, 2 Jan 2024 15:18:40 -0600
Subject: [PATCH] sample: always enable sample attester

Rather than setting an environment variable to enable
the sample attester, always enable it as a fallback.

Signed-off-by: Tobin Feldman-Fitzthum <tobin@ibm.com>
---
 attestation-agent/attester/src/lib.rs        | 9 +++++----
 attestation-agent/attester/src/sample/mod.rs | 6 ++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/attestation-agent/attester/src/lib.rs b/attestation-agent/attester/src/lib.rs
index d1fd146ad..34bd20d6a 100644
--- a/attestation-agent/attester/src/lib.rs
+++ b/attestation-agent/attester/src/lib.rs
@@ -78,10 +78,6 @@ pub trait Attester {
 
 // Detect which TEE platform the KBC running environment is.
 pub fn detect_tee_type() -> Option<Tee> {
-    if sample::detect_platform() {
-        return Some(Tee::Sample);
-    }
-
     #[cfg(feature = "tdx-attester")]
     if tdx::detect_platform() {
         return Some(Tee::Tdx);
@@ -117,5 +113,10 @@ pub fn detect_tee_type() -> Option<Tee> {
         return Some(Tee::Cca);
     }
 
+    // Always detected
+    if sample::detect_platform() {
+        return Some(Tee::Sample);
+    }
+
     None
 }
diff --git a/attestation-agent/attester/src/sample/mod.rs b/attestation-agent/attester/src/sample/mod.rs
index e9a0af29c..1ee6ee63e 100644
--- a/attestation-agent/attester/src/sample/mod.rs
+++ b/attestation-agent/attester/src/sample/mod.rs
@@ -7,12 +7,10 @@ use super::Attester;
 use anyhow::*;
 use base64::Engine;
 use serde::{Deserialize, Serialize};
-use std::env;
 
-// If the environment variable "AA_SAMPLE_ATTESTER_TEST" is set,
-// the TEE platform is considered as "sample".
+// Sample attester is always supported
 pub fn detect_platform() -> bool {
-    env::var("AA_SAMPLE_ATTESTER_TEST").is_ok()
+    true
 }
 
 // A simple example of TEE evidence.