Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add admin account creation options from cli #1620

Merged
merged 4 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dDatabase/GameDatabase/ITables/IAccounts.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class IAccounts {

// Add a new account to the database.
virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;

// Update the GameMaster level of an account.
virtual void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) = 0;
};

#endif //!__IACCOUNTS__H__
1 change: 1 addition & 0 deletions dDatabase/GameDatabase/MySQL/MySQLDatabase.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class MySQLDatabase : public GameDatabase {
void AddBehavior(const IBehaviors::Info& info) override;
std::string GetBehavior(const int32_t behaviorId) override;
void RemoveBehavior(const int32_t characterId) override;
void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) override;
private:

// Generic query functions that can be used for any query.
Expand Down
4 changes: 4 additions & 0 deletions dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ void MySQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::s
void MySQLDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
ExecuteInsert("INSERT INTO accounts (name, password, gm_level) VALUES (?, ?, ?);", username, bcryptpassword, static_cast<int32_t>(eGameMasterLevel::OPERATOR));
}

void MySQLDatabase::UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) {
ExecuteUpdate("UPDATE accounts SET gm_level = ? WHERE id = ?;", static_cast<int32_t>(gmLevel), accountId);
}
39 changes: 35 additions & 4 deletions dMasterServer/MasterServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "Start.h"
#include "Server.h"
#include "CDZoneTableTable.h"
#include "eGameMasterLevel.h"

namespace Game {
Logger* logger = nullptr;
Expand Down Expand Up @@ -187,15 +188,20 @@ int main(int argc, char** argv) {
std::cout << "Enter a username: ";
std::cin >> username;

const auto checkIsAdmin = []() {
std::string admin;
std::cout << "What level of privilege should this account have? Please enter a number between 0 and 9 inclusive. No entry will default to 0." << std::endl;
EmosewaMC marked this conversation as resolved.
Show resolved Hide resolved
std::cin >> admin;
return admin;
};

auto accountId = Database::Get()->GetAccountInfo(username);
if (accountId) {
if (accountId && accountId->id != 0) {
LOG("Account with name \"%s\" already exists", username.c_str());
std::cout << "Do you want to change the password of that account? [y/n]?";
std::string prompt = "";
std::cin >> prompt;
if (prompt == "y" || prompt == "yes") {
if (accountId->id == 0) return EXIT_FAILURE;

//Read the password from the console without echoing it.
#ifdef __linux__
//This function is obsolete, but it only meant to be used by the
Expand All @@ -220,6 +226,20 @@ int main(int argc, char** argv) {
} else {
LOG("Account \"%s\" was not updated.", username.c_str());
}

std::cout << "Update admin privileges? [y/n]? ";
std::string admin;
std::cin >> admin;
bool updateAdmin = admin == "y" || admin == "yes";
if (updateAdmin) {
auto gmLevel = GeneralUtils::TryParse<int32_t>(checkIsAdmin()).value_or(0);
if (gmLevel > 9 || gmLevel < 0) {
LOG("Invalid admin level. Defaulting to 0");
gmLevel = 0;
}
Database::Get()->UpdateAccountGmLevel(accountId->id, static_cast<eGameMasterLevel>(gmLevel));
}

return EXIT_SUCCESS;
}

Expand Down Expand Up @@ -250,6 +270,17 @@ int main(int argc, char** argv) {
}

LOG("Account created successfully!");

accountId = Database::Get()->GetAccountInfo(username);
if (accountId) {
auto gmLevel = GeneralUtils::TryParse<int32_t>(checkIsAdmin()).value_or(0);
if (gmLevel > 9 || gmLevel < 0) {
LOG("Invalid admin level. Defaulting to 0");
gmLevel = 0;
}
Database::Get()->UpdateAccountGmLevel(accountId->id, static_cast<eGameMasterLevel>(gmLevel));
}

return EXIT_SUCCESS;
}

Expand Down Expand Up @@ -558,7 +589,7 @@ void HandlePacket(Packet* packet) {
inStream.Read(sessionKey);
LUString username;
inStream.Read(username);

for (auto it : activeSessions) {
if (it.second == username.string) {
activeSessions.erase(it.first);
Expand Down
Loading