Skip to content

Add case sensitivity parameter to getAccount #230

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jan 7, 2019
Merged

Add case sensitivity parameter to getAccount #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6d52cc
Add case sensitivity parameter
Dezash Jul 8, 2018
28c1ea8
Prioritize exact account matches first
Dezash Jul 9, 2018
63eee25
Check passwords in case-insensitive search
Dezash Jul 9, 2018
32cbf45
Merge branch 'master' into feature/case-sensitivity
Dezash Jul 22, 2018
ab6bcef
Merge branch 'master' into feature/case-sensitivity
qaisjp Jul 22, 2018
579e445
Merge remote-tracking branch 'upstream/master' into dezash/case-sensi…
botder Jan 6, 2019
b98340a
Clean up CAccountManager::Get as requested
botder Jan 6, 2019
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
38 changes: 31 additions & 7 deletions Server/mods/deathmatch/logic/CAccountManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,22 +387,46 @@ bool CAccountManager::IntegrityCheck()
return true;
}

CAccount* CAccountManager::Get(const char* szName)
CAccount* CAccountManager::Get(const char* szName, const char* szPassword, bool bCaseSensitive)
{
if (szName && szName[0])
{
std::vector<CAccount*> results;
m_List.FindAccountMatches(&results, szName, true);
for (uint i = 0; i < results.size(); i++)
m_List.FindAccountMatches(&results, szName, bCaseSensitive);

if (!bCaseSensitive)
{
CAccount* pAccount = results[i];
if (pAccount->IsRegistered())
CAccount* pFirstMatchAccount = nullptr;

for (CAccount* pAccount : results)
{
return pAccount;
if (!pAccount->IsRegistered())
continue;

if (szPassword && !pAccount->IsPassword(szPassword))
continue;

if (pAccount->GetName() == szName)
{
return pAccount;
}
else if (!pFirstMatchAccount)
{
pFirstMatchAccount = pAccount;
}
}

return pFirstMatchAccount;
}

for (CAccount* pAccount : results)
{
if (pAccount->IsRegistered())
return pAccount;
}
}
return NULL;

return nullptr;
}

CAccount* CAccountManager::GetAccountFromScriptID(uint uiScriptID)
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CAccountManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class CAccountManager
bool SaveSettings(void);
bool IntegrityCheck(void);

CAccount* Get(const char* szName);
CAccount* Get(const char* szName, const char* szPassword = nullptr, bool caseSensitive = true);
CAccount* GetAccountFromScriptID(uint uiScriptID);
SString GetActiveCaseVariation(const SString& strName);

Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10986,11 +10986,11 @@ CAccount* CStaticFunctionDefinitions::AddAccount(const SString& strName, const S
return NULL;
}

CAccount* CStaticFunctionDefinitions::GetAccount(const char* szName, const char* szPassword)
CAccount* CStaticFunctionDefinitions::GetAccount(const char* szName, const char* szPassword, bool bCaseSensitive)
{
assert(szName);

CAccount* pCurrentAccount = m_pAccountManager->Get(szName);
CAccount* pCurrentAccount = m_pAccountManager->Get(szName, szPassword, bCaseSensitive);
if (pCurrentAccount && (!szPassword || pCurrentAccount->IsPassword(szPassword)))
return pCurrentAccount;
else
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ class CStaticFunctionDefinitions
static bool ExecuteSQLQuery(const std::string& str, CLuaArguments* pArgs, CRegistryResult* pResult);

// Account get funcs
static CAccount* GetAccount(const char* szName, const char* szPassword);
static CAccount* GetAccount(const char* szName, const char* szPassword, bool bCaseSensitive = true);
static void GetAccounts(lua_State* pLua);
static CClient* GetAccountPlayer(CAccount* pAccount);
static bool IsGuestAccount(CAccount* pAccount, bool& bGuest);
Expand Down
7 changes: 6 additions & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ int CLuaAccountDefs::GetAccount(lua_State* luaVM)
SString strName;
SString strPassword;
bool bUsePassword = false;
bool bCaseSensitive;

CScriptArgReader argStream(luaVM);
argStream.ReadString(strName);
Expand All @@ -223,10 +224,14 @@ int CLuaAccountDefs::GetAccount(lua_State* luaVM)
argStream.ReadString(strPassword);
bUsePassword = true;
}
else
argStream.Skip(1);

argStream.ReadBool(bCaseSensitive, true);

if (!argStream.HasErrors())
{
CAccount* pAccount = CStaticFunctionDefinitions::GetAccount(strName, bUsePassword ? strPassword.c_str() : NULL);
CAccount* pAccount = CStaticFunctionDefinitions::GetAccount(strName, bUsePassword ? strPassword.c_str() : NULL, bCaseSensitive);
if (pAccount)
{
lua_pushaccount(luaVM, pAccount);
Expand Down