fix: verify caller_program_id in program output

program_methods/guest/src/bin/amm.rs

@@ -15,7 +15,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction,
         },
@@ -156,6 +156,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         pre_states_clone,
         post_states,

program_methods/guest/src/bin/associated_token_account.rs

@@ -5,7 +5,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction,
         },
@@ -60,6 +60,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         pre_states_clone,
         post_states,

program_methods/guest/src/bin/authenticated_transfer.rs

@@ -68,7 +68,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction: balance_to_move,
         },
@@ -86,5 +86,5 @@ fn main() {
         _ => panic!("invalid params"),
     };
 
-    ProgramOutput::new(self_program_id, instruction_words, pre_states, post_states).write();
+    ProgramOutput::new(self_program_id, caller_program_id, instruction_words, pre_states, post_states).write();
 }

program_methods/guest/src/bin/pinata.rs

@@ -47,7 +47,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction: solution,
         },
@@ -82,6 +82,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         vec![pinata, winner],
         vec![

program_methods/guest/src/bin/pinata_token.rs

@@ -53,7 +53,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction: solution,
         },
@@ -100,6 +100,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         vec![
             pinata_definition,

program_methods/guest/src/bin/privacy_preserving_circuit.rs

@@ -114,6 +114,15 @@ impl ExecutionState {
                 "Program output self_program_id does not match chained call program_id"
             );
 
+            // Verify that the program output's caller_program_id matches the actual caller.
+            // This prevents a malicious user from privately executing an internal function
+            // by spoofing caller_program_id (e.g. passing caller_program_id = self_program_id
+            // to bypass access control checks).
+            assert_eq!(
+                program_output.caller_program_id, caller_program_id,
+                "Program output caller_program_id does not match actual caller"
+            );
+
             // Check that the program is well behaved.
             // See the # Programs section for the definition of the `validate_execution` method.
             let execution_valid = validate_execution(

program_methods/guest/src/bin/token.rs

@@ -13,7 +13,7 @@ fn main() {
     let (
         ProgramInput {
             self_program_id,
-            caller_program_id: _,
+            caller_program_id,
             pre_states,
             instruction,
         },
@@ -85,6 +85,7 @@ fn main() {
 
     ProgramOutput::new(
         self_program_id,
+        caller_program_id,
         instruction_words,
         pre_states_clone,
         post_states,