pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-22 19:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enforce some naming limits people were getting around

Browse Source
This commit is contained in:
Michael Cook (mackal) 2021-02-07 17:00:48 -05:00
parent 0923ff040f
commit 6621338064
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
world/client.cpp
View File

@ -87,6 +87,17 @@ extern uint32 numclients;
extern volatile bool RunLoops; extern volatile bool RunLoops;
extern volatile bool UCSServerAvailable_; extern volatile bool UCSServerAvailable_;
// unused ATM, but here for reference, should match RoF2
enum class NameApprovalResponse : int {
NotValid = -1, // string ID 1576
Rejected = 0, // string ID 1581
Approved = 1,
CharacterLimit = 2, // string ID 1591 older clients mention 1 char on server
ThreeDeity = 3, // string ID 5502. 3 toons same deity team limit
HeadStartPreOoW = 4, // string ID 6862, head start failed due to OoW not being unlocked
HeadStartNoOoW = 5, // string ID 6863, head start failed due to not owning OoW
};
Client::Client(EQStreamInterface* ieqs) Client::Client(EQStreamInterface* ieqs)
: autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)), : autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)),
connect(1000), connect(1000),
@ -497,7 +508,7 @@ bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app)
return false; return false;
} }
snprintf(char_name, 64, "%s", (char*)app->pBuffer); auto length = snprintf(char_name, 64, "%s", (char*)app->pBuffer);
uchar race = app->pBuffer[64]; uchar race = app->pBuffer[64];
uchar clas = app->pBuffer[68]; uchar clas = app->pBuffer[68];
@ -509,19 +520,36 @@ bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app)
outapp->pBuffer = new uchar[1]; outapp->pBuffer = new uchar[1];
outapp->size = 1; outapp->size = 1;
bool valid = false; bool valid = true;
if(!database.CheckNameFilter(char_name)) { /* Name must be between 4 and 15 characters long, packet forged if this is true */
if (length < 4 || length > 15) {
valid = false; valid = false;
} }
/* Name must begin with an upper-case letter. */ /* Name must begin with an upper-case letter, can be sent with some tricking of the client */
else if (islower(char_name[0])) { else if (islower(char_name[0])) {
valid = false; valid = false;
} }
else if (database.ReserveName(GetAccountID(), char_name)) { /* Name must not have any spaces, packet forged if this is true */
valid = true; else if (strstr(char_name, " ")) {
valid = false;
}
/* I would like to do this later, since it's likely more expensive, but oh well */
else if (!database.CheckNameFilter(char_name)) {
valid = false;
} }
else { else {
/* Name must not not contain any uppercase letters, can be sent with some tricking of the client */
for (int i = 1; i < length; ++i) {
if (isupper(char_name[i])) {
valid = false; valid = false;
break;
}
}
}
/* Still not invalid, let's see if it's taken */
if (valid) {
valid = database.ReserveName(GetAccountID(), char_name);
} }
outapp->pBuffer[0] = valid ? 1 : 0; outapp->pBuffer[0] = valid ? 1 : 0;