ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 21:27:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in rhizome_write_open_journal()

Browse Source 
Was treating PAYLOAD_STATUS_NEW as an error
This commit is contained in:
Andrew Bettison 2015-03-23 17:40:08 +10:30
parent 015b4a0b07
commit 705dbeff09
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rhizome_store.c
View File

@ -1603,19 +1603,36 @@ enum rhizome_payload_status rhizome_write_open_journal(struct rhizome_write *wri
rhizome_manifest_set_tail(m, m->tail + advance_by);
enum rhizome_payload_status status = rhizome_open_write(write, NULL, new_filesize);
if (config.debug.rhizome)
DEBUGF("rhizome_open_write() returned %s", rhizome_payload_status_message(status));
DEBUGF("rhizome_open_write() returned %d %s", status, rhizome_payload_status_message(status));
if (status == RHIZOME_PAYLOAD_STATUS_NEW && copy_length > 0) {
// we don't need to bother decrypting the existing journal payload
enum rhizome_payload_status rstatus = rhizome_journal_pipe(write, &m->filehash, advance_by, copy_length);
if (config.debug.rhizome)
DEBUGF("rhizome_journal_pipe() returned %s", rhizome_payload_status_message(rstatus));
if (rstatus != RHIZOME_PAYLOAD_STATUS_STORED)
DEBUGF("rhizome_journal_pipe() returned %d %s", rstatus, rhizome_payload_status_message(rstatus));
int rstatus_valid = 0;
switch (rstatus) {
case RHIZOME_PAYLOAD_STATUS_EMPTY:
case RHIZOME_PAYLOAD_STATUS_NEW:
case RHIZOME_PAYLOAD_STATUS_STORED:
rstatus_valid = 1;
break;
case RHIZOME_PAYLOAD_STATUS_ERROR:
case RHIZOME_PAYLOAD_STATUS_WRONG_SIZE:
case RHIZOME_PAYLOAD_STATUS_WRONG_HASH:
case RHIZOME_PAYLOAD_STATUS_CRYPTO_FAIL:
case RHIZOME_PAYLOAD_STATUS_TOO_BIG:
case RHIZOME_PAYLOAD_STATUS_EVICTED:
rstatus_valid = 1;
status = RHIZOME_PAYLOAD_STATUS_ERROR;
break;
}
if (!rstatus_valid)
FATALF("rstatus = %d", rstatus);
}
if (status == RHIZOME_PAYLOAD_STATUS_NEW) {
status = rhizome_write_derive_key(m, write);
if (config.debug.rhizome)
DEBUGF("rhizome_write_derive_key() returned %s", rhizome_payload_status_message(status));
DEBUGF("rhizome_write_derive_key() returned %d %s", status, rhizome_payload_status_message(status));
}
if (status != RHIZOME_PAYLOAD_STATUS_NEW) {
rhizome_fail_write(write);

2
tests/rhizomerestful
View File

@ -1220,6 +1220,8 @@ test_RhizomeAppendJournalCreate() {
assert [ "$BK" = "$H_BK" ]
executeOk_servald rhizome list
assert_rhizome_list file1
executeOk_servald rhizome extract file "$BID" file1x
assert --message="extracted payload is correct" diff file1 file1x
}
runTests "$@"