{"header":{"message":"basic structures","description":null,"timestamp":"2024-02-18T22:58:53.022446975Z","authors":[{}]},"hash":"KJK5LRQDGEQLVSS2SIOINZNNH6T4NKAJB24QWWSFLI3KZLLIDYPAC","authors":[{"login":"hardliner66","key":"B5bgFxujKQnkKNBFAwbJFG5fU9pLbJ3L9rxcaYV7yQA5"}],"deps":{"hashes":[["KJK5LRQDGEQLVSS2SIOINZNNH6T4NKAJB24QWWSFLI3KZLLIDYPAC","basic structures"],["AA",null],["KM3TEIVBG6FP7H3AXNWYBIUSXRIN4ILGQY7TV2EQ5VCYQ6ER66YAC","init"]],"deps":["KM3TEIVBG6FP7H3AXNWYBIUSXRIN4ILGQY7TV2EQ5VCYQ6ER66YAC"],"known":[]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":10,"ins":{"up_context":[{"change":2,"pos":269}],"down_context":[{"change":2,"pos":345}],"flag":"BLOCK","start":0,"end":50,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":269},"to":{"change":2,"start":269,"end":345},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":"use tokio::process::{Child, ChildStdin, Command};"}],"del_contents":[{"Del":"use tokio::process::{Child, ChildStderr, ChildStdin, ChildStdout, Command};\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":13,"ins":{"up_context":[{"change":2,"pos":387}],"down_context":[{"change":2,"pos":437}],"flag":"BLOCK","start":51,"end":95,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":387},"to":{"change":2,"start":387,"end":437},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":"use uaf::{LogMessage, Message, SpawnActor};"}],"del_contents":[{"Del":"use tokio_stream::StreamExt;\nuse uaf::LogMessage;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":22,"ins":{"up_context":[{"change":2,"pos":536}],"down_context":[{"change":2,"pos":554}],"flag":"BLOCK","start":96,"end":119,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":536},"to":{"change":2,"start":536,"end":554},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" stdin: ChildStdin,"}],"del_contents":[{"Del":" child: Child,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":26,"ins":{"up_context":[{"change":2,"pos":570}],"down_context":[{"change":2,"pos":628}],"flag":"BLOCK","start":120,"end":183,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":570},"to":{"change":2,"start":570,"end":628},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" fn new(stdin: ChildStdin) -> Self {"},{"Add":" Self { stdin }"}],"del_contents":[{"Del":" fn new(child: Child) -> Self {\n Self { child }\n"}]}},{"Edit":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":33,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":773}],"down_context":[{"change":2,"pos":773}],"flag":"BLOCK","start":184,"end":287,"inode":{"change":2,"pos":49}}},"contents":[{"Add":" static ref SPAWN_REQUESTS: Arc>> = Arc::new(Mutex::new(Vec::new()));"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":36,"ins":{"up_context":[{"change":2,"pos":776}],"down_context":[{"change":2,"pos":844}],"flag":"BLOCK","start":288,"end":369,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":776},"to":{"change":2,"start":776,"end":844},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":"async fn spawn_actor(executable: PathBuf, block: bool) -> anyhow::Result {"}],"del_contents":[{"Del":"async fn spawn_actor(executable: PathBuf) -> anyhow::Result {\n"}]}},{"Edit":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":52,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1240},"to":{"change":2,"start":1240,"end":1509},"introduced_by":2}],"inode":{"change":2,"pos":49}}},"contents":[{"Del":"\n if let Some(ref mut stdin) = child.stdin {\n let init_message = format!(r#\"{{\"type\": \"init\", \"payload\": {{}}}}\"#,);\n stdin\n .write_all(init_message.as_bytes())\n .await\n .expect(\"Failed to write to child stdin\");\n }\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":58,"ins":{"up_context":[{"change":2,"pos":1722}],"down_context":[{"change":2,"pos":1793}],"flag":"BLOCK","start":370,"end":1387,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1722},"to":{"change":2,"start":1722,"end":1793},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" while let Some(line) = lines.next_line().await.unwrap() {"},{"Add":" if let Ok(mut message) = serde_json::from_str::(&line) {"},{"Add":" if message.from.is_none() {"},{"Add":" message.from = Some(uuid);"},{"Add":" }"},{"Add":" if let Some(other) = ACTORS.lock().await.get(&message.to) {"},{"Add":" let mut other = other.lock().await;"},{"Add":" let message = serde_json::to_string(&message).unwrap();"},{"Add":" if let Err(e) = other.stdin.write_all(message.as_bytes()).await {"},{"Add":" eprintln!(\"{e}\");"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Ok(message) = serde_json::from_str::(&line) {"},{"Add":" let mut spawn_requests = SPAWN_REQUESTS.lock().await;"},{"Add":" spawn_requests.push((uuid, message));"},{"Add":" } else {"},{"Add":" eprintln!(\"Unknown message type: {line}\");"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" while let Some(line) = lines.next_line().await.unwrap() {}\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":86,"ins":{"up_context":[{"change":2,"pos":2122}],"down_context":[{"change":2,"pos":2593}],"flag":"BLOCK","start":1388,"end":2004,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2122},"to":{"change":2,"start":2122,"end":2593},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" if let Ok(message) = serde_json::from_str::(&line) {"},{"Add":" eprintln!("},{"Add":" \"Child {}: {} [{}]\","},{"Add":" uuid,"},{"Add":" message.message,"},{"Add":" message"},{"Add":" .tags"},{"Add":" .into_iter()"},{"Add":" .map(|(k, v)| format!(\"{}: {}\", k, v))"},{"Add":" .collect::>()"},{"Add":" .join(\", \")"},{"Add":" );"},{"Add":" } else {"},{"Add":" eprintln!(\"Child {}: {}\", uuid, line);"},{"Add":" }"}],"del_contents":[{"Del":" let message = serde_json::from_str::(&line).unwrap();\n eprintln!(\n \"Child {}: {} [{}]\",\n uuid,\n message.message,\n message\n .tags\n .into_iter()\n .map(|(k, v)| format!(\"{}: {}\", k, v))\n .collect::>()\n .join(\", \")\n );\n"}]}},{"Edit":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":103,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2619}],"down_context":[{"change":2,"pos":2619}],"flag":"BLOCK","start":2005,"end":2542,"inode":{"change":2,"pos":49}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" if let Some(mut stdin) = child.stdin.take() {"},{"Add":" let init_message = Message {"},{"Add":" to: uuid,"},{"Add":" from: None,"},{"Add":" payload: serde_json::json!({"},{"Add":" \"id\": uuid,"},{"Add":" }),"},{"Add":" };"},{"Add":" let msg = serde_json::to_string(&init_message)?;"},{"Add":" stdin"},{"Add":" .write_all(msg.as_bytes())"},{"Add":" .await"},{"Add":" .expect(\"Failed to write to child stdin\");"},{"Add":""},{"Add":" let mut actors = ACTORS.lock().await;"},{"Add":" actors.insert(uuid, Arc::new(Mutex::new(Actor::new(stdin))));"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":123,"ins":{"up_context":[{"change":2,"pos":2626}],"down_context":[{"change":2,"pos":2734}],"flag":"BLOCK","start":2543,"end":2593,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2626},"to":{"change":2,"start":2626,"end":2734},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" if block {"},{"Add":" child.wait().await?;"},{"Add":" }"}],"del_contents":[{"Del":" let mut actors = ACTORS.lock().await;\n actors.insert(uuid, Arc::new(Mutex::new(Actor::new(child))));\n"}]}},{"Replacement":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":134,"ins":{"up_context":[{"change":2,"pos":2852}],"down_context":[{"change":2,"pos":2892}],"flag":"BLOCK","start":2594,"end":3502,"inode":{"change":2,"pos":49}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2852},"to":{"change":2,"start":2852,"end":2892},"introduced_by":2}],"inode":{"change":2,"pos":49}},"ins_contents":[{"Add":" spawn(async {"},{"Add":" let mut spawn_requests = SPAWN_REQUESTS.lock().await;"},{"Add":" loop {"},{"Add":" if let Some((uuid, request)) = spawn_requests.pop() {"},{"Add":" let new_uid = spawn_actor(request.executable, false).await.unwrap();"},{"Add":" let message = Message {"},{"Add":" from: None,"},{"Add":" to: uuid,"},{"Add":" payload: serde_json::json!({"},{"Add":" \"type\": \"spawned\","},{"Add":" \"status\": \"ok\","},{"Add":" \"id\": new_uid,"},{"Add":" }),"},{"Add":" };"},{"Add":" let actors = ACTORS.lock().await;"},{"Add":" let mut actor = actors.get(&uuid).unwrap().lock().await;"},{"Add":" actor"},{"Add":" .stdin"},{"Add":" .write_all(serde_json::to_string(&message).unwrap().as_bytes())"},{"Add":" .await"},{"Add":" .unwrap();"},{"Add":" }"},{"Add":" }"},{"Add":" });"}],"del_contents":[{"Del":" _ = spawn_actor(executable).await?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":49},"path":"src/main.rs","line":159,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2893}],"down_context":[{"change":2,"pos":2893}],"flag":"BLOCK","start":3503,"end":3550,"inode":{"change":2,"pos":49}}},"contents":[{"Add":" _ = spawn_actor(executable, true).await?;"},{"Add":""}]}},{"Edit":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3000}],"down_context":[{"change":2,"pos":3000}],"flag":"BLOCK","start":3551,"end":3567,"inode":{"change":2,"pos":2938}}},"contents":[{"Add":"use uuid::Uuid;"}]}},{"Replacement":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":5,"ins":{"up_context":[{"change":2,"pos":3001}],"down_context":[{"change":2,"pos":3035}],"flag":"BLOCK","start":3568,"end":3609,"inode":{"change":2,"pos":2938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3001},"to":{"change":2,"start":3001,"end":3035},"introduced_by":2}],"inode":{"change":2,"pos":2938}},"ins_contents":[{"Add":"#[derive(Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":8,"ins":{"up_context":[{"change":2,"pos":3079}],"down_context":[{"change":2,"pos":3129}],"flag":"BLOCK","start":3610,"end":3656,"inode":{"change":2,"pos":2938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3079},"to":{"change":2,"start":3079,"end":3129},"introduced_by":2}],"inode":{"change":2,"pos":2938}},"ins_contents":[{"Add":" pub from: Option,"},{"Add":" pub to: Uuid,"}],"del_contents":[{"Del":" pub from: Option,\n pub to: String,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":13,"ins":{"up_context":[{"change":2,"pos":3168}],"down_context":[{"change":2,"pos":3202}],"flag":"BLOCK","start":3657,"end":3698,"inode":{"change":2,"pos":2938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3168},"to":{"change":2,"start":3168,"end":3202},"introduced_by":2}],"inode":{"change":2,"pos":2938}},"ins_contents":[{"Add":"#[derive(Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":15,"ins":{"up_context":[{"change":2,"pos":3225}],"down_context":[{"change":2,"pos":3279}],"flag":"BLOCK","start":3699,"end":3763,"inode":{"change":2,"pos":2938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3225},"to":{"change":2,"start":3225,"end":3279},"introduced_by":2}],"inode":{"change":2,"pos":2938}},"ins_contents":[{"Add":"pub struct SpawnActor {"},{"Add":" pub executable: std::path::PathBuf,"}],"del_contents":[{"Del":"pub struct Init {\n pub payload: serde_json::Value,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2938},"path":"src/lib.rs","line":19,"ins":{"up_context":[{"change":2,"pos":3282}],"down_context":[{"change":2,"pos":3316}],"flag":"BLOCK","start":3764,"end":3805,"inode":{"change":2,"pos":2938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3282},"to":{"change":2,"start":3282,"end":3316},"introduced_by":2}],"inode":{"change":2,"pos":2938}},"ins_contents":[{"Add":"#[derive(Debug, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Serialize, Deserialize)]\n"}]}},{"FileAdd":{"meta":{"basename":"bin","metadata":576},"context":[{"change":2,"pos":15}],"contents":[]}},{"FileAdd":{"meta":{"basename":"test-actor.rs","metadata":0},"context":[{"change":0,"pos":3821}],"contents":[{"Add":"use std::io::{self, BufRead};"},{"Add":""},{"Add":"use indexmap::IndexMap;"},{"Add":"use tokio::io::AsyncWriteExt;"},{"Add":"use uaf::{LogMessage, Message};"},{"Add":""},{"Add":"fn log(level: &str, message: &str) {"},{"Add":" let log_message = LogMessage {"},{"Add":" level: level.to_string(),"},{"Add":" message: message.to_string(),"},{"Add":" tags: IndexMap::new(),"},{"Add":" };"},{"Add":""},{"Add":" let serialized = serde_json::to_string(&log_message).unwrap();"},{"Add":" eprintln!(\"{}\", serialized);"},{"Add":"}"},{"Add":""},{"Add":"fn send_message(message: &Message) {"},{"Add":" let serialized = serde_json::to_string(&message).unwrap();"},{"Add":" println!(\"{}\", serialized);"},{"Add":"}"},{"Add":""},{"Add":"#[tokio::main]"},{"Add":"async fn main() {"},{"Add":" let stdin = io::stdin();"},{"Add":" let mut reader = stdin.lock();"},{"Add":" let mut line = String::new();"},{"Add":" let mut count = 0;"},{"Add":""},{"Add":" while let Ok(_) = reader.read_line(&mut line) {"},{"Add":" count += 1;"},{"Add":" let message: Message = serde_json::from_str(&line).expect(\"Failed to parse message\");"},{"Add":" // Handle incoming data message"},{"Add":" log(\"info\", &format!(\"Received message({count}): {message:?}\"));"},{"Add":""},{"Add":" // Example of sending a message back"},{"Add":" let response = Message {"},{"Add":" from: None,"},{"Add":" to: message.to,"},{"Add":" payload: serde_json::json!({\"status\": \"ok\", \"count\": count}),"},{"Add":" };"},{"Add":" send_message(&response);"},{"Add":" }"},{"Add":" log(\"info\", \"Actor shutting down\");"},{"Add":" tokio::io::stdout().flush().await.unwrap();"},{"Add":" tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;"},{"Add":"}"}]}},{"Edit":{"inode":{"change":2,"pos":3499},"path":"Cargo.toml","line":5,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3558}],"down_context":[{"change":2,"pos":3558}],"flag":"BLOCK","start":5248,"end":5268,"inode":{"change":2,"pos":3499}}},"contents":[{"Add":"default-run = \"uaf\""}]}},{"Replacement":{"inode":{"change":2,"pos":3499},"path":"Cargo.toml","line":20,"ins":{"up_context":[{"change":2,"pos":4094}],"down_context":[],"flag":"BLOCK","start":5269,"end":5326,"inode":{"change":2,"pos":3499}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4094},"to":{"change":2,"start":4094,"end":4142},"introduced_by":2}],"inode":{"change":2,"pos":3499}},"ins_contents":[{"Add":"uuid = { version = \"1.7.0\", features = [\"v4\", \"serde\"] }"}],"del_contents":[{"Del":"uuid = { version = \"1.7.0\", features = [\"v4\"] }\n"}]}},{"Edit":{"inode":{"change":2,"pos":4178},"path":"Cargo.lock","line":541,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":18104}],"down_context":[{"change":2,"pos":18104}],"flag":"BLOCK","start":5327,"end":5337,"inode":{"change":2,"pos":4178}}},"contents":[{"Add":" \"serde\","}]}}],"owner":"hardliner66","repo":"uaf","token":"lSEk+nnmTbts6F5erh5KoJJK5DziJ5O6w6p0ANxFzX8=","login":null}

…

Dependencies

Change contents