dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store encrypted company password hashes in server saves

Browse Source 
Restore when loading back into the server if server has required secret
This commit is contained in:
Jonathan G Rennison
2022-01-03 03:09:32 +00:00
parent 1f50106466
commit e993afcd99
9 changed files with 188 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/settings.cpp
View File

@@ -143,6 +143,7 @@ typedef void SettingDescProc(IniFile &ini, const SettingTable &desc, const char
typedef void SettingDescProcList(IniFile &ini, const char *grpname, StringList &list);
static bool IsSignedVarMemType(VarType vt);
static bool DecodeHexText(const char *pos, uint8 *dest, size_t dest_size);
/**
@@ -1684,6 +1685,38 @@ static bool ReplaceAsteriskWithEmptyPassword(std::string &newval)
return true;
}
static bool IsValidHexKeyString(const std::string &newval)
{
for (const char c : newval) {
if (!IsValidChar(c, CS_HEXADECIMAL)) return false;
}
return true;
}
static bool IsValidHex128BitKeyString(std::string &newval)
{
return newval.size() == 32 && IsValidHexKeyString(newval);
}
static bool IsValidHex256BitKeyString(std::string &newval)
{
return newval.size() == 64 && IsValidHexKeyString(newval);
}
static void ParseCompanyPasswordStorageToken(const std::string &value)
{
extern uint8 _network_company_password_storage_token[16];
if (value.size() != 32) return;
DecodeHexText(value.c_str(), _network_company_password_storage_token, 16);
}
static void ParseCompanyPasswordStorageSecret(const std::string &value)
{
extern uint8 _network_company_password_storage_key[32];
if (value.size() != 64) return;
DecodeHexText(value.c_str(), _network_company_password_storage_key, 32);
}
/** Update the game info, and send it to the clients when we are running as a server. */
static void UpdateClientConfigValues()
{