Remove /index.json redirect and allow customizable config server by env

This commit is contained in:
xavo95 2024-11-01 20:30:07 +01:00
parent bac8d2277f
commit 40ac7d3dcd
Signed by: xavo95
GPG key ID: CBF8ADED6DEBB783
4 changed files with 62 additions and 8 deletions

12
Cargo.lock generated
View file

@ -22,6 +22,8 @@ name = "camellya-patch"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ilhook", "ilhook",
"regex",
"widestring",
"windows", "windows",
] ]
@ -87,9 +89,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.11.0" version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -151,6 +153,12 @@ version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "widestring"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.58.0" version = "0.58.0"

View file

@ -16,6 +16,8 @@ enable-sdk = []
[dependencies] [dependencies]
ilhook = "2.1.1" ilhook = "2.1.1"
regex = "1.11.1"
widestring = "1.1.0"
windows = { version = "0.58.0", features = [ windows = { version = "0.58.0", features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_System_LibraryLoader", "Win32_System_LibraryLoader",

View file

@ -1,8 +1,9 @@
use std::sync::OnceLock;
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
use ilhook::x64::Registers; use ilhook::x64::Registers;
use windows::core::{PCSTR, PCWSTR, w}; use windows::core::{PCSTR, PCWSTR};
use windows::Win32::Foundation::HINSTANCE; use windows::Win32::Foundation::HINSTANCE;
use windows::Win32::System::Console; use windows::Win32::System::Console;
use windows::Win32::System::LibraryLoader::GetModuleHandleA; use windows::Win32::System::LibraryLoader::GetModuleHandleA;
@ -11,8 +12,13 @@ use windows::Win32::System::SystemServices::DLL_PROCESS_ATTACH;
use interceptor::Interceptor; use interceptor::Interceptor;
use offsets::CONFIG; use offsets::CONFIG;
use crate::replacer::{GenericReplacer, Replacer};
mod interceptor; mod interceptor;
mod offsets; mod offsets;
mod replacer;
static CFG_SERVER_REPLACER: OnceLock<GenericReplacer> = OnceLock::new();
fn thread_func() { fn thread_func() {
unsafe { Console::AllocConsole() }.unwrap(); unsafe { Console::AllocConsole() }.unwrap();
@ -64,13 +70,22 @@ fn thread_func() {
unsafe extern "win64" fn on_kurohttp_get(reg: *mut Registers, _: usize) { unsafe extern "win64" fn on_kurohttp_get(reg: *mut Registers, _: usize) {
let wstr = *((*reg).rcx as *const usize) as *mut u16; let wstr = *((*reg).rcx as *const usize) as *mut u16;
let url = PCWSTR::from_raw(wstr).to_string().unwrap(); let url = PCWSTR::from_raw(wstr).to_string().unwrap();
println!("HTTP GET: {url}"); println!("HTTP GET: {url}");
if url.ends_with("/index.json") {
println!("index.json requested, redirecting"); let replacer = CFG_SERVER_REPLACER.get_or_init(|| {
let new_wstr = w!("http://127.0.0.1:10001/index.json"); GenericReplacer {
regex: regex::Regex::new(r#"^(?:https|http)://.*/([a-zA-Z0-9]{32}/index\.json)$"#).unwrap(),
replacement: std::env::var("CFG_SERVER_URL").unwrap_or("127.0.0.1:10001".to_string()),
scheme: std::env::var("CFG_SERVER_SCHEME").unwrap_or("http".to_string()),
}
});
if let Some(result) = replacer.replace(url.as_str()) {
println!("Redirecting to: {result}");
let new_url = widestring::U16String::from_str(result.as_str());
let new_wstr = PCWSTR::from_raw(new_url.as_ptr());
std::ptr::copy_nonoverlapping(new_wstr.as_ptr(), wstr, new_wstr.as_wide().len() + 2); std::ptr::copy_nonoverlapping(new_wstr.as_ptr(), wstr, new_wstr.as_wide().len() + 2);
} };
} }
unsafe extern "win64" fn fpakfile_check_replacement( unsafe extern "win64" fn fpakfile_check_replacement(

29
src/replacer.rs Normal file
View file

@ -0,0 +1,29 @@
pub(crate) trait Replacer {
fn replace(&self, original: &str) -> Option<String>;
}
pub(crate) struct GenericReplacer {
pub(crate) regex: regex::Regex,
pub(crate) replacement: String,
pub(crate) scheme: String,
}
impl Replacer for GenericReplacer {
fn replace(&self, original: &str) -> Option<String> {
// Prepare output array
let mut results: Vec<String> = vec![];
// Perform the capture over input
for (_, [path]) in self.regex.captures_iter(original).map(|c| c.extract()) {
results.push(format!("{}://{}/{}", self.scheme, self.replacement, path));
}
// We are supposed to only parse one entry from text
if 1 == results.len() {
return Some(results.remove(0));
} else if results.is_empty() {
println!("No valid url match found so returning original url");
} else {
println!("Invalid number of entries parsed, expected 1, obtained {:?}", results.len());
}
None
}
}