tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect hash size for User objects 

fixes #12533
This commit is contained in:
Gunnar Beutner 2016-08-25 07:37:41 +02:00
parent 8ed21fcdad
commit 225bb8029a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/db_ido/dbconnection.cpp
View File

@ -444,6 +444,7 @@ void DbConnection::UpdateObject(const ConfigObject::Ptr& object)
Dictionary::Ptr configFields = dbobj->GetConfigFields(); Dictionary::Ptr configFields = dbobj->GetConfigFields();
String configHash = dbobj->CalculateConfigHash(configFields); String configHash = dbobj->CalculateConfigHash(configFields);
ASSERT(configHash.GetLength() <= 64);
configFields->Set("config_hash", configHash); configFields->Set("config_hash", configHash);
String cachedHash = GetConfigHash(dbobj); String cachedHash = GetConfigHash(dbobj);

2
lib/db_ido/userdbobject.cpp
View File

@ -174,5 +174,5 @@ String UserDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
if (groups) if (groups)
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
return hashData; return SHA256(hashData);
} }