ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-10 20:39:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remember when we last verified each payload

Browse Source
This commit is contained in:
Jeremy Lakeman 2014-07-04 14:25:28 +09:30
parent 9395120b05
commit 096c9670ca
3 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rhizome.h
View File

@ -660,7 +660,7 @@ struct rhizome_read
uint64_t hash_offset;
SHA512_CTX sha512_context;
char invalid;
char verified;
uint64_t blob_rowid;
int blob_fd;

20
rhizome_database.c
View File

@ -253,7 +253,8 @@ int rhizome_opendb()
"id text not null primary key, "
"length integer, "
"datavalid integer, "
"inserttime integer"
"inserttime integer, "
"last_verified integer"
");", END) == -1
|| sqlite_exec_void_retry(&retry,
"CREATE TABLE IF NOT EXISTS FILEBLOBS("
@ -295,15 +296,18 @@ int rhizome_opendb()
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "CREATE TABLE IF NOT EXISTS IDENTITY(uuid text not null); ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "PRAGMA user_version=5;", END);
}
if (version<6){
if (version<6 && meta.mtime.tv_sec != -1){
// we've always been at war with eurasia
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS GROUPLIST; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS GROUPMEMBERSHIPS; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS VERIFICATIONS; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS FILEMANIFESTS;", END);
}
if (version<7){
if (meta.mtime.tv_sec != -1){
// we've always been at war with eurasia
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS GROUPLIST; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS GROUPMEMBERSHIPS; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS VERIFICATIONS; ", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "DROP TABLE IF EXISTS FILEMANIFESTS;", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "ALTER TABLE FILES ADD COLUMN last_verified integer;", END);
}
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "PRAGMA user_version=6;", END);
sqlite_exec_void_loglevel(LOG_LEVEL_WARN, "PRAGMA user_version=7;", END);
}
// TODO recreate tables with collate nocase on all hex columns

33
rhizome_store.c
View File

@ -785,12 +785,15 @@ enum rhizome_payload_status rhizome_finish_write(struct rhizome_write *write)
if (sqlite_exec_void_retry(&retry, "BEGIN TRANSACTION;", END) == -1)
goto dbfailure;
time_ms_t now = gettime_ms();
if (sqlite_exec_void_retry(
&retry,
"INSERT OR REPLACE INTO FILES(id,length,datavalid,inserttime) VALUES(?,?,1,?);",
"INSERT OR REPLACE INTO FILES(id,length,datavalid,inserttime,last_verified) VALUES(?,?,1,?,?);",
RHIZOME_FILEHASH_T, &write->id,
INT64, write->file_length,
INT64, gettime_ms(),
INT64, now,
INT64, now,
END
) == -1
)
@ -1016,6 +1019,9 @@ enum rhizome_payload_status rhizome_open_read(struct rhizome_read *read, const r
read->id = *hashp;
read->blob_rowid = 0;
read->blob_fd = -1;
read->verified = 0;
read->offset = 0;
read->hash_offset = 0;
if (sqlite_exec_uint64(&read->length,"SELECT length FROM FILES WHERE id = ?",
RHIZOME_FILEHASH_T, &read->id, END) == -1)
@ -1056,8 +1062,6 @@ enum rhizome_payload_status rhizome_open_read(struct rhizome_read *read, const r
if (config.debug.rhizome_store)
DEBUGF("Opened stored file %s as fd %d, len %"PRIx64, blob_path, read->blob_fd, read->length);
}
read->offset = 0;
read->hash_offset = 0;
SHA512_Init(&read->sha512_context);
return RHIZOME_PAYLOAD_STATUS_STORED;
}
@ -1114,7 +1118,7 @@ ssize_t rhizome_read(struct rhizome_read *read_state, unsigned char *buffer, siz
{
IN();
// hash check failed, just return an error
if (read_state->invalid)
if (read_state->verified == -1)
RETURN(-1);
sqlite_retry_state retry = SQLITE_RETRY_STATE_DEFAULT;
@ -1127,15 +1131,19 @@ ssize_t rhizome_read(struct rhizome_read *read_state, unsigned char *buffer, siz
if (read_state->hash_offset == read_state->offset && buffer && bytes_read>0){
SHA512_Update(&read_state->sha512_context, buffer, bytes_read);
read_state->hash_offset += bytes_read;
// if we hash everything and the has doesn't match, we need to delete the payload
// if we hash everything and the hash doesn't match, we need to delete the payload
if (read_state->hash_offset >= read_state->length){
rhizome_filehash_t hash_out;
SHA512_Final(hash_out.binary, &read_state->sha512_context);
SHA512_End(&read_state->sha512_context, NULL);
if (cmp_rhizome_filehash_t(&read_state->id, &hash_out) != 0) {
// hash failure, mark the payload as invalid
read_state->invalid = 1;
read_state->verified = -1;
RETURN(WHYF("Expected hash=%s, got %s", alloca_tohex_rhizome_filehash_t(read_state->id), alloca_tohex_rhizome_filehash_t(hash_out)));
}else{
// we read it, and it's good. Lets remember that (not fatal if the database is locked)
read_state->verified = 1;
}
}
}
@ -1225,9 +1233,18 @@ void rhizome_read_close(struct rhizome_read *read)
close(read->blob_fd);
read->blob_fd = -1;
}
if (read->invalid) {
if (read->verified==-1) {
// delete payload!
rhizome_delete_file(&read->id);
}else if(read->verified==1) {
// remember when we verified the file
time_ms_t now = gettime_ms();
sqlite_exec_void_loglevel(LOG_LEVEL_WARN,
"UPDATE FILES SET last_verified = ? WHERE id=?",
INT64, now,
RHIZOME_FILEHASH_T, &read->id,
END);
}
}