db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-09 00:45:49 +02:00
Code Issues Releases Activity

Extern infoHash() so it can be used by other modules.

Browse Source 
This is currently needed only for testing, but there's no reason not to expose the function to everyone.
This commit is contained in:
David Steele
2019-04-23 13:58:19 -04:00
parent cddb0c05b4
commit aebac47cd5
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -45,6 +45,10 @@
<p>Add <code>iniSave()</code> and <code>iniMove()</code> to <code>Ini</code> object.</p>
</release-item>
<release-item>
<p>Extern <code>infoHash()</code> so it can be used by other modules.</p>
</release-item>
<release-item>
<p><code>varNewKv()</code> accepts a <code>KeyValue</code> object rather than creating one.</p>
</release-item>

42
src/info/info.c
View File

@ -41,9 +41,9 @@ struct Info
};
/***********************************************************************************************************************************
Return a hash of the contents of the info file
Generate hash for the contents of an ini file
***********************************************************************************************************************************/
static CryptoHash *
String *
infoHash(const Ini *ini)
{
FUNCTION_TEST_BEGIN();
@ -52,14 +52,15 @@ infoHash(const Ini *ini)
ASSERT(ini != NULL);
CryptoHash *result = cryptoHashNew(HASH_TYPE_SHA1_STR);
String *result = NULL;
MEM_CONTEXT_TEMP_BEGIN()
{
StringList *sectionList = iniSectionList(ini);
CryptoHash *hash = cryptoHashNew(HASH_TYPE_SHA1_STR);
StringList *sectionList = strLstSort(iniSectionList(ini), sortOrderAsc);
// Initial JSON opening bracket
cryptoHashProcessC(result, (const unsigned char *)"{", 1);
cryptoHashProcessC(hash, (const unsigned char *)"{", 1);
// Loop through sections and create hash for checking checksum
for (unsigned int sectionIdx = 0; sectionIdx < strLstSize(sectionList); sectionIdx++)
@ -68,14 +69,14 @@ infoHash(const Ini *ini)
// Add a comma before additional sections
if (sectionIdx != 0)
cryptoHashProcessC(result, (const unsigned char *)",", 1);
cryptoHashProcessC(hash, (const unsigned char *)",", 1);
// Create the section header
cryptoHashProcessC(result, (const unsigned char *)"\"", 1);
cryptoHashProcessStr(result, section);
cryptoHashProcessC(result, (const unsigned char *)"\":{", 3);
cryptoHashProcessC(hash, (const unsigned char *)"\"", 1);
cryptoHashProcessStr(hash, section);
cryptoHashProcessC(hash, (const unsigned char *)"\":{", 3);
StringList *keyList = iniSectionKeyList(ini, section);
StringList *keyList = strLstSort(iniSectionKeyList(ini, section), sortOrderAsc);
unsigned int keyListSize = strLstSize(keyList);
// Loop through values and build the section
@ -87,21 +88,26 @@ infoHash(const Ini *ini)
if ((strEq(section, INFO_SECTION_BACKREST_STR) && !strEq(key, INFO_KEY_CHECKSUM_STR)) ||
!strEq(section, INFO_SECTION_BACKREST_STR))
{
cryptoHashProcessC(result, (const unsigned char *)"\"", 1);
cryptoHashProcessStr(result, key);
cryptoHashProcessC(result, (const unsigned char *)"\":", 2);
cryptoHashProcessStr(result, iniGet(ini, section, strLstGet(keyList, keyIdx)));
cryptoHashProcessC(hash, (const unsigned char *)"\"", 1);
cryptoHashProcessStr(hash, key);
cryptoHashProcessC(hash, (const unsigned char *)"\":", 2);
cryptoHashProcessStr(hash, iniGet(ini, section, strLstGet(keyList, keyIdx)));
if ((keyListSize > 1) && (keyIdx < keyListSize - 1))
cryptoHashProcessC(result, (const unsigned char *)",", 1);
cryptoHashProcessC(hash, (const unsigned char *)",", 1);
}
}
// Close the key/value list
cryptoHashProcessC(result, (const unsigned char *)"}", 1);
cryptoHashProcessC(hash, (const unsigned char *)"}", 1);
}
// JSON closing bracket
cryptoHashProcessC(result, (const unsigned char *)"}", 1);
cryptoHashProcessC(hash, (const unsigned char *)"}", 1);
memContextSwitch(MEM_CONTEXT_OLD());
result = bufHex(cryptoHash(hash));
memContextSwitch(MEM_CONTEXT_TEMP());
}
MEM_CONTEXT_TEMP_END();
@ -161,7 +167,7 @@ infoLoad(Info *this, const Storage *storage, bool copyFile, CipherType cipherTyp
// Make sure the ini is valid by testing the checksum
const String *infoChecksumJson = iniGet(this->ini, INFO_SECTION_BACKREST_STR, INFO_KEY_CHECKSUM_STR);
const String *checksum = bufHex(cryptoHash(infoHash(this->ini)));
const String *checksum = infoHash(this->ini);
if (strSize(infoChecksumJson) == 0)
{

1
src/info/info.h
View File

@ -31,6 +31,7 @@ Getters
***********************************************************************************************************************************/
const String *infoCipherPass(const Info *this);
String *infoFileName(const Info *this);
String *infoHash(const Ini *ini);
Ini *infoIni(const Info *this);
/***********************************************************************************************************************************

2
test/src/module/command/infoTest.c
View File

@ -227,7 +227,7 @@ testRun(void)
content = strNew
(
"[backrest]\n"
"backrest-checksum=\"2edbac400200cc0bd559951f1ee166de5c6f5f49\"\n"
"backrest-checksum=\"c68d528a1b28f6ef1c370955ac8915eab737d402\"\n"
"backrest-format=5\n"
"backrest-version=\"2.04\"\n"
"\n"

2
test/src/module/info/infoBackupTest.c
View File

@ -98,7 +98,7 @@ testRun(void)
content = strNew
(
"[backrest]\n"
"backrest-checksum=\"b944d83dcfa33ac0eb88d41b16efc5aaa5da7ec1\"\n"
"backrest-checksum=\"7f77f7a8efc72bd99b1a20022b6db50d4cbd72fa\"\n"
"backrest-format=5\n"
"backrest-version=\"2.04\"\n"
"\n"