From f1803b2f5211d0c86c9381cef1416d1d7d0faa89 Mon Sep 17 00:00:00 2001 From: RonaldReagan Date: Fri, 23 Apr 2021 06:59:49 -0600 Subject: [PATCH] Allow passwordless connect admin --- source/src/client.cpp | 2 -- source/src/server.cpp | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index 09b46959..1a7e57a5 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -115,7 +115,6 @@ COMMANDN(connect, connectserv, "sis"); void connectadmin(char *servername, int *serverport, char *password) { modprotocol = false; - if(!password[0]) return; connectserv_(servername, *serverport, password, CR_ADMIN); } COMMAND(connectadmin, "sis"); @@ -137,7 +136,6 @@ COMMANDN(modconnect, modconnectserv, "sis"); void modconnectadmin(char *servername, int *serverport, char *password) { modprotocol = true; - if(!password[0]) return; connectserv_(servername, *serverport, password, CR_ADMIN); } COMMAND(modconnectadmin, "sis"); diff --git a/source/src/server.cpp b/source/src/server.cpp index ff8ff504..6699ae72 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -3096,6 +3096,9 @@ void process(ENetPacket *packet, int sender, int chan) bool srvfull = numnonlocalclients() > scl.maxclients; bool srvprivate = sg->mastermode == MM_PRIVATE || sg->mastermode == MM_MATCH; bool matchreconnect = sg->mastermode == MM_MATCH && findscore(*cl, false); + if (cl->pubkeyhex[0]) { + concatformatstring(tags, ", pubkey: %s", cl->pubkeyhex); + } int bl = 0, wl = nickblacklist.checkwhitelist(*cl); if(wl == NWL_PASS) concatstring(tags, ", nickname whitelist match"); if(wl == NWL_UNLISTED) bl = nickblacklist.checkblacklist(cl->name); @@ -3132,6 +3135,24 @@ void process(ENetPacket *packet, int sender, int chan) } mlog(ACLOG_INFO, "[%s] %s logged in using the admin password in line %d%s", cl->hostname, cl->name, pd.line, tags); } + else if(wantrole == CR_ADMIN && cl->checkvitadate(VS_ADMIN) && bantype != BAN_MASTER) // pass admins always through + { // Set as admin in vita and is trying to connect as admin + cl->isauthed = true; + clientrole = CR_ADMIN; + if(bantype == BAN_VOTE) + { + loopv(bans) if(bans[i].address.host == cl->peer->address.host) { bans.remove(i); concatstring(tags, ", ban removed"); break; } // remove admin bans + } + if(srvfull) + { + loopv(clients) if(i != sender && clients[i]->type==ST_TCPIP) + { + disconnect_client(i, DISC_MAXCLIENTS); // disconnect someone else to fit maxclients again + break; + } + } + mlog(ACLOG_INFO, "[%s] %s logged in using the vita admin claim%s", cl->hostname, cl->name, tags); + } else if(scl.serverpassword[0] && !(srvprivate || srvfull || banned)) { // server password required if(!strcmp(genpwdhash(cl->name, scl.serverpassword, cl->salt), cl->pwd))