mirror of
https://github.com/imayushsaini/Bombsquad-Ballistica-Modded-Server.git
synced 2025-10-20 00:00:39 +00:00
saving IP and device id in user profile , request-flood mitigation
This commit is contained in:
Ayush Saini
parent
dedee3c5b7
commit
03034e4aa0
3 changed files with 261 additions and 275 deletions
17
dist/ba_data/python/ba/_hooks.py
vendored
17
dist/ba_data/python/ba/_hooks.py
vendored
|
|
@ -337,30 +337,29 @@ def filter_chat_message(msg: str, client_id: int) -> Optional[str]:
|
|||
return chooks.filter_chat_message(msg,client_id)
|
||||
|
||||
def on_client_request(ip):
|
||||
print("player requesting to join from ip = " + ip)
|
||||
chooks.on_join_request(ip)
|
||||
|
||||
def kick_vote_started(by:str,to:str) -> None:
|
||||
"""
|
||||
get account ids of who started kick vote for whom ,
|
||||
do what ever u want logging to files , whatever.
|
||||
"""
|
||||
print(by+">"+to)
|
||||
chooks.kick_vote_started(by,to)
|
||||
|
||||
def on_kicked(account_id:str) -> None:
|
||||
pass
|
||||
# print(account_id+" kicked ...sad")
|
||||
chooks.on_kicked(account_id)
|
||||
|
||||
def on_kick_vote_end() -> None:
|
||||
pass
|
||||
# print("kick vote end")
|
||||
chooks.on_kick_vote_end()
|
||||
|
||||
def on_player_join(pb_id:str)-> None:
|
||||
# not integrated yet
|
||||
pass
|
||||
# print(pb_id+" joined python layer")
|
||||
|
||||
def on_player_leave(pb_id:str)-> None:
|
||||
# not integrated yet
|
||||
pass
|
||||
#
|
||||
print(pb_id+" left python layer")
|
||||
|
||||
|
||||
def local_chat_message(msg: str) -> None:
|
||||
if (_ba.app.ui.party_window is not None
|
||||
|
|
|
|||
4
dist/ba_root/mods/custom_hooks.py
vendored
4
dist/ba_root/mods/custom_hooks.py
vendored
|
|
@ -213,5 +213,5 @@ def on_kick_vote_end():
|
|||
logger.log("Kick vote End")
|
||||
|
||||
|
||||
_hooks.kick_vote_started = kick_vote_started
|
||||
_hooks.on_kicked = on_kicked
|
||||
def on_join_request(ip):
|
||||
servercheck.on_join_request(ip)
|
||||
|
|
|
|||
163
dist/ba_root/mods/tools/servercheck.py
vendored
163
dist/ba_root/mods/tools/servercheck.py
vendored
|
|
@ -18,50 +18,11 @@ import _thread
|
|||
from tools import logger
|
||||
from features import profanity
|
||||
|
||||
# class ServerChecker:
|
||||
|
||||
# def __init__():
|
||||
# run()
|
||||
|
||||
# def run(self):
|
||||
# clients=roset.players
|
||||
# # check if some one joined the party
|
||||
# for client in clients:
|
||||
# if cleint.account_id not in serverdata.currentclients:
|
||||
# self.playerjoined(client)
|
||||
# # check if some one left the party
|
||||
# clients_id=[client.account_id for client in clients]
|
||||
# for player in serverdata.currentclients:
|
||||
# if player not in clients_id:
|
||||
# self.playerleft(player)
|
||||
|
||||
|
||||
# def playerjoined(self,client):
|
||||
# if client.account_id in serverdata.cachedclients:
|
||||
# serevrdata.currentclients[client_account_id]=serverdata.cachedclients[id]
|
||||
|
||||
# playerData=pdata.get_info(client.account_id)
|
||||
# playerData["lastjoin"]=time.time()
|
||||
# if playerData ==None:
|
||||
# self.registernewplayer(cleint)
|
||||
# else if playerData['isBan']:
|
||||
# _ba.disconnect_client(client.client_id,9999)
|
||||
# else:
|
||||
# serverData.currentclients[client_account_id]=playerData
|
||||
|
||||
|
||||
# def playerleft(self,player):
|
||||
# serverdata.cachedclients[player]=serverdata.currentclients[player]
|
||||
|
||||
# serverdata.currentclients.remove(player)
|
||||
|
||||
# timeplayed=time.time()-serverdata.currentclients[player]['lastjoin']
|
||||
# serverdata.cachedclients[player]["totaltimeplayed"]+=timeplayed
|
||||
|
||||
# pdata.update_profile(serverdata.cachedclients[player])
|
||||
|
||||
settings = setting.get_settings_data()
|
||||
|
||||
|
||||
class checkserver(object):
|
||||
def start(self):
|
||||
self.players = []
|
||||
|
|
@ -73,17 +34,25 @@ class checkserver(object):
|
|||
for ros in _ba.get_game_roster():
|
||||
|
||||
newPlayers.append(ros['account_id'])
|
||||
if ros['account_id'] not in self.players and ros['client_id'] !=-1:
|
||||
if ros['account_id'] not in self.players and ros[
|
||||
'client_id'] != -1:
|
||||
d_str = ros['display_string']
|
||||
d_str2 = profanity.censor(d_str)
|
||||
try:
|
||||
logger.log(d_str+"||"+ros["account_id"]+"|| joined server","playerjoin")
|
||||
logger.log(
|
||||
d_str + "||" + ros["account_id"] + "|| joined server",
|
||||
"playerjoin")
|
||||
except:
|
||||
pass
|
||||
if d_str2 != d_str:
|
||||
_ba.screenmessage("Profanity in Id , change your ID and join back",color=(1,0,0),transient=True,clients=[ros['client_id']])
|
||||
_ba.screenmessage(
|
||||
"Profanity in Id , change your ID and join back",
|
||||
color=(1, 0, 0), transient=True,
|
||||
clients=[ros['client_id']])
|
||||
try:
|
||||
logger.log(d_str+"||"+ros["account_id"]+"|| kicked by profanity check","sys")
|
||||
logger.log(d_str + "||" + ros[
|
||||
"account_id"] + "|| kicked by profanity check",
|
||||
"sys")
|
||||
except:
|
||||
pass
|
||||
_ba.disconnect_client(ros['client_id'], 1)
|
||||
|
|
@ -91,25 +60,26 @@ class checkserver(object):
|
|||
return
|
||||
if settings["whitelist"] and ros["account_id"] != None:
|
||||
if ros["account_id"] not in pdata.CacheData.whitelist:
|
||||
_ba.screenmessage("Not in whitelist,contact admin",color=(1,0,0),transient=True,clients=[ros['client_id']])
|
||||
logger.log(d_str+"||"+ros["account_id"]+" | kicked > not in whitelist")
|
||||
_ba.screenmessage("Not in whitelist,contact admin",
|
||||
color=(1, 0, 0), transient=True,
|
||||
clients=[ros['client_id']])
|
||||
logger.log(d_str + "||" + ros[
|
||||
"account_id"] + " | kicked > not in whitelist")
|
||||
_ba.disconnect_client(ros['client_id'])
|
||||
|
||||
|
||||
return
|
||||
|
||||
if ros['account_id'] != None:
|
||||
if ros['account_id'] in serverdata.clients:
|
||||
on_player_join_server(ros['account_id'],serverdata.clients[ros['account_id']])
|
||||
on_player_join_server(ros['account_id'],
|
||||
serverdata.clients[
|
||||
ros['account_id']])
|
||||
else:
|
||||
LoadProfile(ros['account_id']).start()
|
||||
|
||||
self.players = newPlayers
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def on_player_join_server(pbid, player_data):
|
||||
now = time.time()
|
||||
# player_data=pdata.get_info(pbid)
|
||||
|
|
@ -123,7 +93,9 @@ def on_player_join_server(pbid,player_data):
|
|||
if now - serverdata.clients[pbid]["lastJoin"] < 15:
|
||||
rejoinCount += 1
|
||||
if rejoinCount > 2:
|
||||
_ba.screenmessage("Joining too fast , slow down dude",color=(1,0,1),transient=True,clients=[clid])
|
||||
_ba.screenmessage("Joining too fast , slow down dude",
|
||||
color=(1, 0, 1), transient=True,
|
||||
clients=[clid])
|
||||
logger.log(pbid + "|| kicked for joining too fast")
|
||||
_ba.disconnect_client(clid)
|
||||
|
||||
|
|
@ -136,19 +108,17 @@ def on_player_join_server(pbid,player_data):
|
|||
serverdata.clients[pbid]["rejoincount"] = rejoinCount
|
||||
serverdata.clients[pbid]["lastJoin"] = now
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if player_data != None:
|
||||
device_strin = ""
|
||||
if player_data["isBan"] or get_account_age(player_data["accountAge"]) < settings["minAgeToJoinInHours"]:
|
||||
if player_data["isBan"] or get_account_age(player_data["accountAge"]) < \
|
||||
settings["minAgeToJoinInHours"]:
|
||||
for ros in _ba.get_game_roster():
|
||||
if ros['account_id'] == pbid:
|
||||
if not player_data["isBan"]:
|
||||
_ba.screenmessage("New Accounts not allowed here , come back later",color=(1,0,0), transient=True,clients=[ros['client_id']])
|
||||
_ba.screenmessage(
|
||||
"New Accounts not allowed here , come back later",
|
||||
color=(1, 0, 0), transient=True,
|
||||
clients=[ros['client_id']])
|
||||
logger.log(pbid + " | kicked > reason:Banned account")
|
||||
_ba.disconnect_client(ros['client_id'])
|
||||
|
||||
|
|
@ -171,7 +141,15 @@ def on_player_join_server(pbid,player_data):
|
|||
if ros['account_id'] == pbid:
|
||||
cid = ros['client_id']
|
||||
d_st = ros['display_string']
|
||||
_ba.screenmessage(settings["regularWelcomeMsg"]+" "+d_st,color=(0.60,0.8,0.6),transient=True,clients=[cid])
|
||||
serverdata.clients[pbid]["lastIP"] = _ba.get_client_ip(cid)
|
||||
|
||||
device_id = _ba.get_client_public_device_uuid(cid)
|
||||
if(device_id==None):
|
||||
device_id = _ba.get_client_device_uuid(cid)
|
||||
serverdata.clients[pbid]["deviceUUID"] = device_id
|
||||
_ba.screenmessage(settings["regularWelcomeMsg"] + " " + d_st,
|
||||
color=(0.60, 0.8, 0.6), transient=True,
|
||||
clients=[cid])
|
||||
|
||||
else:
|
||||
|
||||
|
|
@ -190,12 +168,12 @@ def on_player_join_server(pbid,player_data):
|
|||
)
|
||||
|
||||
thread.start()
|
||||
_ba.screenmessage(settings["firstTimeJoinMsg"],color=(0.6,0.8,0.6),transient=True,clients=[cid])
|
||||
|
||||
|
||||
_ba.screenmessage(settings["firstTimeJoinMsg"], color=(0.6, 0.8, 0.6),
|
||||
transient=True, clients=[cid])
|
||||
|
||||
# pdata.add_profile(pbid,d_string,d_string)
|
||||
|
||||
|
||||
def verify_account(pb_id, p_data):
|
||||
d_string = ""
|
||||
for ros in _ba.get_game_roster():
|
||||
|
|
@ -223,14 +201,17 @@ def _make_request_safe(request, retries=2, raise_err=True):
|
|||
except:
|
||||
if retries > 0:
|
||||
time.sleep(1)
|
||||
return _make_request_safe(request, retries=retries-1, raise_err=raise_err)
|
||||
return _make_request_safe(request, retries=retries - 1,
|
||||
raise_err=raise_err)
|
||||
if raise_err:
|
||||
raise
|
||||
|
||||
|
||||
def get_account_creation_date(pb_id):
|
||||
# thanks rikko
|
||||
account_creation_url = "http://bombsquadgame.com/accountquery?id=" + pb_id
|
||||
account_creation = _make_request_safe(lambda: urllib.request.urlopen(account_creation_url))
|
||||
account_creation = _make_request_safe(
|
||||
lambda: urllib.request.urlopen(account_creation_url))
|
||||
if account_creation is not None:
|
||||
try:
|
||||
account_creation = json.loads(account_creation.read())
|
||||
|
|
@ -239,7 +220,8 @@ def get_account_creation_date(pb_id):
|
|||
else:
|
||||
creation_time = account_creation["created"]
|
||||
creation_time = map(str, creation_time)
|
||||
creation_time = datetime.datetime.strptime("/".join(creation_time), "%Y/%m/%d/%H/%M/%S")
|
||||
creation_time = datetime.datetime.strptime("/".join(creation_time),
|
||||
"%Y/%m/%d/%H/%M/%S")
|
||||
# Convert to IST
|
||||
creation_time += datetime.timedelta(hours=5, minutes=30)
|
||||
return str(creation_time)
|
||||
|
|
@ -248,6 +230,7 @@ def get_account_creation_date(pb_id):
|
|||
# delta_hours = delta.total_seconds() / (60 * 60)
|
||||
# return delta_hours
|
||||
|
||||
|
||||
def get_device_accounts(pb_id):
|
||||
url = "http://bombsquadgame.com/bsAccountInfo?buildNumber=20258&accountID=" + pb_id
|
||||
data = _make_request_safe(lambda: urllib.request.urlopen(url))
|
||||
|
|
@ -259,6 +242,7 @@ def get_device_accounts(pb_id):
|
|||
else:
|
||||
return accounts
|
||||
|
||||
|
||||
# ======= yes fucking threading code , dont touch ==============
|
||||
|
||||
|
||||
|
|
@ -269,41 +253,32 @@ class LoadProfile(threading.Thread):
|
|||
threading.Thread.__init__(self)
|
||||
self.pbid = pb_id
|
||||
|
||||
|
||||
def run(self):
|
||||
player_data = pdata.get_info(self.pbid)
|
||||
_ba.pushcall(Call(on_player_join_server,self.pbid,player_data),from_other_thread=True)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
_ba.pushcall(Call(on_player_join_server, self.pbid, player_data),
|
||||
from_other_thread=True)
|
||||
|
||||
|
||||
# ================ http ================
|
||||
class FetchThread(threading.Thread):
|
||||
def __init__(self,target, callback=None,pb_id="ji",display_string="XXX"):
|
||||
|
||||
super(FetchThread, self).__init__(target=self.target_with_callback, args=(pb_id,display_string,))
|
||||
def __init__(self, target, callback=None, pb_id="ji",
|
||||
display_string="XXX"):
|
||||
super(FetchThread, self).__init__(target=self.target_with_callback,
|
||||
args=(pb_id, display_string,))
|
||||
self.callback = callback
|
||||
self.method = target
|
||||
|
||||
|
||||
def target_with_callback(self, pb_id, display_string):
|
||||
|
||||
data = self.method(pb_id)
|
||||
if self.callback is not None:
|
||||
self.callback(data, pb_id, display_string)
|
||||
|
||||
|
||||
def my_acc_age(pb_id):
|
||||
|
||||
return get_account_creation_date(pb_id)
|
||||
|
||||
|
||||
def save_age(age, pb_id, display_string):
|
||||
|
||||
|
||||
pdata.add_profile(pb_id, display_string, display_string, age)
|
||||
time.sleep(2)
|
||||
thread2 = FetchThread(
|
||||
|
|
@ -318,22 +293,20 @@ def save_age(age, pb_id,display_string):
|
|||
logger.log(pb_id + "|| kicked > new account")
|
||||
_ba.pushcall(Call(kick_by_pb_id, pb_id, msg), from_other_thread=True)
|
||||
|
||||
|
||||
def save_ids(ids, pb_id, display_string):
|
||||
|
||||
|
||||
pdata.update_display_string(pb_id, ids)
|
||||
|
||||
|
||||
if display_string not in ids:
|
||||
msg = "Spoofed Id detected , Goodbye"
|
||||
_ba.pushcall(Call(kick_by_pb_id, pb_id, msg), from_other_thread=True)
|
||||
serverdata.clients[pb_id]["verified"] = False
|
||||
logger.log(pb_id+"|| kicked , for using spoofed id "+display_string)
|
||||
logger.log(
|
||||
pb_id + "|| kicked , for using spoofed id " + display_string)
|
||||
else:
|
||||
serverdata.clients[pb_id]["verified"] = True
|
||||
|
||||
|
||||
|
||||
def kick_by_pb_id(pb_id, msg):
|
||||
for ros in _ba.get_game_roster():
|
||||
if ros['account_id'] == pb_id:
|
||||
|
|
@ -341,7 +314,6 @@ def kick_by_pb_id(pb_id,msg):
|
|||
_ba.disconnect_client(ros['client_id'])
|
||||
|
||||
|
||||
|
||||
def get_account_age(ct):
|
||||
creation_time = datetime.datetime.strptime(ct, "%Y-%m-%d %H:%M:%S")
|
||||
now = datetime.datetime.now()
|
||||
|
|
@ -366,3 +338,18 @@ def reportSpam(id):
|
|||
profiles[id]["spamCount"] = count
|
||||
profiles[id]["lastSpam"] = now
|
||||
pdata.commit_profiles(profiles)
|
||||
|
||||
def on_join_request(ip):
|
||||
now = time.time()
|
||||
if ip in serverdata.ips:
|
||||
lastRequest = serverdata.ips[ip]["lastRequest"]
|
||||
count = serverdata.ips[ip]["count"]
|
||||
if now - lastRequest < 5:
|
||||
count +=1
|
||||
if count > 40:
|
||||
_ba.ban_ip(ip)
|
||||
else:
|
||||
count = 0
|
||||
serverdata.ips[ip] = {"lastRequest":time.time(),"count":count}
|
||||
else:
|
||||
serverdata.ips[ip]={"lastRequest":time.time(),"count":0}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue