pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 22:01: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

8
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; if (command.str().length() > max_command_length) {
max_command_length = command.str().length() + 5; max_command_length = command.str().length() + 1;
} }
} }

171
loginserver/account_management.cpp
View File

@ -24,7 +24,7 @@
#include "../common/event/event_loop.h" #include "../common/event/event_loop.h"
#include "../common/net/dns.h" #include "../common/net/dns.h"
extern LoginServer server; extern LoginServer server;
EQ::Event::TaskScheduler task_runner; EQ::Event::TaskScheduler task_runner;
/** /**
@ -243,99 +243,112 @@ 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 running = true; [&]() -> bool {
bool ret = false; bool running = true;
EQ::Net::DaybreakConnectionManager mgr; bool ret = false;
std::shared_ptr<EQ::Net::DaybreakConnection> c; EQ::Net::DaybreakConnectionManager mgr;
std::shared_ptr<EQ::Net::DaybreakConnection> c;
mgr.OnNewConnection([&](std::shared_ptr<EQ::Net::DaybreakConnection> connection) { mgr.OnNewConnection(
c = connection; [&](std::shared_ptr<EQ::Net::DaybreakConnection> connection) {
}); c = connection;
mgr.OnConnectionStateChange([&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, EQ::Net::DbProtocolStatus from, EQ::Net::DbProtocolStatus to) {
if (EQ::Net::StatusConnected == to) {
EQ::Net::DynamicPacket p;
p.PutUInt16(0, 1); //OP_SessionReady
p.PutUInt32(2, 2);
c->QueuePacket(p);
}
else if (EQ::Net::StatusDisconnected == to) {
running = false;
}
});
mgr.OnPacketRecv([&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p) {
auto opcode = p.GetUInt16(0);
switch (opcode) {
case 0x0017: //OP_ChatMessage
{
size_t buffer_len = in_account_username.length() + in_account_password.length() + 2;
std::unique_ptr<char[]> buffer(new char[buffer_len]);
strcpy(&buffer[0], in_account_username.c_str());
strcpy(&buffer[in_account_username.length() + 1], in_account_password.c_str());
size_t encrypted_len = buffer_len;
if (encrypted_len % 8 > 0) {
encrypted_len = ((encrypted_len / 8) + 1) * 8;
} }
);
EQ::Net::DynamicPacket p; mgr.OnConnectionStateChange(
p.Resize(12 + encrypted_len); [&](
p.PutUInt16(0, 2); //OP_Login std::shared_ptr<EQ::Net::DaybreakConnection> conn,
p.PutUInt32(2, 3); EQ::Net::DbProtocolStatus from,
EQ::Net::DbProtocolStatus to
eqcrypt_block(&buffer[0], buffer_len, (char*)p.Data() + 12, true); ) {
c->QueuePacket(p); if (EQ::Net::StatusConnected == to) {
break; EQ::Net::DynamicPacket p;
} p.PutUInt16(0, 1); //OP_SessionReady
case 0x0018: p.PutUInt32(2, 2);
{ c->QueuePacket(p);
auto encrypt_size = p.Length() - 12; }
if (encrypt_size % 8 > 0) { else if (EQ::Net::StatusDisconnected == to) {
encrypt_size = (encrypt_size / 8) * 8; running = false;
}
} }
);
std::unique_ptr<char[]> decrypted(new char[encrypt_size]); mgr.OnPacketRecv(
[&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p) {
auto opcode = p.GetUInt16(0);
switch (opcode) {
case 0x0017: //OP_ChatMessage
{
size_t buffer_len =
in_account_username.length() + in_account_password.length() + 2;
std::unique_ptr<char[]> buffer(new char[buffer_len]);
eqcrypt_block((char*)p.Data() + 12, encrypt_size, &decrypted[0], false); strcpy(&buffer[0], in_account_username.c_str());
strcpy(&buffer[in_account_username.length() + 1], in_account_password.c_str());
EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size); size_t encrypted_len = buffer_len;
auto response_error = sp.GetUInt16(1);
if (response_error > 101) { if (encrypted_len % 8 > 0) {
ret = false; encrypted_len = ((encrypted_len / 8) + 1) * 8;
running = false; }
EQ::Net::DynamicPacket p;
p.Resize(12 + encrypted_len);
p.PutUInt16(0, 2); //OP_Login
p.PutUInt32(2, 3);
eqcrypt_block(&buffer[0], buffer_len, (char *) p.Data() + 12, true);
c->QueuePacket(p);
break;
}
case 0x0018: {
auto encrypt_size = p.Length() - 12;
if (encrypt_size % 8 > 0) {
encrypt_size = (encrypt_size / 8) * 8;
}
std::unique_ptr<char[]> decrypted(new char[encrypt_size]);
eqcrypt_block((char *) p.Data() + 12, encrypt_size, &decrypted[0], false);
EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size);
auto response_error = sp.GetUInt16(1);
{
ret = response_error <= 101;
running = false;
}
break;
}
}
} }
else { );
ret = true;
running = false; EQ::Net::DNSLookup(
"login.eqemulator.net", 5999, false, [&](const std::string &addr) {
if (addr.empty()) {
ret = false;
running = false;
}
mgr.Connect(addr, 5999);
} }
break; );
}
}
});
EQ::Net::DNSLookup("login.eqemulator.net", 5999, false, [&](const std::string &addr) { auto &loop = EQ::EventLoop::Get();
if (addr == "") { while (running) {
ret = false; loop.Process();
running = false;
} }
mgr.Connect(addr, 5999); return ret;
});
auto &loop = EQ::EventLoop::Get();
while (true == running) {
loop.Process();
} }
);
return ret;
});
return res.get(); return res.get();
} }

14
loginserver/loginserver_command_handler.cpp
View File

@ -50,13 +50,13 @@ namespace LoginserverCommandHandler {
/** /**
* Register commands * Register commands
*/ */
function_map["login-user:check-credentials"] = &LoginserverCommandHandler::CheckLoginserverUserCredentials; function_map["login-user:check-credentials"] = &LoginserverCommandHandler::CheckLoginserverUserCredentials;
function_map["login-user:check-external-credentials"] = &LoginserverCommandHandler::CheckExternalLoginserverUserCredentials; function_map["login-user:check-external-credentials"] = &LoginserverCommandHandler::CheckExternalLoginserverUserCredentials;
function_map["login-user:create"] = &LoginserverCommandHandler::CreateLocalLoginserverAccount; function_map["login-user:create"] = &LoginserverCommandHandler::CreateLocalLoginserverAccount;
function_map["login-user:update-credentials"] = &LoginserverCommandHandler::UpdateLoginserverUserCredentials; function_map["login-user:update-credentials"] = &LoginserverCommandHandler::UpdateLoginserverUserCredentials;
function_map["web-api-token:create"] = &LoginserverCommandHandler::CreateLoginserverApiToken; function_map["web-api-token:create"] = &LoginserverCommandHandler::CreateLoginserverApiToken;
function_map["web-api-token:list"] = &LoginserverCommandHandler::ListLoginserverApiTokens; function_map["web-api-token:list"] = &LoginserverCommandHandler::ListLoginserverApiTokens;
function_map["world-admin:create"] = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount; function_map["world-admin:create"] = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount;
EQEmuCommand::HandleMenu(function_map, cmd, argc, argv); EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
} }

