pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 02:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with command length

Browse Source
This commit is contained in:
Akkadius 2019-08-09 00:43:25 -05:00
parent 5fce042a31
commit ea15e9bc5f
4 changed files with 126 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/cli/eqemu_command_handler.cpp
View File

@ -148,10 +148,10 @@ namespace EQEmuCommand {
int max_command_length = 0; int max_command_length = 0;
for (auto &it: in_function_map) { for (auto &it: in_function_map) {
if (it.first.length() > max_command_length) {
std::stringstream command; std::stringstream command;
command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset; command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset;
max_command_length = command.str().length() + 5; if (command.str().length() > max_command_length) {
max_command_length = command.str().length() + 1;
} }
} }

61
loginserver/account_management.cpp
View File

@ -243,19 +243,30 @@ bool AccountManagement::UpdateLoginserverUserCredentials(
return true; return true;
} }
bool AccountManagement::CheckExternalLoginserverUserCredentials(const std::string &in_account_username, const std::string &in_account_password) bool AccountManagement::CheckExternalLoginserverUserCredentials(
const std::string &in_account_username,
const std::string &in_account_password
)
{ {
auto res = task_runner.Enqueue([&]() -> bool { auto res = task_runner.Enqueue(
[&]() -> bool {
bool running = true; bool running = true;
bool ret = false; bool ret = false;
EQ::Net::DaybreakConnectionManager mgr; EQ::Net::DaybreakConnectionManager mgr;
std::shared_ptr<EQ::Net::DaybreakConnection> c; std::shared_ptr<EQ::Net::DaybreakConnection> c;
mgr.OnNewConnection([&](std::shared_ptr<EQ::Net::DaybreakConnection> connection) { mgr.OnNewConnection(
[&](std::shared_ptr<EQ::Net::DaybreakConnection> connection) {
c = connection; c = connection;
}); }
);
mgr.OnConnectionStateChange([&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, EQ::Net::DbProtocolStatus from, EQ::Net::DbProtocolStatus to) { mgr.OnConnectionStateChange(
[&](
std::shared_ptr<EQ::Net::DaybreakConnection> conn,
EQ::Net::DbProtocolStatus from,
EQ::Net::DbProtocolStatus to
) {
if (EQ::Net::StatusConnected == to) { if (EQ::Net::StatusConnected == to) {
EQ::Net::DynamicPacket p; EQ::Net::DynamicPacket p;
p.PutUInt16(0, 1); //OP_SessionReady p.PutUInt16(0, 1); //OP_SessionReady
@ -265,14 +276,17 @@ bool AccountManagement::CheckExternalLoginserverUserCredentials(const std::strin
else if (EQ::Net::StatusDisconnected == to) { else if (EQ::Net::StatusDisconnected == to) {
running = false; running = false;
} }
}); }
);
mgr.OnPacketRecv([&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p) { mgr.OnPacketRecv(
[&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p) {
auto opcode = p.GetUInt16(0); auto opcode = p.GetUInt16(0);
switch (opcode) { switch (opcode) {
case 0x0017: //OP_ChatMessage case 0x0017: //OP_ChatMessage
{ {
size_t buffer_len = in_account_username.length() + in_account_password.length() + 2; size_t buffer_len =
in_account_username.length() + in_account_password.length() + 2;
std::unique_ptr<char[]> buffer(new char[buffer_len]); std::unique_ptr<char[]> buffer(new char[buffer_len]);
strcpy(&buffer[0], in_account_username.c_str()); strcpy(&buffer[0], in_account_username.c_str());
@ -289,12 +303,11 @@ bool AccountManagement::CheckExternalLoginserverUserCredentials(const std::strin
p.PutUInt16(0, 2); //OP_Login p.PutUInt16(0, 2); //OP_Login
p.PutUInt32(2, 3); p.PutUInt32(2, 3);
eqcrypt_block(&buffer[0], buffer_len, (char*)p.Data() + 12, true); eqcrypt_block(&buffer[0], buffer_len, (char *) p.Data() + 12, true);
c->QueuePacket(p); c->QueuePacket(p);
break; break;
} }
case 0x0018: case 0x0018: {
{
auto encrypt_size = p.Length() - 12; auto encrypt_size = p.Length() - 12;
if (encrypt_size % 8 > 0) { if (encrypt_size % 8 > 0) {
encrypt_size = (encrypt_size / 8) * 8; encrypt_size = (encrypt_size / 8) * 8;
@ -302,40 +315,40 @@ bool AccountManagement::CheckExternalLoginserverUserCredentials(const std::strin
std::unique_ptr<char[]> decrypted(new char[encrypt_size]); std::unique_ptr<char[]> decrypted(new char[encrypt_size]);
eqcrypt_block((char*)p.Data() + 12, encrypt_size, &decrypted[0], false); eqcrypt_block((char *) p.Data() + 12, encrypt_size, &decrypted[0], false);
EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size); EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size);
auto response_error = sp.GetUInt16(1); auto response_error = sp.GetUInt16(1);
if (response_error > 101) { {
ret = false; ret = response_error <= 101;
running = false;
}
else {
ret = true;
running = false; running = false;
} }
break; break;
} }
} }
}); }
);
EQ::Net::DNSLookup("login.eqemulator.net", 5999, false, [&](const std::string &addr) { EQ::Net::DNSLookup(
if (addr == "") { "login.eqemulator.net", 5999, false, [&](const std::string &addr) {
if (addr.empty()) {
ret = false; ret = false;
running = false; running = false;
} }
mgr.Connect(addr, 5999); mgr.Connect(addr, 5999);
}); }
);
auto &loop = EQ::EventLoop::Get(); auto &loop = EQ::EventLoop::Get();
while (true == running) { while (running) {
loop.Process(); loop.Process();
} }
return ret; return ret;
}); }
);
return res.get(); return res.get();
} }