Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-04-26 16:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release removes password generation

Browse Source
This commit is contained in:
David Markowitz 2025-01-20 10:44:47 -08:00
parent e4c2eecbc7
commit 890907922c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dMasterServer/MasterServer.cpp
View File

@ -211,8 +211,7 @@ int main(int argc, char** argv) {
if (createAccount) {
LOG("No accounts exist in the database. Please create an account.");
}
if ((argc > 1 &&
(strcmp(argv[1], "-a") == 0 || strcmp(argv[1], "--account") == 0)) || createAccount) {
if (true) {
std::string username;
std::string password;
@ -246,7 +245,8 @@ int main(int argc, char** argv) {
// Regenerate hash based on new password
char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE];
assert(GenerateBCryptPassword(password, 12, salt, hash) == 0);
int res = GenerateBCryptPassword(password, 12, salt, hash);
assert(res == 0);
Database::Get()->UpdateAccountPassword(accountId->id, std::string(hash, BCRYPT_HASHSIZE));
@ -284,7 +284,8 @@ int main(int argc, char** argv) {
//Generate new hash for bcrypt
char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE];
assert(GenerateBCryptPassword(password, 12, salt, hash) == 0);
int res = GenerateBCryptPassword(password, 12, salt, hash);
assert(res == 0);
//Create account
try {
@ -323,7 +324,8 @@ int main(int argc, char** argv) {
char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE];
const auto& cfgPassword = Game::config->GetValue("master_password");
GenerateBCryptPassword(!cfgPassword.empty() ? cfgPassword : "3.25DARKFLAME1", 13, salt, hash);
int res = GenerateBCryptPassword(!cfgPassword.empty() ? cfgPassword : "3.25DARKFLAME1", 13, salt, hash);
assert(res == 0);
Game::server = new dServer(ourIP, ourPort, 0, maxClients, true, false, Game::logger, "", 0, ServerType::Master, Game::config, &Game::lastSignal, hash);