From 0eb525f992684cd1be0c3473fd4d70fb8e5ea277 Mon Sep 17 00:00:00 2001
From: Meltie2013 <Meltie2013@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:26:36 -0600
Subject: [PATCH] Refactor Account & Password Length (#129)

---
 src/game/WorldHandlers/AccountMgr.cpp | 13 +++++++++----
 src/game/WorldHandlers/AccountMgr.h   |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/game/WorldHandlers/AccountMgr.cpp b/src/game/WorldHandlers/AccountMgr.cpp
index 971c216f..fea4f6e7 100644
--- a/src/game/WorldHandlers/AccountMgr.cpp
+++ b/src/game/WorldHandlers/AccountMgr.cpp
@@ -48,13 +48,18 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
         return AOR_NAME_TOO_LONG;                            // username's too long
     }
 
+    if (utf8length(password) > MAX_PASSWORD_STR)
+    {
+        return AOR_PASS_TOO_LONG;                            // password too long                
+    }
+
     normalizeString(username);
     normalizeString(password);
 
     if (GetId(username))
     {
         {
-            return AOR_NAME_ALREADY_EXIST;                        // username does already exist
+            return AOR_NAME_ALREADY_EXIST;                   // username does already exist
         }
     }
 
@@ -64,7 +69,7 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
     }
     LoginDatabase.Execute("INSERT INTO `realmcharacters` (`realmid`, `acctid`, `numchars`) SELECT `realmlist`.`id`, `account`.`id`, 0 FROM `realmlist`,`account` LEFT JOIN `realmcharacters` ON `acctid`=`account`.`id` WHERE `acctid` IS NULL");
 
-    return AOR_OK;                                          // everything's fine
+    return AOR_OK;                                           // everything's fine
 }
 
 AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
@@ -128,7 +133,7 @@ AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname,
         return AOR_NAME_TOO_LONG;
     }
 
-    if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
+    if (utf8length(new_passwd) > MAX_PASSWORD_STR)
     {
         return AOR_PASS_TOO_LONG;
     }
@@ -157,7 +162,7 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
         return AOR_NAME_NOT_EXIST;                           // account doesn't exist
     }
 
-    if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
+    if (utf8length(new_passwd) > MAX_PASSWORD_STR)
     {
         return AOR_PASS_TOO_LONG;
     }
diff --git a/src/game/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
index cea6e76c..02ff0121 100644
--- a/src/game/WorldHandlers/AccountMgr.h
+++ b/src/game/WorldHandlers/AccountMgr.h
@@ -37,7 +37,8 @@ enum AccountOpResult
     AOR_DB_INTERNAL_ERROR
 };
 
-#define MAX_ACCOUNT_STR 16
+#define MAX_ACCOUNT_STR  16
+#define MAX_PASSWORD_STR 16
 
 class AccountMgr
 {
@@ -61,4 +62,5 @@ class AccountMgr
 };
 
 #define sAccountMgr MaNGOS::Singleton<AccountMgr>::Instance()
+
 #endif