From 51580183a706b944fb43cb8559b96333889af0c2 Mon Sep 17 00:00:00 2001
From: char-ptr <44528100+char-ptr@users.noreply.github.com>
Date: Mon, 19 Aug 2024 09:14:07 +0100
Subject: [PATCH] feat: make tool independant of hardcoded sigs

---
 gdkeinj/src/lib.rs | 27 +++++++++++----------------
 src/lib.rs         | 35 ++++++++++++++++++++---------------
 src/main.rs        |  7 +++++--
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/gdkeinj/src/lib.rs b/gdkeinj/src/lib.rs
index 44c36b2..84e8395 100644
--- a/gdkeinj/src/lib.rs
+++ b/gdkeinj/src/lib.rs
@@ -18,25 +18,16 @@ type open_and_parse_t = unsafe extern "fastcall" fn(*const i32, *const i32, *con
 static_detour! {
     pub static OpenAndParse:  unsafe extern "fastcall" fn(*const i32, *const i32, *const u8, bool) -> ();
 }
-
-const SIGS: [&str; 5] = [
-    // call into open_and_parse
-    "E8 ? ? ? ? 85 C0 0F 84 ?  ?  ? ? 49 8B 8C 24 ?  ?  ?  ?", // 4.x (4.2.1)
-    "E8 ? ? ? ? 89 44 24 50 83 7C 24 ? ?  0F 84 ?  ?  ?  ?  48 8B 44 24 ?", // 3.5.1
-    "E8 ? ? ? ? 89 44 24 50 83 7C 24 ? ?  0F 84 ?  ?  ?  ?  48 8B 44 24 ?", // 3.5.1
-    "E8 ? ? ? ? 8B D8 85 C0 0F 84 ? ? ?  ?  49 8B 04 24",      // 3.x
-    "E8 ? ? ? ? 48 8B 4C 24 ? 89 C5 48 85 C9",                 // 4.3
-];
 #[repr(u8)]
 #[derive(Debug)]
 enum SigErrors {
     NotFound,
 }
-fn find_sig_addr(sig_type: usize) -> Result<*const c_void, SigErrors> {
+fn find_sig_addr(sig: &str) -> Result<*const c_void, SigErrors> {
     let proc = Process::this_process();
     let modd = proc.get_base_module().unwrap();
 
-    let sig = SIGS.get(sig_type).ok_or(SigErrors::NotFound)?;
+    // let sig = SIGS.get(sig_type).ok_or(SigErrors::NotFound)?;
     let addr = modd
         .scan(sig)
         .map_err(|_| SigErrors::NotFound)?
@@ -63,11 +54,15 @@ pub fn main() {
     let buf = [];
     sock.send(&buf).ok();
 
-    let mut sig_type = [0; 4];
-    sock.recv(&mut sig_type).unwrap();
-    println!("received sig type: {:?}", sig_type);
-    let int_sig = u32::from_ne_bytes(sig_type);
-    let fn_ptr = find_sig_addr(int_sig as usize);
+    let mut capy = vec![0u8; 256];
+    sock.recv(&mut capy).unwrap();
+    let mut sizer = [0; 8];
+    sizer.copy_from_slice(&capy[..8]);
+    let sizer_usize = usize::from_ne_bytes(sizer);
+    let content = &capy[std::mem::size_of::<usize>()..];
+    let string_content = String::from_utf8_lossy(content);
+    let str_content = &string_content[..sizer_usize];
+    let fn_ptr = find_sig_addr(str_content);
     let fn_ptr = match fn_ptr {
         Ok(x) => x,
         Err(err) => {
diff --git a/src/lib.rs b/src/lib.rs
index a22d2e1..055ceeb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 pub mod versioning;
 use std::{
     ffi::{c_void, CStr, CString},
-    io::Write,
+    io::{Read, Write},
     mem::{size_of, transmute},
     net::UdpSocket,
     path::Path,
@@ -61,7 +61,7 @@ impl Drop for ProcKiller {
         }
     }
 }
-pub unsafe fn spawn_and_inject(proc: &str) -> anyhow::Result<[u8; 32]> {
+pub unsafe fn spawn_and_inject(proc: &str, sig: &str) -> anyhow::Result<[u8; 32]> {
     let pth = Path::new(proc);
     if !pth.is_file() {
         panic!("file does not exist");
@@ -142,17 +142,17 @@ pub unsafe fn spawn_and_inject(proc: &str) -> anyhow::Result<[u8; 32]> {
         };
         let game_ver = check_gd_ver(pth)?;
         println!("gamever = {game_ver}");
-        let sig_id = match &game_ver
-            .chars().collect::<Vec<char>>()[..]
-            // .next()
-            // .ok_or(anyhow::anyhow!("unable to check gd version"))?
-        {
-            ['4','.','3',..] => 4u32,
-            ['4',..] => 0u32,
-            ['3','.','6',..] => 2u32,
-            ['3',..] => 1u32,
-            _ => return Err(anyhow::anyhow!("invalid godot version")),
-        };
+        // let sig_id = match &game_ver
+        //     .chars().collect::<Vec<char>>()[..]
+        //     // .next()
+        //     // .ok_or(anyhow::anyhow!("unable to check gd version"))?
+        // {
+        //     ['4','.','3',..] => 4u32,
+        //     ['4',..] => 0u32,
+        //     ['3','.','6',..] => 2u32,
+        //     ['3',..] => 1u32,
+        //     _ => return Err(anyhow::anyhow!("invalid godot version")),
+        // };
 
         println!("injecting dll ({})", dll_loc);
         syrnge.inject(dll_loc)?;
@@ -160,8 +160,13 @@ pub unsafe fn spawn_and_inject(proc: &str) -> anyhow::Result<[u8; 32]> {
         println!("waiting until udp is ok ");
 
         let (_, addr) = sock.recv_from(&mut [0]).unwrap();
-        println!("using sig id {sig_id}");
-        sock.send_to(&sig_id.to_ne_bytes(), addr).unwrap();
+        // println!("using sig id {sig_id}");
+        let mut meow_sigger = sig.to_owned();
+        let meow_sigger = meow_sigger.as_bytes_mut();
+        let mut meower = Vec::from(meow_sigger.len().to_ne_bytes());
+        meower.append(&mut Vec::from(meow_sigger));
+
+        sock.send_to(meower.as_slice(), addr).unwrap();
         let mut error = [0u8; 4];
         sock.recv(&mut error)?;
         println!("errors -> {error:?}");
diff --git a/src/main.rs b/src/main.rs
index 530730d..6127507 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,8 +2,11 @@ use gdke::spawn_and_inject;
 
 fn main() {
     unsafe {
-        let key =
-            spawn_and_inject(&std::env::args().nth(1).unwrap()).expect("failed to resolve key");
+        let key = spawn_and_inject(
+            &std::env::args().nth(1).unwrap(),
+            &std::env::args().nth(2).unwrap(),
+        )
+        .expect("failed to resolve key");
         print!("key: ");
         for val in key {
             print!("{:0>2x}", val);