ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly handle jp asset version/hash

Browse source
This commit is contained in:
Ethan O'Brien 2024-03-28 11:12:10 -05:00
parent b099cbe497
commit f75c0a19e0
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/router/global.rs
View file

@ -1,7 +1,8 @@
use json::{object, JsonValue}; use json::{object, JsonValue};
use crate::encryption; use crate::encryption;
use actix_web::{ use actix_web::{
HttpResponse HttpResponse,
http::header::{HeaderValue, HeaderMap}
}; };
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
@ -9,6 +10,9 @@ use std::time::{SystemTime, UNIX_EPOCH};
pub const ASSET_VERSION: &str = "13177023d4b7ad41ff52af4cefba5c55"; pub const ASSET_VERSION: &str = "13177023d4b7ad41ff52af4cefba5c55";
pub const ASSET_HASH: &str = "9fbfeda43a5cbf744ef23c06c22170aa"; pub const ASSET_HASH: &str = "9fbfeda43a5cbf744ef23c06c22170aa";
pub const ASSET_VERSION_JP: &str = "4c921d2443335e574a82e04ec9ea243c";
pub const ASSET_HASH_JP: &str = "67f8f261c16b3cca63e520a25aad6c1c";
pub fn get_login(headers: &HeaderMap) -> String { pub fn get_login(headers: &HeaderMap) -> String {
let blank_header = HeaderValue::from_static(""); let blank_header = HeaderValue::from_static("");
let key = headers.get("f19c72ba").unwrap_or(&blank_header).to_str().unwrap_or(""); let key = headers.get("f19c72ba").unwrap_or(&blank_header).to_str().unwrap_or("");

29
src/router/start.rs
View file

@ -2,19 +2,25 @@ use json;
use json::object; use json::object;
use crate::router::global; use crate::router::global;
use crate::encryption; use crate::encryption;
use actix_web::{HttpResponse, HttpRequest, http::header::HeaderValue}; use actix_web::{HttpResponse, HttpRequest};
use crate::router::userdata; use crate::router::userdata;
pub fn asset_hash(_req: HttpRequest, body: String) -> HttpResponse { pub fn asset_hash(_req: HttpRequest, body: String) -> HttpResponse {
let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap();
if body["asset_version"].to_string() != global::ASSET_VERSION { if body["asset_version"].to_string() != global::ASSET_VERSION && body["asset_version"].to_string() != global::ASSET_VERSION_JP {
println!("Warning! Asset version is not what was expected. (Did the app update?)"); println!("Warning! Asset version is not what was expected. (Did the app update?)");
} }
let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
global::ASSET_HASH_JP
} else {
global::ASSET_HASH
};
let resp = object!{ let resp = object!{
"code": 0, "code": 0,
"server_time": global::timestamp(), "server_time": global::timestamp(),
"data": { "data": {
"asset_hash": global::ASSET_HASH "asset_hash": hash
} }
}; };
global::send(resp) global::send(resp)
@ -22,23 +28,28 @@ pub fn asset_hash(_req: HttpRequest, body: String) -> HttpResponse {
pub fn start(req: HttpRequest, body: String) -> HttpResponse { pub fn start(req: HttpRequest, body: String) -> HttpResponse {
let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap();
if body["asset_version"].to_string() != global::ASSET_VERSION { if body["asset_version"].to_string() != global::ASSET_VERSION && body["asset_version"].to_string() != global::ASSET_VERSION_JP {
println!("Warning! Asset version is not what was expected. (Did the app update?)"); println!("Warning! Asset version is not what was expected. (Did the app update?)");
} }
let blank_header = HeaderValue::from_static(""); let key = global::get_login(req.headers());
let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); let mut user = userdata::get_acc(&key);
let mut user = userdata::get_acc(key);
user["user"]["last_login_time"] = global::timestamp().into(); user["user"]["last_login_time"] = global::timestamp().into();
user["stamina"]["last_updated_time"] = global::timestamp().into(); user["stamina"]["last_updated_time"] = global::timestamp().into();
userdata::save_acc(key, user); let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
global::ASSET_HASH_JP
} else {
global::ASSET_HASH
};
userdata::save_acc(&key, user);
let resp = object!{ let resp = object!{
"code": 0, "code": 0,
"server_time": global::timestamp(), "server_time": global::timestamp(),
"data": { "data": {
"asset_hash": global::ASSET_HASH, "asset_hash": hash,
"token": hex::encode("Hello") //what is this? "token": hex::encode("Hello") //what is this?
} }
}; };