ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-24 07:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
cf0e1aa8d6
serval-dna/rhizome_bundle.c

1656 lines
54 KiB
C
Raw Normal View History

Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
/*
Update some copyright notices
2014-11-19 13:31:12 +00:00
Serval DNA - Rhizome manifest operations
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
Copyright (C) 2010 Paul Gardner-Stephen
Update some copyright notices
2014-11-19 13:31:12 +00:00
Copyright (C) 2013-2014 Serval Project Inc.
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
Reuse command line parsing framework with monitor interface
2012-09-25 04:01:34 +00:00
#include <stdlib.h>
Add "rhizome add file" --force-new option Overrides the default behaviour of de-duplicating added manifests New 'rhizomeops' test case: AddForceDuplicate
2013-09-30 07:12:25 +00:00
#include <assert.h>
Add writev_all() function Use it in rhizome_write_manifest_file() instead of two separate write(2) system calls or buffered stdio.
2013-10-11 17:24:18 +00:00
#include <sys/uio.h>
Renamed mphlr.h to serval.h (also some temporary debugging has been added in some places)
2012-02-23 02:15:42 +00:00
#include "serval.h"
Overhaul debug flags Replace debugflags_t and DEBUG_XXX bit masks with config schema "debug.xxx" entries. No more support for "debug.all".
2012-12-11 05:29:46 +00:00
#include "conf.h"
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
#include "rhizome.h"
Reuse command line parsing framework with monitor interface
2012-09-25 04:01:34 +00:00
#include "str.h"
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
#include "mem.h"
Create keyring.h and move definitions there
2013-10-16 03:00:00 +00:00
#include "keyring.h"
Refactor dataformats into separate header
2013-11-25 02:39:54 +00:00
#include "dataformats.h"
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
static const char *rhizome_manifest_get(const rhizome_manifest *m, const char *var)
{
unsigned i;
for (i = 0; i < m->var_count; ++i)
if (strcmp(m->vars[i], var) == 0)
return m->values[i];
return NULL;
}
#if 0
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
static uint64_t rhizome_manifest_get_ui64(rhizome_manifest *m, const char *var)
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
{
unsigned i;
for (i = 0; i < m->var_count; ++i)
if (strcmp(m->vars[i], var) == 0) {
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
uint64_t val;
return str_to_uint64(m->values[i], 10, &val, NULL) ? val : -1;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
return -1;
}
#endif
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
/* Remove the field with the given label from the manifest
*
* @author Andrew Bettison <andrew@servalproject.com>
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
*/
static int _rhizome_manifest_del(struct __sourceloc __whence, rhizome_manifest *m, const char *var)
{
if (config.debug.rhizome_manifest)
DEBUGF("DEL manifest[%d].%s", m->manifest_record_number, var);
int ret = 0;
unsigned i;
for (i = 0; i < m->var_count; ++i)
if (strcmp(m->vars[i], var) == 0) {
free((char *) m->vars[i]);
free((char *) m->values[i]);
--m->var_count;
ret = 1;
break;
}
for (; i < m->var_count; ++i) {
m->vars[i] = m->vars[i + 1];
m->values[i] = m->values[i + 1];
}
return ret;
}
#define rhizome_manifest_set(m,var,value) _rhizome_manifest_set(__WHENCE__, (m), (var), (value))
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
#define rhizome_manifest_set_ui64(m,var,value) _rhizome_manifest_set_ui64(__WHENCE__, (m), (var), (value))
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
#define rhizome_manifest_del(m,var) _rhizome_manifest_del(__WHENCE__, (m), (var))
static const char *_rhizome_manifest_set(struct __sourceloc __whence, rhizome_manifest *m, const char *var, const char *value)
{
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d].%s = %s", m->manifest_record_number, var, alloca_str_toprint(value));
unsigned i;
for(i=0;i<m->var_count;i++)
if (strcmp(m->vars[i],var) == 0) {
const char *ret = str_edup(value);
if (ret == NULL)
return NULL;
free((char *)m->values[i]);
m->values[i] = ret;
return ret;
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (m->var_count >= NELS(m->vars))
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
return WHYNULL("no more manifest vars");
if ((m->vars[m->var_count] = str_edup(var)) == NULL)
return NULL;
const char *ret = m->values[m->var_count] = str_edup(value);
if (ret == NULL) {
free((char *)m->vars[i]);
m->vars[i] = NULL;
return NULL;
}
m->var_count++;
return ret;
}
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
static const char *_rhizome_manifest_set_ui64(struct __sourceloc __whence, rhizome_manifest *m, char *var, uint64_t value)
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
{
char str[50];
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
snprintf(str, sizeof str, "%" PRIu64, value);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
return rhizome_manifest_set(m, var, str);
}
void _rhizome_manifest_set_id(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_bid_t *bidp)
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
if (bidp) {
if (m->has_id && (bidp == &m->cryptoSignPublic || cmp_rhizome_bid_t(&m->cryptoSignPublic, bidp) == 0))
return; // unchanged
const char *v = rhizome_manifest_set(m, "id", alloca_tohex_rhizome_bid_t(*bidp));
assert(v); // TODO: remove known manifest fields from vars[]
m->cryptoSignPublic = *bidp;
m->has_id = 1;
} else if (m->has_id) {
bzero(&m->cryptoSignPublic, sizeof m->cryptoSignPublic); // not strictly necessary but aids debugging
m->has_id = 0;
} else
return; // unchanged
// The BID has changed.
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
// Any existing secret key and bundle key are no longer valid.
if (m->haveSecret) {
m->haveSecret = SECRET_UNKNOWN;
bzero(m->cryptoSignSecret, sizeof m->cryptoSignSecret); // not strictly necessary but aids debugging
}
if (m->has_bundle_key) {
m->has_bundle_key = 0;
m->bundle_key = RHIZOME_BK_NONE; // not strictly necessary but aids debugging
}
// Any authenticated author is no longer authenticated, but is still known to be in the keyring.
if (m->authorship == AUTHOR_AUTHENTIC)
m->authorship = AUTHOR_LOCAL;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
void _rhizome_manifest_set_version(struct __sourceloc __whence, rhizome_manifest *m, uint64_t version)
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
if (version) {
const char *v = rhizome_manifest_set_ui64(m, "version", version);
assert(v); // TODO: remove known manifest fields from vars[]
} else
rhizome_manifest_del(m, "version");
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->version = version;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Fix failing 'rhizomeops' tests
2015-03-18 16:51:27 +00:00
void _rhizome_manifest_del_version(struct __sourceloc __whence, rhizome_manifest *m)
{
_rhizome_manifest_set_version(__whence, m, 0);
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
void _rhizome_manifest_set_filesize(struct __sourceloc __whence, rhizome_manifest *m, uint64_t size)
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
if (size == RHIZOME_SIZE_UNSET) {
rhizome_manifest_del(m, "filesize");
} else {
const char *v = rhizome_manifest_set_ui64(m, "filesize", size);
assert(v); // TODO: remove known manifest fields from vars[]
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->filesize = size;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Fix failing 'rhizomeops' tests
2015-03-18 16:51:27 +00:00
void _rhizome_manifest_del_filesize(struct __sourceloc __whence, rhizome_manifest *m)
{
_rhizome_manifest_set_filesize(__whence, m, RHIZOME_SIZE_UNSET);
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
/* Must always set file size before setting the file hash, to avoid assertion failures.
*/
void _rhizome_manifest_set_filehash(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_filehash_t *hash)
{
if (hash) {
const char *v = rhizome_manifest_set(m, "filehash", alloca_tohex_rhizome_filehash_t(*hash));
assert(v); // TODO: remove known manifest fields from vars[]
m->filehash = *hash;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->has_filehash = 1;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
} else {
rhizome_manifest_del(m, "filehash");
m->filehash = RHIZOME_FILEHASH_NONE;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->has_filehash = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Fix failing 'rhizomeops' tests
2015-03-18 16:51:27 +00:00
void _rhizome_manifest_del_filehash(struct __sourceloc __whence, rhizome_manifest *m)
{
_rhizome_manifest_set_filehash(__whence, m, NULL);
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
void _rhizome_manifest_set_tail(struct __sourceloc __whence, rhizome_manifest *m, uint64_t tail)
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
if (tail == RHIZOME_SIZE_UNSET) {
rhizome_manifest_del(m, "tail");
m->is_journal = 0;
} else {
const char *v = rhizome_manifest_set_ui64(m, "tail", tail);
assert(v); // TODO: remove known manifest fields from vars[]
m->is_journal = 1;
}
Fix failing 'rhizomeops' tests
2015-03-18 16:51:27 +00:00
m->tail = tail;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
void _rhizome_manifest_set_bundle_key(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_bk_t *bkp)
{
if (bkp) {
const char *v = rhizome_manifest_set(m, "BK", alloca_tohex_rhizome_bk_t(*bkp));
assert(v); // TODO: remove known manifest fields from vars[]
m->bundle_key = *bkp;
m->has_bundle_key = 1;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
_rhizome_manifest_del_bundle_key(__whence, m);
}
void _rhizome_manifest_del_bundle_key(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->has_bundle_key) {
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
rhizome_manifest_del(m, "BK");
m->has_bundle_key = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
m->bundle_key = RHIZOME_BK_NONE; // not strictly necessary, but aids debugging
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
assert(rhizome_manifest_get(m, "BK") == NULL);
// Once there is no BK field, any authenticated authorship is no longer.
if (m->authorship == AUTHOR_AUTHENTIC)
m->authorship = AUTHOR_LOCAL;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
void _rhizome_manifest_set_service(struct __sourceloc __whence, rhizome_manifest *m, const char *service)
{
if (service) {
Enforce valid Rhizome 'service' and 'name' strings
2013-12-02 00:42:31 +00:00
assert(rhizome_str_is_manifest_service(service));
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
const char *v = rhizome_manifest_set(m, "service", service);
assert(v); // TODO: remove known manifest fields from vars[]
m->service = v;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
_rhizome_manifest_del_service(__whence, m);
}
void _rhizome_manifest_del_service(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->service) {
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->service = NULL;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
rhizome_manifest_del(m, "service");
} else
assert(rhizome_manifest_get(m, "service") == NULL);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
void _rhizome_manifest_set_name(struct __sourceloc __whence, rhizome_manifest *m, const char *name)
{
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (name) {
Enforce valid Rhizome 'service' and 'name' strings
2013-12-02 00:42:31 +00:00
assert(rhizome_str_is_manifest_name(name));
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
const char *v = rhizome_manifest_set(m, "name", name);
assert(v); // TODO: remove known manifest fields from vars[]
m->name = v;
} else {
rhizome_manifest_del(m, "name");
m->name = NULL;
}
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
void _rhizome_manifest_del_name(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->name) {
m->name = NULL;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
rhizome_manifest_del(m, "name");
} else
assert(rhizome_manifest_get(m, "name") == NULL);
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
void _rhizome_manifest_set_date(struct __sourceloc __whence, rhizome_manifest *m, time_ms_t date)
{
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
const char *v = rhizome_manifest_set_ui64(m, "date", (uint64_t)date);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
assert(v); // TODO: remove known manifest fields from vars[]
m->date = date;
m->has_date = 1;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
void _rhizome_manifest_del_date(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->has_date) {
m->has_date = 0;
m->finalised = 0;
rhizome_manifest_del(m, "date");
} else
assert(rhizome_manifest_get(m, "date") == NULL);
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
void _rhizome_manifest_set_sender(struct __sourceloc __whence, rhizome_manifest *m, const sid_t *sidp)
{
if (sidp) {
const char *v = rhizome_manifest_set(m, "sender", alloca_tohex_sid_t(*sidp));
assert(v); // TODO: remove known manifest fields from vars[]
m->sender = *sidp;
m->has_sender = 1;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
_rhizome_manifest_del_sender(__whence, m);
}
void _rhizome_manifest_del_sender(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->has_sender) {
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
rhizome_manifest_del(m, "sender");
m->sender = SID_ANY;
m->has_sender = 0;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
assert(rhizome_manifest_get(m, "sender") == NULL);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
void _rhizome_manifest_set_recipient(struct __sourceloc __whence, rhizome_manifest *m, const sid_t *sidp)
{
if (sidp) {
const char *v = rhizome_manifest_set(m, "recipient", alloca_tohex_sid_t(*sidp));
assert(v); // TODO: remove known manifest fields from vars[]
m->recipient = *sidp;
m->has_recipient = 1;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
_rhizome_manifest_del_recipient(__whence, m);
}
void _rhizome_manifest_del_recipient(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->has_recipient) {
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
rhizome_manifest_del(m, "recipient");
m->recipient = SID_ANY;
m->has_recipient = 0;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
} else
assert(rhizome_manifest_get(m, "recipient") == NULL);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
void _rhizome_manifest_set_crypt(struct __sourceloc __whence, rhizome_manifest *m, enum rhizome_manifest_crypt flag)
{
switch (flag) {
case PAYLOAD_CRYPT_UNKNOWN:
rhizome_manifest_del(m, "crypt");
break;
case PAYLOAD_CLEAR: {
const char *v = rhizome_manifest_set(m, "crypt", "0");
assert(v); // TODO: remove known manifest fields from vars[]
break;
}
case PAYLOAD_ENCRYPTED: {
const char *v = rhizome_manifest_set(m, "crypt", "1");
assert(v); // TODO: remove known manifest fields from vars[]
break;
}
default: abort();
}
m->payloadEncryption = flag;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->finalised = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Add ROWID field to struct rhizome_manifest New ".rowid" output field from rhizome add, import, extract, export operations. (Also added missing ".inserttime" and "date" fields to some operations.) Use new "rhizome add file" .rowid output field to check output of of /restful/rhizome/bundlelist.json
2013-11-11 07:43:38 +00:00
void _rhizome_manifest_set_rowid(struct __sourceloc __whence, rhizome_manifest *m, uint64_t rowid)
{
Add some Rhizome manifest DEBUG that was missing Revealed by -Wunused-parameter
2013-12-09 07:51:32 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d].rowid = %"PRIu64, m->manifest_record_number, rowid);
Add ROWID field to struct rhizome_manifest New ".rowid" output field from rhizome add, import, extract, export operations. (Also added missing ".inserttime" and "date" fields to some operations.) Use new "rhizome add file" .rowid output field to check output of of /restful/rhizome/bundlelist.json
2013-11-11 07:43:38 +00:00
m->rowid = rowid;
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
void _rhizome_manifest_set_inserttime(struct __sourceloc __whence, rhizome_manifest *m, time_ms_t time)
{
Add some Rhizome manifest DEBUG that was missing Revealed by -Wunused-parameter
2013-12-09 07:51:32 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d].inserttime = %"PRItime_ms_t, m->manifest_record_number, time);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
m->inserttime = time;
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
void _rhizome_manifest_set_author(struct __sourceloc __whence, rhizome_manifest *m, const sid_t *sidp)
{
if (sidp) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (m->authorship == ANONYMOUS || cmp_sid_t(&m->author, sidp) != 0) {
if (config.debug.rhizome_manifest)
DEBUGF("SET manifest[%d] author = %s", m->manifest_record_number, alloca_tohex_sid_t(*sidp));
m->author = *sidp;
m->authorship = AUTHOR_NOT_CHECKED;
}
} else
_rhizome_manifest_del_author(__whence, m);
}
void _rhizome_manifest_del_author(struct __sourceloc __whence, rhizome_manifest *m)
{
if (m->authorship != ANONYMOUS) {
if (config.debug.rhizome_manifest)
DEBUGF("DEL manifest[%d] author", m->manifest_record_number);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->author = SID_ANY;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
m->authorship = ANONYMOUS;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
}
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
/* Compute the hash of the manifest's body, including the NUL byte that separates the body from
* the signature block, and verify that a signature is present and is correct.
*
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
* If the manifest signature is valid, ie, the signature is a self-signature using the
* manifest's own private key, then sets the m->selfSigned flag and returns 1.
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
*
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
* If there are no signatures or if the signature block does not verify, then clears the
* m->selfSigned flag and returns 0.
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
*
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
* Only call this function on manifests for which rhizome_manifest_validate(m) has returned true
* (ie, m->finalised is set).
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
*/
refactored manifest verification into a separate function that is called only when needed, and marks a manifest as finalised if the verifcation fails. reading a manifest now never sets finalised flag, as either _finalise() or _verify() must be called.
2012-05-25 23:54:47 +00:00
int rhizome_manifest_verify(rhizome_manifest *m)
{
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
assert(m->finalised);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(m->manifest_body_bytes > 0);
assert(m->manifest_all_bytes > 0);
assert(m->manifest_body_bytes <= m->manifest_all_bytes);
Fix Rhizome manifest parsing bug If an over-large manifest was supplied, signature extraction went into a tight loop
2014-04-29 05:38:02 +00:00
assert(m->sig_count == 0);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (m->manifest_body_bytes == m->manifest_all_bytes)
assert(m->manifestdata[m->manifest_body_bytes - 1] == '\0');
// Hash the body
crypto_hash_sha512(m->manifesthash, m->manifestdata, m->manifest_body_bytes);
// Read signature blocks
unsigned ofs = m->manifest_body_bytes;
while (ofs < m->manifest_all_bytes) {
if (rhizome_manifest_extract_signature(m, &ofs) == -1)
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
break;
refactored manifest verification into a separate function that is called only when needed, and marks a manifest as finalised if the verifcation fails. reading a manifest now never sets finalised flag, as either _finalise() or _verify() must be called.
2012-05-25 23:54:47 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(ofs <= m->manifest_all_bytes);
// Make sure the first signatory's public key is the bundle ID
assert(m->has_id);
if (m->sig_count == 0) {
if (config.debug.rhizome)
DEBUG("Manifest has no signature blocks, but should have self-signature block");
m->selfSigned = 0;
return 0;
refactored manifest verification into a separate function that is called only when needed, and marks a manifest as finalised if the verifcation fails. reading a manifest now never sets finalised flag, as either _finalise() or _verify() must be called.
2012-05-25 23:54:47 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (memcmp(m->signatories[0], m->cryptoSignPublic.binary, sizeof m->cryptoSignPublic.binary) != 0) {
if (config.debug.rhizome)
DEBUGF("Manifest id does not match first signature block (signature key is %s)",
alloca_tohex(m->signatories[0], crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES)
);
m->selfSigned = 0;
return 0;
refactored manifest verification into a separate function that is called only when needed, and marks a manifest as finalised if the verifcation fails. reading a manifest now never sets finalised flag, as either _finalise() or _verify() must be called.
2012-05-25 23:54:47 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
m->selfSigned = 1;
return 1;
refactored manifest verification into a separate function that is called only when needed, and marks a manifest as finalised if the verifcation fails. reading a manifest now never sets finalised flag, as either _finalise() or _verify() must be called.
2012-05-25 23:54:47 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
static void rhizome_manifest_clear(rhizome_manifest *m)
Change manifest service to MeshMS2
2013-08-01 02:07:35 +00:00
{
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
while (m->var_count) {
--m->var_count;
free((char *) m->vars[m->var_count]);
free((char *) m->values[m->var_count]);
m->vars[m->var_count] = m->values[m->var_count] = NULL;
}
while (m->sig_count) {
--m->sig_count;
free(m->signatories[m->sig_count]);
m->signatories[m->sig_count] = NULL;
}
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
m->malformed = NULL;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
m->has_id = 0;
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
m->has_filehash = 0;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
m->is_journal = 0;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
m->filesize = RHIZOME_SIZE_UNSET;
m->tail = RHIZOME_SIZE_UNSET;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
m->version = 0;
// TODO initialise more fields
}
int rhizome_manifest_inspect(const char *buf, size_t len, struct rhizome_manifest_summary *summ)
{
const char *const end = buf + len;
int has_bid = 0;
int has_version = 0;
const char *begin = buf;
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
const char *eol = NULL;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
enum { Label, Value, Error } state = Label;
const char *p;
for (p = buf; state != Error && p < end && *p; ++p)
switch (state) {
case Label:
if (*p == '=') {
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
if (!rhizome_manifest_field_label_is_valid(begin, p - begin))
state = Error; // bad field name
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
else {
int *has = NULL;
if (p == begin + 2 && strncmp(begin, "id", 2) == 0)
has = &has_bid;
else if (p == begin + 7 && strncmp(begin, "version", 7) == 0)
has = &has_version;
state = Value;
if (has) {
if (*has)
state = Error; // duplicate
else {
*has = 1;
begin = p + 1;
}
}
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
case Value:
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
if (*p == '\r' && !eol)
eol = p;
else if (*p == '\n') {
if (!eol)
eol = p;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (has_bid == 1) {
const char *e;
Make strn_to_xxx() functions consistent All strn_to_xxx() functions should take a 'size_t len' parameter All functions that take a 'const char **endp' parameter should be named parse_xxx(), and should also have a 'ssize_t len' parameter which can be -1 to indicate a null-terminated string
2015-03-27 18:23:09 +00:00
if (parse_rhizome_bid_t(&summ->bid, begin, eol - begin, &e) == 0 && e == eol)
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
has_bid = 2;
else
state = Error; // invalid "id" field
} else if (has_version == 1) {
const char *e;
Use uint64_t for Rhizome manifest version Instead of int64_t. Fixes some -Wsign-compare warnings. Replace sqlite_exec_int64() with sqlite_exec_uint64(). Also store rowid as uint64_t, and use 0 not -1 to indicate unset.
2013-12-11 00:41:34 +00:00
if (str_to_uint64(begin, 10, &summ->version, &e) && e == eol)
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
has_version = 2;
else
state = Error; // invalid "version" field
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (state == Value) {
state = Label;
begin = p + 1;
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
eol = NULL;
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
} else if (eol)
state = Error; // CR not followed by LF
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
default:
abort();
}
if (p < end && *p == '\0')
++p;
summ->body_len = p - buf;
return state == Label && has_bid == 2 && has_version == 2;
}
/* Parse a Rhizome text manifest from its internal buffer up to and including the terminating NUL
* character which marks the start of the signature block.
*
* Prior to calling, the caller must set up m->manifest_all_bytes to the length of the manifest
* text, including the signature block, and set m->manifestdata[0..m->manifest_all_bytes-1] to
* contain the manifest text and signature block to be parsed.
*
* A "well formed" manifest consists of a series of zero or more lines with the form:
*
* LABEL "=" VALUE [ CR ] LF
*
* where LABEL matches the regular expression [A-Za-z][A-Za-z0-9]* (identifier without underscore)
* VALUE is any value that does not contain NUL, CR or LF (leading and trailing spaces are
* not stripped from VALUE)
* NUL is ASCII 0
* CR is ASCII 13
* LF is ASCII 10
*
* Unpacks all parsed field labels and string values into the m->vars[] and m->values[] arrays, as
* pointers to malloc(3)ed NUL terminated strings, in the order they appear, and sets m->var_count
* to the number of fields unpacked. Sets m->manifest_body_bytes to the number of bytes in the text
* portion up to and including the optional NUL that starts the signature block (if present).
*
* Returns 1 if the manifest is not well formed (syntax violation), any essential field is
* malformed, or if there are any duplicate fields. In this case the m->vars[] and m->values[]
* arrays are not set and the manifest is returned to the state it was in prior to calling.
*
* Returns 0 if the manifest is well formed, if there are no duplicate fields, and if all essential
* fields are valid. Counts invalid non-essential fields and unrecognised fields in m->malformed.
*
* Returns -1 if there is an unrecoverable error (eg, malloc(3) returns NULL, out of memory).
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
Remove rhizome_read_manifest_file() Replace with memcpy() followed by rhizome_manifest_parse() for memory buffers Replace with rhizome_read_manifest_from_file() for files
2013-12-19 08:37:14 +00:00
int rhizome_manifest_parse(rhizome_manifest *m)
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
{
IN();
assert(m->manifest_all_bytes <= sizeof m->manifestdata);
assert(m->manifest_body_bytes == 0);
assert(m->var_count == 0);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
assert(!m->finalised);
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
assert(m->malformed == NULL);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(!m->has_id);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
assert(!m->has_filehash);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(!m->is_journal);
assert(m->filesize == RHIZOME_SIZE_UNSET);
assert(m->tail == RHIZOME_SIZE_UNSET);
assert(m->version == 0);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
assert(!m->has_date);
assert(!m->has_sender);
assert(!m->has_recipient);
assert(m->payloadEncryption == PAYLOAD_CRYPT_UNKNOWN);
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
unsigned invalid = 0;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
unsigned has_invalid_core = 0;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
unsigned has_duplicate = 0;
const char *const end = (const char *)m->manifestdata + m->manifest_all_bytes;
const char *p;
unsigned line_number = 0;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
for (p = (const char *)m->manifestdata; !invalid && p < end && *p; ++p) {
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
++line_number;
const char *const plabel = p++;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
while (p < end && *p && *p != '=' && *p != '\n')
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
++p;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (p == end || *p != '=') {
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (config.debug.rhizome_manifest)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
DEBUGF("Invalid manifest line %u: %s", line_number, alloca_toprint(-1, plabel, p - plabel + 1));
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
}
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
assert(p < end);
assert(*p == '=');
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
const char *const pvalue = ++p;
while (p < end && *p && *p != '\n')
++p;
if (p >= end || *p != '\n') {
if (config.debug.rhizome_manifest)
DEBUGF("Missing manifest newline at line %u: %s", line_number, alloca_toprint(-1, plabel, p - plabel));
break;
}
const char *const eol = (p > pvalue && p[-1] == '\r') ? p - 1 : p;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
enum rhizome_manifest_parse_status status = rhizome_manifest_parse_field(m, plabel, pvalue - plabel - 1, pvalue, eol - pvalue);
int status_ok = 0;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
switch (status) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
case RHIZOME_MANIFEST_ERROR:
RETURN(-1);
case RHIZOME_MANIFEST_OK:
status_ok = 1;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
case RHIZOME_MANIFEST_SYNTAX_ERROR:
status_ok = 1;
++invalid;
break;
case RHIZOME_MANIFEST_DUPLICATE_FIELD:
status_ok = 1;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
++has_duplicate;
break;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
case RHIZOME_MANIFEST_INVALID:
status_ok = 1;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
++has_invalid_core;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
case RHIZOME_MANIFEST_MALFORMED:
status_ok = 1;
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
m->malformed = "Invalid field";
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
break;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
case RHIZOME_MANIFEST_OVERFLOW:
status_ok = 1;
++invalid;
break;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
}
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (!status_ok)
FATALF("status = %d", status);
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(p < end);
assert(*p == '\n');
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
if ((p < end && *p) || has_invalid_core || has_duplicate) {
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
rhizome_manifest_clear(m);
RETURN(1);
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
// The null byte is included in the body (and checksum), not the signature block
if (p < end) {
assert(*p == '\0');
++p;
Re-write manifest parsing, improve rhizome_fetch.c logging Rhizome manifest parser now parses and validates all known fields, informs about unsupported fields, and unpacks fields into relevant struct manifest elements where appropriate. Is also stricter about whitespace. Rhizome fetch code now logs debug messages if DEBUG_RHIZOME_RX bit is on.
2012-07-12 07:09:01 +00:00
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
m->manifest_body_bytes = p - (const char *)m->manifestdata;
RETURN(0);
OUT();
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
typedef int MANIFEST_FIELD_TESTER(const rhizome_manifest *);
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
typedef void MANIFEST_FIELD_UNSETTER(struct __sourceloc, rhizome_manifest *);
typedef void MANIFEST_FIELD_COPIER(struct __sourceloc, rhizome_manifest *, const rhizome_manifest *);
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
typedef int MANIFEST_FIELD_PARSER(rhizome_manifest *, const char *);
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_id(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->has_id;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_id(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_id(m, NULL);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_id(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_id(m, srcm->has_id ? &srcm->cryptoSignPublic : NULL);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_id(rhizome_manifest *m, const char *text)
{
rhizome_bid_t bid;
if (str_to_rhizome_bid_t(&bid, text) == -1)
return 0;
rhizome_manifest_set_id(m, &bid);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_version(const rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
return m->version != 0;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_version(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
rhizome_manifest_del_version(m);
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_version(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_version(m, srcm->version);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_version(rhizome_manifest *m, const char *text)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
uint64_t version;
if (!str_to_uint64(text, 10, &version, NULL) || version == 0)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return 0;
rhizome_manifest_set_version(m, version);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_filehash(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->has_filehash;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_filehash(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_filehash(m, NULL);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_filehash(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_filehash(m, srcm->has_filehash ? &srcm->filehash : NULL);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_filehash(rhizome_manifest *m, const char *text)
{
rhizome_filehash_t hash;
if (str_to_rhizome_filehash_t(&hash, text) == -1)
return 0;
rhizome_manifest_set_filehash(m, &hash);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_filesize(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->filesize != RHIZOME_SIZE_UNSET;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_filesize(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_filesize(m, RHIZOME_SIZE_UNSET);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_filesize(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_filesize(m, srcm->filesize);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_filesize(rhizome_manifest *m, const char *text)
{
uint64_t size;
if (!str_to_uint64(text, 10, &size, NULL) || size == RHIZOME_SIZE_UNSET)
return 0;
rhizome_manifest_set_filesize(m, size);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_tail(const rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
return m->is_journal;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_tail(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_tail(m, RHIZOME_SIZE_UNSET);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_tail(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_tail(m, srcm->tail);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_tail(rhizome_manifest *m, const char *text)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
uint64_t tail;
if (!str_to_uint64(text, 10, &tail, NULL) || tail == RHIZOME_SIZE_UNSET)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return 0;
rhizome_manifest_set_tail(m, tail);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_BK(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->has_bundle_key;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_BK(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
rhizome_manifest_del_bundle_key(m);
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_BK(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_bundle_key(m, srcm->has_bundle_key ? &srcm->bundle_key : NULL);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_BK(rhizome_manifest *m, const char *text)
{
rhizome_bk_t bk;
if (str_to_rhizome_bk_t(&bk, text) == -1)
return 0;
rhizome_manifest_set_bundle_key(m, &bk);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_service(const rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
return m->service != NULL;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_service(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_del_service(m);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_service(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_service(m, srcm->service);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_service(rhizome_manifest *m, const char *text)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
if (!rhizome_str_is_manifest_service(text))
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return 0;
rhizome_manifest_set_service(m, text);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_date(const rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
return m->has_date;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_date(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_del_date(m);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_date(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
if (srcm->has_date)
rhizome_manifest_set_date(m, srcm->date);
else
rhizome_manifest_del_date(m);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_date(rhizome_manifest *m, const char *text)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
int64_t date;
if (!str_to_int64(text, 10, &date, NULL))
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return 0;
rhizome_manifest_set_date(m, date);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_sender(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->has_sender;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_sender(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_sender(m, NULL);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_sender(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_sender(m, srcm->has_sender ? &srcm->sender : NULL);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_sender(rhizome_manifest *m, const char *text)
{
sid_t sid;
if (str_to_sid_t(&sid, text) == -1)
return 0;
rhizome_manifest_set_sender(m, &sid);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_recipient(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->has_recipient;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_recipient(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_recipient(m, NULL);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_recipient(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_recipient(m, srcm->has_recipient ? &srcm->recipient : NULL);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_recipient(rhizome_manifest *m, const char *text)
{
sid_t sid;
if (str_to_sid_t(&sid, text) == -1)
return 0;
rhizome_manifest_set_recipient(m, &sid);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_name(const rhizome_manifest *m)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return m->name != NULL;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_name(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_del_name(m);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_name(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_name(m, srcm->name);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_name(rhizome_manifest *m, const char *text)
{
rhizome_manifest_set_name(m, text);
return 1;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static int _rhizome_manifest_test_crypt(const rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
return m->payloadEncryption != PAYLOAD_CRYPT_UNKNOWN;
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_unset_crypt(struct __sourceloc __whence, rhizome_manifest *m)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
{
rhizome_manifest_set_crypt(m, PAYLOAD_CRYPT_UNKNOWN);
}
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
static void _rhizome_manifest_copy_crypt(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
rhizome_manifest_set_crypt(m, srcm->payloadEncryption);
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
static int _rhizome_manifest_parse_crypt(rhizome_manifest *m, const char *text)
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
{
if (!(strcmp(text, "0") == 0 || strcmp(text, "1") == 0))
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
return 0;
rhizome_manifest_set_crypt(m, (text[0] == '1') ? PAYLOAD_ENCRYPTED : PAYLOAD_CLEAR);
return 1;
}
static struct rhizome_manifest_field_descriptor {
const char *label;
int core;
MANIFEST_FIELD_TESTER *test;
MANIFEST_FIELD_UNSETTER *unset;
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
MANIFEST_FIELD_COPIER *copy;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
MANIFEST_FIELD_PARSER *parse;
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
rhizome_manifest_fields[] = {
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
#define FIELD(CORE, NAME) \
{ #NAME, CORE, _rhizome_manifest_test_ ## NAME, _rhizome_manifest_unset_ ## NAME, _rhizome_manifest_copy_ ## NAME, _rhizome_manifest_parse_ ## NAME }
FIELD(1, id),
FIELD(1, version),
FIELD(1, filehash),
FIELD(1, filesize),
FIELD(1, tail),
FIELD(0, BK),
FIELD(0, service),
FIELD(0, date),
FIELD(0, sender),
FIELD(0, recipient),
FIELD(0, name),
FIELD(0, crypt),
#undef FIELD
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
};
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
static struct rhizome_manifest_field_descriptor *get_rhizome_manifest_field_descriptor(const char *label)
{
unsigned i;
for (i = 0; i < NELS(rhizome_manifest_fields); ++i)
if (strcasecmp(label, rhizome_manifest_fields[i].label) == 0)
return &rhizome_manifest_fields[i];
return NULL;
}
/* Overwrite a Rhizome manifest with fields from another. Used in the "add bundle" application API
* when the application supplies a partial manifest to override or add to existing manifest fields.
*
* Returns -1 if a field in the destination manifest cannot be overwritten for an unrecoverable
* reason, eg, out of memory or too many variables, leaving the destination manifest in an undefined
* state.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
int _rhizome_manifest_overwrite(struct __sourceloc __whence, rhizome_manifest *m, const rhizome_manifest *srcm)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
{
unsigned i;
for (i = 0; i < NELS(rhizome_manifest_fields); ++i) {
struct rhizome_manifest_field_descriptor *desc = &rhizome_manifest_fields[i];
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
if (desc->test(srcm)) {
if (config.debug.rhizome_manifest)
DEBUGF("COPY manifest[%d].%s to:", srcm->manifest_record_number, desc->label);
desc->copy(__whence, m, srcm);
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
}
for (i = 0; i < srcm->var_count; ++i) {
struct rhizome_manifest_field_descriptor *desc = get_rhizome_manifest_field_descriptor(srcm->vars[i]);
if (!desc)
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
if (_rhizome_manifest_set(__whence, m, srcm->vars[i], srcm->values[i]) == NULL)
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
return -1;
}
return 0;
}
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
int rhizome_manifest_field_label_is_valid(const char *field_label, size_t field_label_len)
{
if (field_label_len == 0 || field_label_len > MAX_MANIFEST_FIELD_LABEL_LEN)
return 0;
if (!isalpha(field_label[0]))
return 0;
unsigned i;
for (i = 1; i != field_label_len; ++i)
if (!isalnum(field_label[i]))
return 0;
return 1;
}
int rhizome_manifest_field_value_is_valid(const char *field_value, size_t field_value_len)
{
if (field_value_len >= MAX_MANIFEST_BYTES)
return 0;
unsigned i;
for (i = 0; i < field_value_len; ++i)
if (field_value[i] == '\0' || field_value[i] == '\r' || field_value[i] == '\n')
return 0;
return 1;
}
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
/* Parse a single Rhizome manifest field. Used for incremental construction or modification of
* manifests.
*
* If the supplied field_label is invalid (does not conform to the syntax for field names) or the
* field_value string is too long or contains a NUL (ASCII 0), CR (ASCII 13) or LF (ASCII 10), then
* returns RHIZOME_MANIFEST_SYNTAX_ERROR and leaves the manifest unchanged.
*
* If a field with the given label already exists in the manifest, then returns
* RHIZOME_MANIFEST_DUPLICATE_FIELD without modifying the manifest. (To overwrite an existing
* field, first remove it by calling rhizome_manifest_remove_field() then call
* rhizome_manifest_parse_field().)
*
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
* If the maximum number of fields are already occupied in the manifest, then returns
* RHIZOME_MANIFEST_OVERFLOW and leaves the manifest unchanged.
*
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
* If the supplied field_value is invalid (does not parse according to the field's syntax, eg,
* unsigned integer) then returns RHIZOME_MANIFEST_INVALID if it is a core field, otherwise returns
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
* RHIZOME_MANIFEST_MALFORMED and leaves the manifest unchanged. Unsupported fields are not parsed;
* their value string is simply stored, so they cannot evoke a MALFORMED result.
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
*
* Otherwise, sets the relevant element(s) of the manifest structure and appends the field_label and
* field_value strings into the m->vars[] and m->values[] arrays, as pointers to malloc(3)ed NUL
* terminated strings, and increments m->var_count. Returns RHIZOME_MANIFEST_OK.
*
* Returns -1 (RHIZOME_MANIFEST_ERROR) if there is an unrecoverable error (eg, malloc(3) returns
* NULL, out of memory).
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
enum rhizome_manifest_parse_status
rhizome_manifest_parse_field(rhizome_manifest *m, const char *field_label, size_t field_label_len, const char *field_value, size_t field_value_len)
{
// Syntax check on field label.
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
if (!rhizome_manifest_field_label_is_valid(field_label, field_label_len)) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (config.debug.rhizome_manifest)
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
DEBUGF("Invalid manifest field name: %s", alloca_toprint(100, field_label, field_label_len));
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
return RHIZOME_MANIFEST_SYNTAX_ERROR;
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
const char *label = alloca_strndup(field_label, field_label_len);
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
// Sanity and syntax check on field value.
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
if (!rhizome_manifest_field_value_is_valid(field_value, field_value_len)) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (config.debug.rhizome_manifest)
Refactor manifest parsing Consolidate tests for valid field names and values into one place
2014-11-19 02:47:40 +00:00
DEBUGF("Invalid manifest field value: %s=%s", label, alloca_toprint(100, field_value, field_value_len));
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
return RHIZOME_MANIFEST_SYNTAX_ERROR;
}
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
const char *value = alloca_strndup(field_value, field_value_len);
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
struct rhizome_manifest_field_descriptor *desc = get_rhizome_manifest_field_descriptor(label);
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
enum rhizome_manifest_parse_status status = RHIZOME_MANIFEST_OK;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
assert(m->var_count <= NELS(m->vars));
if (desc ? desc->test(m) : rhizome_manifest_get(m, label) != NULL) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("Duplicate field at %s=%s", label, alloca_toprint(100, field_value, field_value_len));
status = RHIZOME_MANIFEST_DUPLICATE_FIELD;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
} else if (m->var_count == NELS(m->vars)) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("Manifest field limit reached at %s=%s", label, alloca_toprint(100, field_value, field_value_len));
status = RHIZOME_MANIFEST_OVERFLOW;
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
} else if (desc) {
if (!desc->parse(m, value)) {
if (config.debug.rhizome_manifest)
DEBUGF("Manifest field parse failed at %s=%s", label, alloca_toprint(100, field_value, field_value_len));
status = desc->core ? RHIZOME_MANIFEST_INVALID : RHIZOME_MANIFEST_MALFORMED;
}
Add rhizome_manifest_overwrite() function
2015-03-16 12:06:38 +00:00
} else if (rhizome_manifest_set(m, label, value) == NULL)
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
status = RHIZOME_MANIFEST_ERROR;
if (status != RHIZOME_MANIFEST_OK) {
Support unrecognised manifest fields Refactor Rhizome manifest parsing in preparation for command-line field assignment
2014-11-17 13:11:03 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("SKIP manifest[%d].%s = %s (status=%d)", m->manifest_record_number, label, alloca_str_toprint(value), status);
}
return status;
}
"rhizome add file" manifest field=value varargs Now a new manifest can be formed, and an existing manifest modified, by giving "field=value" or "!field" command-line arguments at the end of the "rhizome add file" command (after the <bsk> argument). This makes it easier to script rhizome operations.
2014-11-19 02:56:50 +00:00
/* Remove the field with the given label from the manifest.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
int rhizome_manifest_remove_field(rhizome_manifest *m, const char *field_label, size_t field_label_len)
{
if (!rhizome_manifest_field_label_is_valid(field_label, field_label_len)) {
if (config.debug.rhizome_manifest)
DEBUGF("Invalid manifest field name: %s", alloca_toprint(100, field_label, field_label_len));
return 0;
}
const char *label = alloca_strndup(field_label, field_label_len);
struct rhizome_manifest_field_descriptor *desc = NULL;
unsigned i;
for (i = 0; desc == NULL && i < NELS(rhizome_manifest_fields); ++i)
if (strcasecmp(label, rhizome_manifest_fields[i].label) == 0)
desc = &rhizome_manifest_fields[i];
if (!desc)
return rhizome_manifest_del(m, label);
if (!desc->test(m))
return 0;
Improve manifest field copy/unset logging Add __whence arguments to all field copy and unset functions
2015-03-23 07:02:57 +00:00
desc->unset(__WHENCE__, m);
"rhizome add file" manifest field=value varargs Now a new manifest can be formed, and an existing manifest modified, by giving "field=value" or "!field" command-line arguments at the end of the "rhizome add file" command (after the <bsk> argument). This makes it easier to script rhizome operations.
2014-11-19 02:56:50 +00:00
return 1;
}
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
/* If all essential (transport) fields are present and well formed then sets the m->finalised field
* and returns 1, otherwise returns 0.
*
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
* Sets m->malformed if any non-essential fields are missing or invalid. It is up to the caller to
* check m->malformed and decide whether or not to process a malformed manifest.
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
*
* @author Andrew Bettison <andrew@servalproject.com>
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
*/
int rhizome_manifest_validate(rhizome_manifest *m)
{
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
return rhizome_manifest_validate_reason(m) == NULL ? 1 : 0;
}
/* If all essential (transport) fields are present and well formed then sets the m->finalised field
* and returns NULL, otherwise returns a pointer to a static string (not malloc(3)ed) describing the
* problem.
*
* If any non-essential fields are missing or invalid, then sets m->malformed to point to a static
* string describing the problem. It is up to the caller to check m->malformed and decide whether
* or not to process a malformed manifest.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
const char *rhizome_manifest_validate_reason(rhizome_manifest *m)
{
const char *reason = NULL;
if (!m->has_id)
reason = "Missing 'id' field";
else if (m->version == 0)
reason = "Missing 'version' field";
else if (m->filesize == RHIZOME_SIZE_UNSET)
reason = "Missing 'filesize' field";
else if (m->filesize == 0 && m->has_filehash)
reason = "Spurious 'filehash' field";
else if (m->filesize != 0 && !m->has_filehash)
reason = "Missing 'filehash' field";
if (reason && config.debug.rhizome_manifest)
DEBUG(reason);
if (m->service == NULL)
m->malformed = "Missing 'service' field";
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
else if (strcmp(m->service, RHIZOME_SERVICE_FILE) == 0) {
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
if (m->name == NULL)
m->malformed = "Manifest with service='" RHIZOME_SERVICE_FILE "' missing 'name' field";
Refactor Rhizome manifest parsing Now the parsing code uses the set/del functions for all supported manifest fields, so no duplicate logic any more
2014-11-18 08:12:43 +00:00
} else if (strcmp(m->service, RHIZOME_SERVICE_MESHMS) == 0
|| strcmp(m->service, RHIZOME_SERVICE_MESHMS2) == 0
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
) {
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
if (!m->has_recipient)
m->malformed = "Manifest missing 'recipient' field";
else if (!m->has_sender)
m->malformed = "Manifest missing 'sender' field";
Change manifest service to MeshMS2
2013-08-01 02:07:35 +00:00
}
Refactor Rhizome manifest validation New function returns text describing the failed validation
2014-07-09 19:49:38 +00:00
else if (!rhizome_str_is_manifest_service(m->service))
m->malformed = "Manifest invalid 'service' field";
else if (!m->has_date)
m->malformed = "Missing 'date' field";
if (m->malformed && config.debug.rhizome_manifest)
DEBUG(m->malformed);
m->finalised = (reason == NULL);
return reason;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Remove rhizome_read_manifest_file() Replace with memcpy() followed by rhizome_manifest_parse() for memory buffers Replace with rhizome_read_manifest_from_file() for files
2013-12-19 08:37:14 +00:00
int rhizome_read_manifest_from_file(rhizome_manifest *m, const char *filename)
Change manifest service to MeshMS2
2013-08-01 02:07:35 +00:00
{
Remove rhizome_read_manifest_file() Replace with memcpy() followed by rhizome_manifest_parse() for memory buffers Replace with rhizome_read_manifest_from_file() for files
2013-12-19 08:37:14 +00:00
ssize_t bytes = read_whole_file(filename, m->manifestdata, sizeof m->manifestdata);
if (bytes == -1)
return -1;
m->manifest_all_bytes = (size_t) bytes;
return rhizome_manifest_parse(m);
Change manifest service to MeshMS2
2013-08-01 02:07:35 +00:00
}
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
int rhizome_hash_file(rhizome_manifest *m, const char *path, rhizome_filehash_t *hash_out, uint64_t *size_out)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
/* Gnarf! NaCl's crypto_hash() function needs the whole file passed in in one
go. Trouble is, we need to run Serval DNA on filesystems that lack mmap(),
and may be very resource constrained. Thus we need a streamable SHA-512
implementation.
*/
Improve "rhizome add file" for empty payloads Accept the empty string for a payload pathname to mean a zero-length payload.
2012-06-05 06:15:53 +00:00
// TODO encrypted payloads
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (m && m->payloadEncryption == PAYLOAD_ENCRYPTED)
merged in latest changes from team.
2012-05-25 15:20:48 +00:00
return WHY("Encryption of payloads not implemented");
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
uint64_t filesize = 0;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
SHA512_CTX context;
SHA512_Init(&context);
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
if (path[0]) {
int fd = open(path, O_RDONLY);
if (fd == -1)
return WHYF_perror("open(%s,O_RDONLY)", alloca_str_toprint(path));
unsigned char buffer[8192];
ssize_t r;
while ((r = read(fd, buffer, sizeof buffer))) {
Improve "rhizome add file" for empty payloads Accept the empty string for a payload pathname to mean a zero-length payload.
2012-06-05 06:15:53 +00:00
if (r == -1) {
Fix format patterns for 64-bit compilation
2013-10-14 04:15:43 +00:00
WHYF_perror("read(%s,%zu)", alloca_str_toprint(path), sizeof buffer);
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
close(fd);
return -1;
Improve "rhizome add file" for empty payloads Accept the empty string for a payload pathname to mean a zero-length payload.
2012-06-05 06:15:53 +00:00
}
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
SHA512_Update(&context, buffer, (size_t) r);
filesize += (size_t) r;
Improve "rhizome add file" for empty payloads Accept the empty string for a payload pathname to mean a zero-length payload.
2012-06-05 06:15:53 +00:00
}
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
close(fd);
}
// Empty files (including empty path) have no hash.
if (hash_out) {
if (filesize > 0)
SHA512_Final(hash_out->binary, &context);
else
*hash_out = RHIZOME_FILEHASH_NONE;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Issue #11: Use rhizome_filehash_t everywhere
2013-10-10 07:53:06 +00:00
if (size_out)
*size_out = filesize;
SHA512_End(&context, NULL);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
return 0;
}
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
rhizome_manifest manifests[MAX_RHIZOME_MANIFESTS];
char manifest_free[MAX_RHIZOME_MANIFESTS];
int manifest_first_free=-1;
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
struct __sourceloc manifest_alloc_whence[MAX_RHIZOME_MANIFESTS];
struct __sourceloc manifest_free_whence[MAX_RHIZOME_MANIFESTS];
Introduce struct __sourceloc Replaces (const char *file, unsigned int line, const char *function) arguments to all logging functions, simplifies malloc/free tracking code in overlay_buffer.c and Rhizome manifest alloc/free tracking in rhizome_bundle.c. Use __HERE__ macro instead of (__FILE__, __LINE__, __FUNCTION__) everywhere. Special __NOWHERE__ macro is equivalent to (NULL, 0, NULL). Declare net.c functions in new "net.h" header, so log.c doesn't have to pull in the entire "serval.h" just to use write_str(). Facilitates progress on issue #2.
2012-08-23 03:01:07 +00:00
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
static unsigned _count_free_manifests()
Fix another manifest leak Add manifest alloc/free debug logging to help, 'debug.manifests' option
2012-05-25 07:31:56 +00:00
{
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
unsigned count_free = 0;
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
unsigned i;
Fix another manifest leak Add manifest alloc/free debug logging to help, 'debug.manifests' option
2012-05-25 07:31:56 +00:00
for (i = 0; i != MAX_RHIZOME_MANIFESTS; ++i)
if (manifest_free[i])
++count_free;
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
return count_free;
Fix another manifest leak Add manifest alloc/free debug logging to help, 'debug.manifests' option
2012-05-25 07:31:56 +00:00
}
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
rhizome_manifest *_rhizome_new_manifest(struct __sourceloc __whence)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
if (manifest_first_free<0) {
/* Setup structures */
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
unsigned i;
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
for(i=0;i<MAX_RHIZOME_MANIFESTS;i++) {
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
manifest_alloc_whence[i]=__NOWHERE__;
manifest_free_whence[i]=__NOWHERE__;
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
manifest_free[i]=1;
}
manifest_first_free=0;
}
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
/* No free manifests */
if (manifest_first_free>=MAX_RHIZOME_MANIFESTS)
{
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
unsigned i;
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
WHYF("%s(): no free manifest records, this probably indicates a memory leak", __FUNCTION__);
Improve rhizome manifest debugging Move rhizome_new_manifest() out of rhizome_read_manifest_file() so that the out-of-manifest report shows the names of the functions where the manifests were really allocated.
2012-05-25 06:08:13 +00:00
WHYF(" Slot# | Last allocated by");
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
for(i=0;i<MAX_RHIZOME_MANIFESTS;i++) {
Improve rhizome manifest debugging Move rhizome_new_manifest() out of rhizome_read_manifest_file() so that the out-of-manifest report shows the names of the functions where the manifests were really allocated.
2012-05-25 06:08:13 +00:00
WHYF(" %-5d | %s:%d in %s()",
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
i,
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
manifest_alloc_whence[i].file,
manifest_alloc_whence[i].line,
manifest_alloc_whence[i].function
Expunge setReason() Replace with WHY() or WHYF() everywhere Improve logMessage() to handle file/line/function printing internally Mainly so that log messages from manifest alloc/free in rhizome_bundle.c can make it into the Android log
2012-05-24 07:41:55 +00:00
);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
}
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
return NULL;
}
rhizome_manifest *m=&manifests[manifest_first_free];
bzero(m,sizeof(rhizome_manifest));
m->manifest_record_number=manifest_first_free;
/* Indicate where manifest was allocated, and that it is no longer
free. */
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
manifest_alloc_whence[manifest_first_free]=__whence;
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
manifest_free[manifest_first_free]=0;
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
manifest_free_whence[manifest_first_free]=__NOWHERE__;
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
/* Work out where next free manifest record lives */
Fix another manifest leak Add manifest alloc/free debug logging to help, 'debug.manifests' option
2012-05-25 07:31:56 +00:00
for (; manifest_first_free < MAX_RHIZOME_MANIFESTS && !manifest_free[manifest_first_free]; ++manifest_first_free)
;
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("NEW manifest[%d], count_free=%u", m->manifest_record_number, _count_free_manifests());
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
// Set global defaults for a manifest (which are not zero)
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
rhizome_manifest_clear(m);
Identify a journal bundle by the presense of a tail field
2013-07-08 05:27:47 +00:00
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
return m;
}
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
void _rhizome_manifest_free(struct __sourceloc __whence, rhizome_manifest *m)
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
{
if (!m) return;
int mid=m->manifest_record_number;
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
if (m!=&manifests[mid])
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
FATALF("%s(): manifest at %p claims to be manifest[%d] (%p) but isn't",
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
__FUNCTION__, m, mid, &manifests[mid]
Expunge setReason() Replace with WHY() or WHYF() everywhere Improve logMessage() to handle file/line/function printing internally Mainly so that log messages from manifest alloc/free in rhizome_bundle.c can make it into the Android log
2012-05-24 07:41:55 +00:00
);
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
if (manifest_free[mid])
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
FATALF("%s(): manifest[%d] (%p) was already freed at %s:%d:%s()",
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
__FUNCTION__, mid, m,
manifest_free_whence[mid].file,
manifest_free_whence[mid].line,
manifest_free_whence[mid].function
);
Debugging fiddles and fixed bug where only the first few manifests would get advertised. But now there is a nasty crash bug somewhere.
2012-02-09 06:40:52 +00:00
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
/* Free variable and signature blocks. */
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
rhizome_manifest_clear(m);
Fix bugs revealed by Rhizome stress test Overhauled the file fetch queue logic in rhizome_fetch.c. Now the 'rhizomeprotocol' stress test passes in approximately 5 minutes on my 2009-vintage Dell laptop. Added a call to rhizome_enqueue_suggestions() in rhizome_fetch_close() so that a new Rhizome GET request is sent as soon as a fetch slot becomes free, instead of waiting for the (default 5 second) timer to trigger the next GET.
2012-10-18 07:00:22 +00:00
if (m->dataFileName) {
if (m->dataFileUnlinkOnFree && unlink(m->dataFileName) == -1)
WARNF_perror("unlink(%s)", alloca_str_toprint(m->dataFileName));
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
free((char *) m->dataFileName);
Fix bugs revealed by Rhizome stress test Overhauled the file fetch queue logic in rhizome_fetch.c. Now the 'rhizomeprotocol' stress test passes in approximately 5 minutes on my 2009-vintage Dell laptop. Added a call to rhizome_enqueue_suggestions() in rhizome_fetch_close() so that a new Rhizome GET request is sent as soon as a fetch slot becomes free, instead of waiting for the (default 5 second) timer to trigger the next GET.
2012-10-18 07:00:22 +00:00
m->dataFileName = NULL;
}
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
manifest_free[mid]=1;
Logging/debug improvements: __WHENCE__, __whence Introduce __WHENCE__ macro and a block comment in log.h explaining it. In "primitive" kinds of functions, rename 'whence' arguments to '__whence' and use WHYF(), WARNF(), DEBUGF() macros instead of calling logMessage() directly.
2012-10-16 06:16:52 +00:00
manifest_free_whence[mid]=__whence;
Converted manifest storage to using static set of manifest structures and added manifest leak detection and some other memory corruption protections.
2012-01-28 01:15:45 +00:00
if (mid<manifest_first_free) manifest_first_free=mid;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
Remove 'debug.manifests' option Use existing 'debug.rhizome_manifest' instead Improve format of manifest alloc/free log messages
2015-03-30 07:44:09 +00:00
if (config.debug.rhizome_manifest)
DEBUGF("FREE manifest[%d], count_free=%u", m->manifest_record_number, _count_free_manifests());
Fix another manifest leak Add manifest alloc/free debug logging to help, 'debug.manifests' option
2012-05-25 07:31:56 +00:00
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
return;
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
/* Convert variable list into manifest text body and compute the hash. Do not sign.
*/
Make rhizome_manifest_pack_variables() static
2013-12-19 08:40:52 +00:00
static int rhizome_manifest_pack_variables(rhizome_manifest *m)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(m->var_count <= NELS(m->vars));
strbuf sb = strbuf_local((char*)m->manifestdata, sizeof m->manifestdata);
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
unsigned i;
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
for (i = 0; i < m->var_count; ++i) {
strbuf_puts(sb, m->vars[i]);
strbuf_putc(sb, '=');
strbuf_puts(sb, m->values[i]);
strbuf_putc(sb, '\n');
}
if (strbuf_overrun(sb))
return WHYF("Manifest overflow: body of %zu bytes exceeds limit of %zu", strbuf_count(sb) + 1, sizeof m->manifestdata);
m->manifest_body_bytes = strbuf_len(sb) + 1;
if (config.debug.rhizome)
DEBUGF("Repacked variables into manifest: %zu bytes", m->manifest_body_bytes);
m->manifest_all_bytes = m->manifest_body_bytes;
m->selfSigned = 0;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
return 0;
}
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
/* Sign this manifest using it's own BID secret key. Manifest must not already be signed.
* Manifest body hash must already be computed.
Convert two #warnings to //TODO comments
2012-06-25 06:16:22 +00:00
*/
merged in latest changes from team.
2012-05-25 15:20:48 +00:00
int rhizome_manifest_selfsign(rhizome_manifest *m)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(m->manifest_body_bytes > 0);
assert(m->manifest_body_bytes <= sizeof m->manifestdata);
assert(m->manifestdata[m->manifest_body_bytes - 1] == '\0');
assert(m->manifest_body_bytes == m->manifest_all_bytes); // no signature yet
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
if (!m->haveSecret)
return WHY("Need private key to sign manifest");
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
crypto_hash_sha512(m->manifesthash, m->manifestdata, m->manifest_body_bytes);
Issue #17, overhaul manifest author crypto logic Add test case for new feature of the "rhizome add" command: if the author SID is not specified (empty arg) then it searches the keyring for the author. Removed "authorSid" argument from several functions that also take a struct rhizome_manifest * arg, since the author, if known, is now supplied in the struct. Improve return value handling and refactored some rhizome crypto code.
2012-10-11 07:28:24 +00:00
rhizome_signature sig;
if (rhizome_sign_hash(m, &sig) == -1)
return WHY("rhizome_sign_hash() failed");
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
assert(sig.signatureLength > 0);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
/* Append signature to end of manifest data */
Rewrite Rhizome manifest parsing Move validation checks into new function rhizome_manifest_validate() Remove rhizome_manifest 'errors' field Replace rhizome_manifest 'warnings' with 'malformed' Replace rhizome_manifest 'manifest_bytes' with 'manifest_body_bytes' and refactor to use 'manifest_all_bytes' in all manifest i/o Refactor rhizome_manifest_verify() and reverse sense of return value to match rhizome_manifest_validate() New function rhizome_manifest_inspect() -- lightweight manifest parser used when receiving Rhizome advertisements New 'rhizomeops' test case for invalid manifest "service" field values, now passes
2013-11-28 07:14:37 +00:00
if (sig.signatureLength + m->manifest_body_bytes > sizeof m->manifestdata)
return WHYF("Manifest overflow: body %zu + signature %zu bytes exceeds limit of %zu",
m->manifest_body_bytes,
sig.signatureLength,
sizeof m->manifestdata
);
bcopy(sig.signature, m->manifestdata + m->manifest_body_bytes, sig.signatureLength);
m->manifest_all_bytes = m->manifest_body_bytes + sig.signatureLength;
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
m->selfSigned = 1;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
return 0;
}
Issue #11: improve types in file i/o functions Use open(2)/read(2)/write(2) instead of fopen(3)/fread(3)/fwrite(3) in several places to avoid unnecessary buffering Fix a bug in Rhizome HTTP add's handling of unconfigured manifest template file Improve some debug and error logging for file i/o
2013-10-11 05:36:12 +00:00
int rhizome_write_manifest_file(rhizome_manifest *m, const char *path, char append)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Issue #11: improve types in file i/o functions Use open(2)/read(2)/write(2) instead of fopen(3)/fread(3)/fwrite(3) in several places to avoid unnecessary buffering Fix a bug in Rhizome HTTP add's handling of unconfigured manifest template file Improve some debug and error logging for file i/o
2013-10-11 05:36:12 +00:00
if (config.debug.rhizome)
Fix formatting issues
2013-12-06 01:40:08 +00:00
DEBUGF("write manifest (%zd bytes) to %s", m->manifest_all_bytes, path);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
assert(m->finalised);
Issue #11: improve types in file i/o functions Use open(2)/read(2)/write(2) instead of fopen(3)/fread(3)/fwrite(3) in several places to avoid unnecessary buffering Fix a bug in Rhizome HTTP add's handling of unconfigured manifest template file Improve some debug and error logging for file i/o
2013-10-11 05:36:12 +00:00
int fd = open(path, O_WRONLY | O_CREAT | (append ? O_APPEND : 0), 0666);
if (fd == -1)
return WHYF_perror("open(%s,O_WRONLY|O_CREAT%s,0666)", alloca_str_toprint(path), append ? "|O_APPEND" : "");
Add support for importing and exporting a file with an appended manifest
2013-01-11 03:49:26 +00:00
int ret = 0;
Add writev_all() function Use it in rhizome_write_manifest_file() instead of two separate write(2) system calls or buffered stdio.
2013-10-11 17:24:18 +00:00
unsigned char marker[4];
struct iovec iov[2];
int iovcnt = 1;
iov[0].iov_base = m->manifestdata;
iov[0].iov_len = m->manifest_all_bytes;
if (append) {
Add support for importing and exporting a file with an appended manifest
2013-01-11 03:49:26 +00:00
write_uint16(marker, m->manifest_all_bytes);
Add writev_all() function Use it in rhizome_write_manifest_file() instead of two separate write(2) system calls or buffered stdio.
2013-10-11 17:24:18 +00:00
marker[2] = 0x41;
marker[3] = 0x10;
iov[1].iov_base = marker;
iov[1].iov_len = sizeof marker;
iovcnt = 2;
Fix SEGV bug rhizome_write_manifest_file() was not checking for NULL fopen() result Standardise rhizome "import" directory pathname handling
2012-05-24 01:58:32 +00:00
}
Add writev_all() function Use it in rhizome_write_manifest_file() instead of two separate write(2) system calls or buffered stdio.
2013-10-11 17:24:18 +00:00
if (writev_all(fd, iov, iovcnt) == -1)
ret = -1;
Issue #11: improve types in file i/o functions Use open(2)/read(2)/write(2) instead of fopen(3)/fread(3)/fwrite(3) in several places to avoid unnecessary buffering Fix a bug in Rhizome HTTP add's handling of unconfigured manifest template file Improve some debug and error logging for file i/o
2013-10-11 05:36:12 +00:00
if (close(fd) == -1)
ret = WHY_perror("close");
Add support for importing and exporting a file with an appended manifest
2013-01-11 03:49:26 +00:00
return ret;
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
}
Expunge setReason() Replace with WHY() or WHYF() everywhere Improve logMessage() to handle file/line/function printing internally Mainly so that log messages from manifest alloc/free in rhizome_bundle.c can make it into the Android log
2012-05-24 07:41:55 +00:00
int rhizome_manifest_dump(rhizome_manifest *m, const char *msg)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Refactor manifest: replace int with unsigned
2013-10-30 03:15:51 +00:00
unsigned i;
Expunge setReason() Replace with WHY() or WHYF() everywhere Improve logMessage() to handle file/line/function printing internally Mainly so that log messages from manifest alloc/free in rhizome_bundle.c can make it into the Android log
2012-05-24 07:41:55 +00:00
WHYF("Dumping manifest %s:", msg);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
for(i=0;i<m->var_count;i++)
Expunge setReason() Replace with WHY() or WHYF() everywhere Improve logMessage() to handle file/line/function printing internally Mainly so that log messages from manifest alloc/free in rhizome_bundle.c can make it into the Android log
2012-05-24 07:41:55 +00:00
WHYF("[%s]=[%s]\n", m->vars[i], m->values[i]);
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
return 0;
}
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
enum rhizome_bundle_status rhizome_manifest_finalise(rhizome_manifest *m, rhizome_manifest **mout, int deduplicate)
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
{
Minor improvements to command line time measurements
2013-01-03 03:46:33 +00:00
IN();
Improve Rhizome HTTP RESTful interface Add RHIZOME_BUNDLE_STATUS_READONLY enum value Tighten up switch statements on bundle and payload status enums (no default labels) Rename some recently added enum entries Return bundle status and payload status in HTTP responses Add test for failing to decrypt a foreign encrypted bundle payload, fix bug that caused an assertion failure Add tests for fetching a non-existent manifest and fetching bundles whose payload blob is not in the store
2014-07-02 07:46:19 +00:00
assert(*mout == NULL);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
if (!m->finalised && !rhizome_manifest_validate(m))
RETURN(RHIZOME_BUNDLE_STATUS_INVALID);
Suppress Rhizome add de-duplication for journals
2015-04-13 05:18:34 +00:00
// The duplicate detection logic exists to filter out files repeatedly added with no existing
// manifest (ie, "de-bounce" for the "Add File" user interface action).
// 1. If a manifest was supplied with a bundle ID, don't check for a duplicate.
// 2. Never perform duplicate detection on journals (the first append does not supply a bundle ID,
// but all subsequent appends supply a bundle ID, so are caught by case (1)).
if (deduplicate && m->haveSecret != EXISTING_BUNDLE_ID && !m->is_journal) {
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
enum rhizome_bundle_status status = rhizome_find_duplicate(m, mout);
switch (status) {
case RHIZOME_BUNDLE_STATUS_DUPLICATE:
Improve Rhizome HTTP RESTful interface Add RHIZOME_BUNDLE_STATUS_READONLY enum value Tighten up switch statements on bundle and payload status enums (no default labels) Rename some recently added enum entries Return bundle status and payload status in HTTP responses Add test for failing to decrypt a foreign encrypted bundle payload, fix bug that caused an assertion failure Add tests for fetching a non-existent manifest and fetching bundles whose payload blob is not in the store
2014-07-02 07:46:19 +00:00
assert(*mout != NULL);
assert(*mout != m);
RETURN(status);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
case RHIZOME_BUNDLE_STATUS_ERROR:
Improve Rhizome HTTP RESTful interface Add RHIZOME_BUNDLE_STATUS_READONLY enum value Tighten up switch statements on bundle and payload status enums (no default labels) Rename some recently added enum entries Return bundle status and payload status in HTTP responses Add test for failing to decrypt a foreign encrypted bundle payload, fix bug that caused an assertion failure Add tests for fetching a non-existent manifest and fetching bundles whose payload blob is not in the store
2014-07-02 07:46:19 +00:00
if (*mout != NULL && *mout != m) {
rhizome_manifest_free(*mout);
*mout = NULL;
}
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
RETURN(status);
case RHIZOME_BUNDLE_STATUS_NEW:
break;
default:
FATALF("rhizome_find_duplicate() returned %d", status);
}
}
Improve Rhizome HTTP RESTful interface Add RHIZOME_BUNDLE_STATUS_READONLY enum value Tighten up switch statements on bundle and payload status enums (no default labels) Rename some recently added enum entries Return bundle status and payload status in HTTP responses Add test for failing to decrypt a foreign encrypted bundle payload, fix bug that caused an assertion failure Add tests for fetching a non-existent manifest and fetching bundles whose payload blob is not in the store
2014-07-02 07:46:19 +00:00
assert(*mout == NULL);
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
*mout = m;
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Importing the same bundle twice returns duplicate flag
2013-01-15 00:02:48 +00:00
/* Convert to final form for signing and writing to disk */
if (rhizome_manifest_pack_variables(m))
RETURN(WHY("Could not convert manifest to wire format"));
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Importing the same bundle twice returns duplicate flag
2013-01-15 00:02:48 +00:00
/* Sign it */
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
assert(!m->selfSigned);
Importing the same bundle twice returns duplicate flag
2013-01-15 00:02:48 +00:00
if (rhizome_manifest_selfsign(m))
RETURN(WHY("Could not sign manifest"));
New enum rhizome_payload_status Refactor a lot of Rhizome bundle storage code to use the new "enum rhizome_payload_status" instead of mysterious int values to represent the outcome of the operation.
2013-12-27 18:56:22 +00:00
assert(m->selfSigned);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Importing the same bundle twice returns duplicate flag
2013-01-15 00:02:48 +00:00
/* mark manifest as finalised */
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
enum rhizome_bundle_status status = rhizome_add_manifest(m, mout);
RETURN(status);
created tool for automatically finding IN()s without matching OUT()s or where return() is used instead of RETURN(). Added OUT() to end of all functions using IN() that lacked it to make it easier to statically analyse this invariant. Fixed several return instead of RETURNs detected through use of this tool. #49
2013-02-16 17:47:24 +00:00
OUT();
Refactor add via HTTP to be equivalent to command line add
2012-12-20 04:48:59 +00:00
}
Added refactored rhizome code in separate files.
2012-01-12 03:38:24 +00:00
rhizome_manifest_set_name_from_path() Refactor rhizome_fill_manifest() to use it
2013-12-30 05:28:45 +00:00
/* Returns 1 if the name was successfully set, 0 if not.
*/
int rhizome_manifest_set_name_from_path(rhizome_manifest *m, const char *filepath)
{
const char *name = strrchr(filepath, '/');
Fix "name=/file" bug in Rhizome add Improved Rhizome test scripts and added new assert_manifest_fields() function to Rhizome test defs
2014-03-12 03:52:38 +00:00
if (name)
++name; // skip '/'
else
rhizome_manifest_set_name_from_path() Refactor rhizome_fill_manifest() to use it
2013-12-30 05:28:45 +00:00
name = filepath;
if (!rhizome_str_is_manifest_name(name)) {
WARNF("invalid rhizome name %s -- not used", alloca_str_toprint(name));
return 0;
}
rhizome_manifest_set_name(m, name);
return 1;
}
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
/* Fill in a few missing manifest fields, to make it easier to use when adding new files:
* - use the current time for "date" and "version"
* - use the given author SID, or the 'sender' if present, as the author
* - create an ID if there is none, otherwise authenticate the existing one
* - if service is file, then use the payload file's basename for "name"
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
*
* Return NULL if successful, otherwise a pointer to a static text string describing the reason for
Refactor and improve "journal append" Distinguish between fatal and user-supplied-input errors, return error descriptive text in a strbuf to allow dynamic content, apply user-supplied field assgnments/deletions _after_ copying existing manifest fields, use exit status 4 (invalid manifest) when applying journal append to a non-journal or vice versa
2015-03-23 07:08:46 +00:00
* the failure (always an internal/unrecoverable error).
Formalise "rhizome add file" exit status Formalise add-bundle result in "enum rhizome_bundle_status" Rewrite rhizome_manifest_finalise(), rhizome_find_duplicate() and rhizome_add_manifest() to return enum rhizome_bundle_status New function rhizome_manifest_check_stored() that compares a manifest with its stored counterpart and returns enum rhizome_bundle_status Remove redundant rhizome_manifest_check_sanity(), consolidating all manifest validation rules in rhizome_manifest_validate(), which now checks the 'id' field is present, and that 'sender' and 'recipient' are both present for MeshMS Correct manifest finalisation logic: set the 'finalised' flag in rhizome_manifest_validate(), not in rhizome_manifest_verify() (which sets 'selfSigned'), and consistently clear 'finalised' flag in all attribute setter functions Remove manifest 'ttl' field and all references thereof (leaving unused space in Rhizome BAR) Rename some payload functions for clarity
2013-12-19 08:43:39 +00:00
*/
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
const char * rhizome_fill_manifest(rhizome_manifest *m, const char *filepath, const sid_t *authorSidp)
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
{
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
const char *reason = NULL;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Set version of manifest from current time if not already set. */
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (m->version == 0)
rhizome_manifest_set_version(m, gettime_ms());
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Set the manifest's author. This must be done before binding to a new ID (below). If no author
* was specified, then the manifest's "sender" field is used, if present.
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
*/
if (authorSidp)
rhizome_manifest_set_author(m, authorSidp);
else if (m->has_sender)
rhizome_manifest_set_author(m, &m->sender);
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
/* Fill in the bundle secret and bundle ID.
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
*/
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
int valid_haveSecret = 0;
switch (m->haveSecret) {
case SECRET_UNKNOWN:
valid_haveSecret = 1;
// If the Bundle Id is already known, then derive the bundle secret from BK if known.
// If there is no Bundle Id, then create a new bundle Id and secret from scratch.
if (m->has_id) {
if (config.debug.rhizome)
DEBUGF("discover secret for bundle bid=%s", alloca_tohex_rhizome_bid_t(m->cryptoSignPublic));
rhizome_authenticate_author(m);
break;
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUG("creating new bundle");
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
if (rhizome_manifest_createid(m) == -1) {
WHY(reason = "Could not bind manifest to an ID");
return reason;
}
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
// fall through to set the BK field...
case NEW_BUNDLE_ID:
valid_haveSecret = 1;
assert(m->has_id);
if (m->authorship != ANONYMOUS) {
if (config.debug.rhizome)
DEBUGF("set BK field for bid=%s", alloca_tohex_rhizome_bid_t(m->cryptoSignPublic));
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
rhizome_manifest_add_bundle_key(m); // set the BK field
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
}
break;
case EXISTING_BUNDLE_ID:
valid_haveSecret = 1;
// If modifying an existing bundle, try to discover the bundle secret key and the author.
assert(m->has_id);
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUGF("modifying existing bundle bid=%s", alloca_tohex_rhizome_bid_t(m->cryptoSignPublic));
rhizome_authenticate_author(m);
// TODO assert that new version > old version?
Refactor add via HTTP to be equivalent to command line add
2012-12-20 04:48:59 +00:00
}
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
if (!valid_haveSecret)
FATALF("haveSecret = %d", m->haveSecret);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
/* Service field must already be set.
*/
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
if (m->service == NULL) {
WHYF(reason = "Missing 'service' field");
return reason;
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (config.debug.rhizome)
Refactor and improve "journal append" Distinguish between fatal and user-supplied-input errors, return error descriptive text in a strbuf to allow dynamic content, apply user-supplied field assgnments/deletions _after_ copying existing manifest fields, use exit status 4 (invalid manifest) when applying journal append to a non-journal or vice versa
2015-03-23 07:08:46 +00:00
DEBUGF("manifest contains service=%s", m->service);
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
/* Fill in 'date' field to current time unless already set.
*/
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (!m->has_date) {
rhizome_manifest_set_date(m, (int64_t) gettime_ms());
if (config.debug.rhizome)
DEBUGF("missing 'date', set default date=%"PRItime_ms_t, m->date);
}
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
/* Fill in 'name' field if service=file.
*/
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (strcasecmp(RHIZOME_SERVICE_FILE, m->service) == 0) {
Fix rhizome_fill_manifest() 'name' semantics Only set 'name' field if the given pathname is valid Do not set 'name' field if no pathname supplied
2013-12-18 07:12:45 +00:00
if (m->name) {
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if (config.debug.rhizome)
Fix rhizome_fill_manifest() 'name' semantics Only set 'name' field if the given pathname is valid Do not set 'name' field if no pathname supplied
2013-12-18 07:12:45 +00:00
DEBUGF("manifest already contains name=%s", alloca_str_toprint(m->name));
rhizome_manifest_set_name_from_path() Refactor rhizome_fill_manifest() to use it
2013-12-30 05:28:45 +00:00
} else if (filepath)
rhizome_manifest_set_name_from_path(m, filepath);
Fix rhizome_fill_manifest() 'name' semantics Only set 'name' field if the given pathname is valid Do not set 'name' field if no pathname supplied
2013-12-18 07:12:45 +00:00
else if (config.debug.rhizome)
DEBUGF("manifest missing 'name'");
Enable encryption of rhizome payloads
2013-01-03 05:42:24 +00:00
}
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
Create authored bundle from bundle secret Improve the logic in rhizome_fill_manifest() to handle the case where the secret and author are both supplied, by setting the BK field so the secret can be recovered from the manifest later
2014-11-14 02:31:44 +00:00
/* Fill in 'crypt' field. Anything sent from one person to another should be considered private
* and encrypted by default.
*/
Refactor manifest: specific setter functions Replace generic rhizome_manifest_set() and rhizome_manifest_set_ll() with per-field setter functions, eg, rhizome_manifest_set_filesize(). Struct rhizome_manifest elements for all known fields, to replace the use of rhizome_manifest_get() and rhizome_manifest_get_ll() everywhere: sender, recipient, service, name, date, bundle_key. Add boolean validity flags for binary blob types, to avoid having to compare with many bytes of all-zero to detect presence, eg, has_sender, has_recipient, has_author, has_bundle_key. These maintained by the setter functions. Rename existing manifest struct elements to be the same as their field names: fileLength -> filesize, journalTail -> tail. More use of unsigned int, size_t and uint64_t for payload sizes, offsets, byte counts, etc. especially in rhizome_store.c and meshms.c. More uniform use of size_t to dimension memory buffers. Fix some printf(3) style format strings for 64-bit correctness on 32-bit systems. Use new constant RHIZOME_SIZE_UNSET instead of -1 to indicate unknown dimension, and explicitly assert its absence before comparisons and arithmetic, for safety. Replace some 'int' loop variables with 'unsigned' where appropriate. Fix bugs discovered in MeshMS bundle private/public key generation and bundle secret key handling for export/extract commands. Instrument the first MeshMS test case to aid debugging. New debug config flag: debug.manifest logs all modifications to all manifest fields by setter functions. Rename debug config flag: debug.rhizome_bind -> debug.rhizome_sql_bind.
2013-10-30 12:52:19 +00:00
if ( m->payloadEncryption == PAYLOAD_CRYPT_UNKNOWN
&& m->has_sender
&& m->has_recipient
&& !is_sid_t_broadcast(m->recipient)
) {
if (config.debug.rhizome)
DEBUGF("Implicitly adding payload encryption due to presense of sender & recipient fields");
rhizome_manifest_set_crypt(m, PAYLOAD_ENCRYPTED);
}
Change return type of rhizome_fill_manifest() To help improve diagnostic feedback through APIs
2015-03-16 12:10:08 +00:00
return NULL;
improve reporting of broken manifests, and make conditional on debug.rejecteddata
2013-02-15 21:04:44 +00:00
}
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
/* Work out the authorship status of the bundle without performing any cryptographic checks.
* Sets the 'authorship' element and returns 1 if an author was found, 0 if not.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
int rhizome_lookup_author(rhizome_manifest *m)
{
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
IN();
Refactor keyring identity iteration
2014-10-31 03:13:23 +00:00
keyring_iterator it;
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
switch (m->authorship) {
case AUTHOR_NOT_CHECKED:
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUGF("manifest[%d] lookup author=%s", m->manifest_record_number, alloca_tohex_sid_t(m->author));
Refactor keyring identity iteration
2014-10-31 03:13:23 +00:00
keyring_iterator_start(keyring, &it);
if (keyring_find_sid(&it, &m->author)) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUGF("found author");
m->authorship = AUTHOR_LOCAL;
RETURN(1);
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
// fall through
case ANONYMOUS:
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
if (m->has_sender) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUGF("manifest[%d] lookup sender=%s", m->manifest_record_number, alloca_tohex_sid_t(m->sender));
Refactor keyring identity iteration
2014-10-31 03:13:23 +00:00
keyring_iterator_start(keyring, &it);
if (keyring_find_sid(&it, &m->sender)) {
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
if (config.debug.rhizome)
DEBUGF("found sender");
rhizome_manifest_set_author(m, &m->sender);
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
m->authorship = AUTHOR_LOCAL;
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(1);
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
}
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
case AUTHENTICATION_ERROR:
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
case AUTHOR_UNKNOWN:
case AUTHOR_IMPOSTOR:
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(0);
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
case AUTHOR_LOCAL:
case AUTHOR_AUTHENTIC:
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
RETURN(1);
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
}
Rewrite bundle author authentication Replaced 'int has_author' manifest element with new 'enum authorship' element to record the result of author authentication, to avoid repeating expensive crypto operations. Separated the handling of bundle secret arguments from author lookup and authentication. The new rhizome_apply_bundle_secret(m,bsk) is now called at the top level to set the manifest secret key (if it validates), and thereafter there is no need to pass the 'bsk' argument to any other functions, as they can simply check the 'haveSecret' field of the manifest. Removed rhizome_extract_privatekey() which combined author lookup and bundle secret validation, and replaced it with functions that only deal with the author: rhizome_lookup_author() and rhizome_authenticate_author(). Renamed other functions to make their purpose and effect clearer. Formalised the semantics of only storing AUTHENTICATED author SIDs in the 'author' column of the MANIFESTS table, which necessitated a change to a 'rhizomeops' test case: when adding a file using a BK-less manifest, the author column is set to null, so the Rhizome list output does not show the bundle as ".fromhere" and does not give an author for that bundle.
2013-11-05 07:28:03 +00:00
FATALF("m->authorship = %d", m->authorship);
RETURN(0);
OUT();
Refactor "rhizome list" main loop Preparing for re-use in HTTP /restful/rhizome/bundlelist.json
2013-11-04 13:17:09 +00:00
}
Reference in New Issue Copy Permalink