From 275e4d5c49bb2f5cf145ec84ff6e51ef253ffb86 Mon Sep 17 00:00:00 2001
From: neithanmo <neithanmo@gmail.com>
Date: Tue, 10 Sep 2024 08:45:56 -0600
Subject: [PATCH] Update sender verification to follow what they suggested

---
 app/rust/src/ffi/verify_certificate.rs | 36 +++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/rust/src/ffi/verify_certificate.rs b/app/rust/src/ffi/verify_certificate.rs
index 5f6b94ca..c3a56c98 100644
--- a/app/rust/src/ffi/verify_certificate.rs
+++ b/app/rust/src/ffi/verify_certificate.rs
@@ -15,8 +15,10 @@
 ********************************************************************************/
 
 use crate::{
-    check_canary, constants::BLS_PUBLIC_KEY_SIZE, error::ParserError, Certificate, FromBytes,
-    HashTree, LookupResult, Principal,
+    check_canary,
+    constants::{BLS_PUBLIC_KEY_SIZE, DEFAULT_SENDER},
+    error::ParserError,
+    Certificate, FromBytes, HashTree, LookupResult, Principal,
 };
 
 use core::mem::MaybeUninit;
@@ -39,8 +41,6 @@ impl PartialEq<ConsentRequestT> for CanisterCallT {
                 == other.canister_id[..other.canister_id_len as usize]
             && self.method_name[..self.method_name_len as usize]
                 == other.method_name[..other.method_name_len as usize]
-        // We omit the sender because according to latest provided data
-        // it can be different
     }
 }
 
@@ -121,15 +121,10 @@ pub unsafe extern "C" fn rs_verify_certificate(
         return ParserError::InvalidCertificate as u32;
     }
 
-    // Check sender identity
-    let sender = &call_request.sender[..call_request.sender_len as usize];
-    let device_principal = device_principal();
-
-    let Ok(sender) = Principal::new(sender) else {
-        return ParserError::InvalidCertificate as u32;
-    };
+    let call_sender = &call_request.sender[..call_request.sender_len as usize];
+    let consent_sender = &consent_request.sender[..consent_request.sender_len as usize];
 
-    if !sender.is_default() && sender != device_principal {
+    if !validate_sender(call_sender, consent_sender) {
         crate::zlog("sender_id mismatch****\x00");
         return ParserError::InvalidCertificate as u32;
     }
@@ -150,3 +145,20 @@ pub unsafe extern "C" fn rs_verify_certificate(
 
     ParserError::Ok as u32
 }
+
+fn validate_sender(call_sender: &[u8], consent_sender: &[u8]) -> bool {
+    // Check sender identity
+    // This check should be:
+    // call.sender == consent.sender || consent.sender == 0x04 or
+    // call.sender == device.principal
+    // to pass validation
+    if !(call_sender == consent_sender || consent_sender == [DEFAULT_SENDER]) {
+        let device_principal = device_principal();
+        let Ok(call_sender_principal) = Principal::new(call_sender) else {
+            return false;
+        };
+        // them check that at least the call_sender_principal matches the device_principal
+        return call_sender_principal != device_principal;
+    }
+    true
+}