swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-14 23:07:48 -04:00
Code Issues Projects Releases Wiki Activity

clean up the login server output

Browse Source
This commit is contained in:
DarthArgus
2016-12-28 19:48:07 +00:00
parent f7625d1689
commit e447aef1a3
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/LoginServer/src/shared/ClientConnection.cpp
+32 -18
View File
@@ -169,8 +169,8 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
bool authOK = false;
StationId suid = atoi(id.c_str());
static const std::string authURL(ConfigLoginServer::getExternalAuthUrl());
std::string uname;
std::string uname;
std::string parentAccount;
std::vector<std::string> childAccounts;
@@ -194,7 +194,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
parentAccount = api.getString("mainAccount");
childAccounts = api.getStringVector("subAccounts");
} else {
std::string msg = api.getString("message");
std::string msg(api.getString("message"));
if (msg.empty()) {
msg = "Invalid username or password.";
}
@@ -214,30 +214,44 @@ void ClientConnection::validateClient(const std::string &id, const std::string &
if (authOK) {
if (suid == 0) {
if (uname.length() > MAX_ACCOUNT_NAME_LENGTH) {
uname.resize(MAX_ACCOUNT_NAME_LENGTH);
}
uname.resize(MAX_ACCOUNT_NAME_LENGTH);
std::hash<std::string> h;
suid = h(uname.c_str());
std::hash<std::string> hasher;
suid = hasher(uname);
}
std::hash<std::string> h;
StationId parent = h(parentAccount);
REPORT_LOG(true, ("Client connected. Username: %s (%lu) \n", uname.c_str(), suid));
REPORT_LOG(true,
("Client connected. Station Id: %llu, Username: %s, Parent %s\n", suid, uname.c_str(), parentAccount.c_str()));
StationId parent = -1;
if (!parentAccount.empty()) {
parentAccount.resize(MAX_ACCOUNT_NAME_LENGTH);
std::hash<std::string> hasher;
parent = hasher(parentAccount);
if (parentAccount != uname) {
REPORT_LOG(true, ("\t%s's parent is %s (%lu) \n", uname.c_str(), parentAccount.c_str(), parent));
}
} else {
parentAccount = "(Empty Parent!) "+uname;
}
for (auto i : childAccounts) {
if (i.length() > MAX_ACCOUNT_NAME_LENGTH) {
i.resize(MAX_ACCOUNT_NAME_LENGTH);
}
std::string child(i);
StationId childID = h(i);
REPORT_LOG(true, ("\tA child account for %s is %s (%llu)\n", parentAccount.c_str(), i.c_str(), childID));
if (!child.empty()) {
std::hash<std::string> hasher;
child.resize(MAX_ACCOUNT_NAME_LENGTH);
// insert all related accounts, if not already there, into the db
DatabaseConnection::getInstance().upsertAccountRelationship(parent, childID);
StationId childID = hasher(child);
REPORT_LOG(true, ("\tchild of %s (%lu) is %s (%lu) \n", parentAccount.c_str(), parent, child.c_str(), childID));
// insert all related accounts, if not already there, into the db
DatabaseConnection::getInstance().upsertAccountRelationship(parent, childID);
} else {
WARNING(true, ("Login API returned empty child account(s)."));
}
}
LOG("LoginClientConnection",