46
loginserver/loginserver_webserver.cpp
View File

@ -161,32 +161,32 @@ namespace LoginserverWebserver {
api.Post( api.Post(
"/account/credentials/validate/external", [](const httplib::Request &request, httplib::Response &res) { "/account/credentials/validate/external", [](const httplib::Request &request, httplib::Response &res) {
LoginserverWebserver::TokenManager::AuthCanRead(request, res); LoginserverWebserver::TokenManager::AuthCanRead(request, res);
Json::Value request_body = LoginserverWebserver::ParseRequestBody(request); Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
std::string username = request_body.get("username", "").asString(); std::string username = request_body.get("username", "").asString();
std::string password = request_body.get("password", "").asString(); std::string password = request_body.get("password", "").asString();
Json::Value response;
if (username.empty() || password.empty()) {
response["error"] = "Username or password not set";
LoginserverWebserver::SendResponse(response, res);
return;
}
bool credentials_valid = AccountManagement::CheckExternalLoginserverUserCredentials(
username,
password
);
if (credentials_valid) {
response["message"] = "Credentials valid!";
}
else {
response["error"] = "Credentials invalid!";
}
Json::Value response;
if (username.empty() || password.empty()) {
response["error"] = "Username or password not set";
LoginserverWebserver::SendResponse(response, res); LoginserverWebserver::SendResponse(response, res);
return;
} }
bool credentials_valid = AccountManagement::CheckExternalLoginserverUserCredentials(
username,
password
);
if (credentials_valid) {
response["message"] = "Credentials valid!";
}
else {
response["error"] = "Credentials invalid!";
}
LoginserverWebserver::SendResponse(response, res);
}
); );
} }