chore: grab json value from object given path

Author: 0xJepsen

README.md

@@ -37,8 +37,8 @@ If you have any questions, please reach out to any of Pluto's [team members](htt
 ### Usage
 
 ```
-cargo run -p notary -- --config ./fixture/notary-config.toml
-cargo run -p client -- --config ./fixture/client.proxy.json
+cargo run -p web-prover-notary -- --config ./fixture/notary-config.toml  
+cargo run -p web-prover-client -- --config ./fixture/client.proxy.json 
 ```
 
 ## Security Status

notary/src/error.rs

@@ -44,14 +44,21 @@ pub enum NotaryServerError {
   #[error("Error occurred from reasing server config: {0}")]
   ServerConfigError(String),
 
-  // TODO: Update to contain feedback
-  #[error("Manifest-request mismatch")]
+  #[error("Manifest request mismatch")]
   ManifestRequestMismatch,
 
-  // TODO: Update to contain feedback
-  #[error("Manifest-response mismatch")]
+  #[error("Manifest response mismatch")]
   ManifestResponseMismatch,
 
+  #[error("Manifest missing")]
+  ManifestMissing,
+
+  #[error("Missing Origo secrets")]
+  MissingOrigoSecrets,
+
+  #[error("JSON path not found")]
+  JsonPathNotFound,
+
   #[error(transparent)]
   ProxyError(#[from] ProxyError),
 

notary/src/proxy.rs

@@ -7,11 +7,12 @@ use axum::{
 use reqwest::{Request, Response};
 use serde::Deserialize;
 use serde_json::Value;
-use tracing::info;
+use tracing::{debug, info};
 use uuid::Uuid;
 use web_prover_core::{
   http::{
-    ManifestRequest, ManifestResponse, ManifestResponseBody, NotaryResponse, NotaryResponseBody,
+    JsonKey, ManifestRequest, ManifestResponse, ManifestResponseBody, NotaryResponse,
+    NotaryResponseBody,
   },
   manifest::Manifest,
   proof::{TeeProof, TeeProofData},
@@ -57,7 +58,12 @@ pub async fn proxy(
   let response = from_reqwest_response(reqwest_response).await;
   // debug!("{:?}", response);
 
+  if !response.matches_client_manifest(&payload.manifest.response) {
+    return Err(NotaryServerError::ManifestResponseMismatch);
+  }
+
   let tee_proof = create_tee_proof(&payload.manifest, &request, &response, State(state))?;
+  debug!("{:?}", tee_proof);
 
   Ok(Json(tee_proof))
 }
@@ -122,8 +128,9 @@ pub fn create_tee_proof(
   State(state): State<Arc<SharedState>>,
 ) -> Result<TeeProof, NotaryServerError> {
   validate_notarization_legal(manifest, request, response)?;
-
-  let value = response.notary_response_body.clone().json.unwrap();
+  let path = manifest.response.body.json_path.clone();
+  let body = response.notary_response_body.clone().json.unwrap();
+  let value = get_value_from_json_path(&body, &path);
   let serialized_value = serde_json::to_string(&value).unwrap();
   let manifest_hash = manifest.to_keccak_digest()?;
   let to_sign = VerifyOutput { value: serialized_value.clone(), manifest: manifest.clone() };
@@ -149,3 +156,61 @@ fn validate_notarization_legal(
   }
   Ok(())
 }
+
+fn get_value_from_json_path(json_body: &Value, path: &[JsonKey]) -> Value {
+  let mut current = json_body;
+  for key in path {
+    current = match key {
+      JsonKey::String(s) => current.get(s),
+      JsonKey::Num(n) => current.get(n),
+    }
+    .unwrap();
+  }
+  current.clone()
+}
+
+#[test]
+fn test_get_value_from_json_path() {
+  let json_body = json!({
+    "foo": {
+      "bar": "baz"
+    }
+  });
+  let path = vec![JsonKey::String("foo".to_string()), JsonKey::String("bar".to_string())];
+  let value = get_value_from_json_path(&json_body, &path).unwrap();
+  assert_eq!(value, "baz");
+}
+
+#[test]
+fn test_get_value_from_json_path_num() {
+  let json_body = json!({
+    "foo": [1, 2, 3]
+  });
+  let path = vec![JsonKey::String("foo".to_string()), JsonKey::Num(1)];
+  let value = get_value_from_json_path(&json_body, &path).unwrap();
+  assert_eq!(value, 2);
+}
+
+#[test]
+fn test_get_value_from_json_path_bool() {
+  let json_body = json!({
+    "foo": {
+      "bar": true
+    }
+  });
+  let path = vec![JsonKey::String("foo".to_string()), JsonKey::String("bar".to_string())];
+  let value = get_value_from_json_path(&json_body, &path).unwrap();
+  assert_eq!(value, true);
+}
+
+#[test]
+fn test_get_value_from_json_path_null() {
+  let json_body = json!({
+    "foo": {
+      "bar": null
+    }
+  });
+  let path = vec![JsonKey::String("foo".to_string()), JsonKey::String("bar".to_string())];
+  let value = get_value_from_json_path(&json_body, &path).unwrap();
+  assert_eq!(value, Value::Null);
+}