Enforce prefix in AssertionLogic Item src (#2601)

tee-worker/litentry/core/credentials/src/assertion_logic.rs

@@ -78,7 +78,13 @@ impl AssertionLogic {
 	}
 
 	pub fn new_item<T: ToString>(src: T, op: Op, dst: T) -> Self {
-		Self::Item { src: src.to_string(), op, dst: dst.to_string() }
+		let mut src_string = src.to_string();
+		let prefix = '$';
+		if !src_string.starts_with(prefix) {
+			log::warn!("AssertionLogic::new_item - src missing $ prefix: {}", src_string);
+			src_string.insert(0, prefix);
+		}
+		Self::Item { src: src_string, op, dst: dst.to_string() }
 	}
 	pub fn add_item(mut self, item: AssertionLogic) -> Self {
 		match &mut self {
@@ -90,27 +96,6 @@ impl AssertionLogic {
 	}
 }
 
-pub trait Logic {
-	fn eval(&self) -> bool;
-}
-
-impl Logic for AssertionLogic {
-	fn eval(&self) -> bool {
-		match self {
-			Self::Item { src, op, dst } => match op {
-				Op::GreaterThan => src > dst,
-				Op::LessThan => src < dst,
-				Op::GreaterEq => src >= dst,
-				Op::LessEq => src <= dst,
-				Op::Equal => src == dst,
-				Op::NotEq => src != dst,
-			},
-			Self::And { items } => items.iter().all(|item| item.eval()),
-			Self::Or { items } => items.iter().any(|item| item.eval()),
-		}
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -145,11 +130,20 @@ mod tests {
 	}
 
 	#[test]
-	fn assertion_a1_eval_works() {
-		let web2_item = AssertionLogic::new_item("7", Op::GreaterEq, "7");
-		let web3_item = AssertionLogic::new_item("7", Op::GreaterThan, "3");
+	fn assertion_new_item_adds_dollar_prefix_if_missing() {
+		let item = AssertionLogic::new_item("some_src", Op::GreaterEq, "7");
+		assert_eq!(
+			item,
+			AssertionLogic::Item { src: "$some_src".into(), op: Op::GreaterEq, dst: "7".into() }
+		);
+	}
 
-		let a1 = AssertionLogic::new_or().add_item(web2_item).add_item(web3_item);
-		assert_eq!(a1.eval(), true);
+	#[test]
+	fn assertion_new_item_preserves_dollar_prefix_if_present() {
+		let item = AssertionLogic::new_item("$some_src", Op::GreaterEq, "7");
+		assert_eq!(
+			item,
+			AssertionLogic::Item { src: "$some_src".into(), op: Op::GreaterEq, dst: "7".into() }
+		);
 	}
 }