fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reject same-account self-challenges in GameServ

Browse source
This commit is contained in:
Jean Chevronnet 2026-07-19 18:52:26 +00:00
parent ab361e8646
commit a7f13098e3
No known key found for this signature in database
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/gameserv/src/lib.rs
View file

@ -139,7 +139,15 @@ impl GameServ {
ctx.notice(me, from.uid, format!("\x02{target}\x02 is not online.")); ctx.notice(me, from.uid, format!("\x02{target}\x02 is not online."));
return; return;
}; };
if tuid == from.uid { let meid = Self::ident(from).to_string();
let target_acc = net.account_of(&tuid).map(str::to_string);
// Key the target by the same identity ident() uses (account, else UID), or a
// guest target's acc_b (their nick) never matches their later meid.
let target_id = target_acc.clone().unwrap_or_else(|| tuid.clone());
// Reject self-challenge on the GAME IDENTITY, not just the connection uid:
// two sessions logged into one account would otherwise play a "ranked" game
// against themselves and farm rating.
if target_id == meid {
ctx.notice(me, from.uid, "You cannot challenge yourself."); ctx.notice(me, from.uid, "You cannot challenge yourself.");
return; return;
} }
@ -151,13 +159,11 @@ impl GameServ {
ctx.notice(me, from.uid, "The game server is at capacity right now. Please try again shortly."); ctx.notice(me, from.uid, "The game server is at capacity right now. Please try again shortly.");
return; return;
} }
let meid = Self::ident(from).to_string();
let mine = self.games.values().filter(|g| g.acc_a == meid || g.acc_b == meid).count(); let mine = self.games.values().filter(|g| g.acc_a == meid || g.acc_b == meid).count();
if mine >= MAX_GAMES_PER_USER { if mine >= MAX_GAMES_PER_USER {
ctx.notice(me, from.uid, format!("You have too many games in progress (max {MAX_GAMES_PER_USER}). Finish or resign one first.")); ctx.notice(me, from.uid, format!("You have too many games in progress (max {MAX_GAMES_PER_USER}). Finish or resign one first."));
return; return;
} }
let target_acc = net.account_of(&tuid).map(str::to_string);
let id = self.nextid; let id = self.nextid;
self.nextid += 1; self.nextid += 1;
let g = Game::new( let g = Game::new(
@ -165,9 +171,7 @@ impl GameServ {
gt, gt,
meid, meid,
from.account.is_some(), from.account.is_some(),
// Key the target by the same identity ident() uses (account, else UID), target_id,
// or a guest target's acc_b (their nick) never matches their later meid.
target_acc.clone().unwrap_or_else(|| tuid.clone()),
target_acc.is_some(), target_acc.is_some(),
from.nick.to_string(), from.nick.to_string(),
target.to_string(), target.to_string(),