cory/tildefriends
4
5
Fork 1
Code Issues 29 Pull Requests 1 Actions Releases 26 Wiki Activity

Enable SQLITE_SECURE_DELETE, bump up the max rpc size to fix syncing problems, and add a yet unused timestamp index.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3623 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2021-01-02 19:27:41 +00:00
parent 22078fcd2c
commit b747bd74b3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -108,6 +108,7 @@ $(SQLITE_OBJS): CFLAGS += \
-DSQLITE_MAX_LIKE_PATTERN_LENGTH=50 \ -DSQLITE_MAX_LIKE_PATTERN_LENGTH=50 \
-DSQLITE_MAX_VARIABLE_NUMBER=100 \ -DSQLITE_MAX_VARIABLE_NUMBER=100 \
-DSQLITE_MAX_TRIGGER_DEPTH=10 \ -DSQLITE_MAX_TRIGGER_DEPTH=10 \
-DSQLITE_SECURE_DELETE \
-Wno-implicit-fallthrough -Wno-implicit-fallthrough
XOPT_SOURCES = deps/xopt/xopt.c XOPT_SOURCES = deps/xopt/xopt.c

10
src/ssb.c
View File

@ -54,6 +54,7 @@ typedef enum {
enum { enum {
k_connections_changed_callbacks_max = 4, k_connections_changed_callbacks_max = 4,
k_tf_ssb_rpc_message_body_length_max = 8192,
}; };
typedef struct _tf_ssb_broadcast_t tf_ssb_broadcast_t; typedef struct _tf_ssb_broadcast_t tf_ssb_broadcast_t;
@ -190,7 +191,7 @@ static void _tf_ssb_connection_close(tf_ssb_connection_t* connection, const char
return; return;
} else if (connection->state == k_tf_ssb_state_verified || } else if (connection->state == k_tf_ssb_state_verified ||
connection->state == k_tf_ssb_state_server_verified) { connection->state == k_tf_ssb_state_server_verified) {
printf("Connection %p is closing: %s.", connection, reason); printf("Connection %p is closing: %s.\n", connection, reason);
connection->state = k_tf_ssb_state_closing; connection->state = k_tf_ssb_state_closing;
_tf_ssb_connection_send_close(connection); _tf_ssb_connection_send_close(connection);
} else { } else {
@ -1092,7 +1093,7 @@ static bool _tf_ssb_connection_box_stream_recv(tf_ssb_connection_t* connection)
} }
_tf_ssb_nonce_inc(connection->nonce); _tf_ssb_nonce_inc(connection->nonce);
connection->body_len = htons(*(uint16_t*)header); connection->body_len = htons(*(uint16_t*)header);
if (connection->body_len > 4096) { if (connection->body_len > k_tf_ssb_rpc_message_body_length_max) {
_tf_ssb_connection_close(connection, "body length is too large"); _tf_ssb_connection_close(connection, "body length is too large");
return false; return false;
} }
@ -1106,10 +1107,10 @@ static bool _tf_ssb_connection_box_stream_recv(tf_ssb_connection_t* connection)
} }
if (connection->body_len) { if (connection->body_len) {
uint8_t buf[16 + 4096]; uint8_t buf[16 + k_tf_ssb_rpc_message_body_length_max];
memcpy(buf, connection->body_auth_tag, sizeof(connection->body_auth_tag)); memcpy(buf, connection->body_auth_tag, sizeof(connection->body_auth_tag));
if (_tf_ssb_connection_recv_pop(connection, buf + 16, connection->body_len)) { if (_tf_ssb_connection_recv_pop(connection, buf + 16, connection->body_len)) {
uint8_t body[4096]; uint8_t body[k_tf_ssb_rpc_message_body_length_max];
if (crypto_secretbox_open_easy(body, buf, 16 + connection->body_len, connection->nonce, connection->s_to_c_box_key) != 0) { if (crypto_secretbox_open_easy(body, buf, 16 + connection->body_len, connection->nonce, connection->s_to_c_box_key) != 0) {
_tf_ssb_connection_close(connection, "failed to open secret box"); _tf_ssb_connection_close(connection, "failed to open secret box");
return false; return false;
@ -1493,6 +1494,7 @@ tf_ssb_t* tf_ssb_create(uv_loop_t* loop, JSContext* context, sqlite3* db, const
NULL, NULL, NULL); NULL, NULL, NULL);
sqlite3_exec(ssb->db, "CREATE INDEX IF NOT EXISTS messages_author_id_index ON messages (author, id)", NULL, NULL, NULL); sqlite3_exec(ssb->db, "CREATE INDEX IF NOT EXISTS messages_author_id_index ON messages (author, id)", NULL, NULL, NULL);
sqlite3_exec(ssb->db, "CREATE INDEX IF NOT EXISTS messages_author_sequence_index ON messages (author, sequence)", NULL, NULL, NULL); sqlite3_exec(ssb->db, "CREATE INDEX IF NOT EXISTS messages_author_sequence_index ON messages (author, sequence)", NULL, NULL, NULL);
sqlite3_exec(ssb->db, "CREATE INDEX IF NOT EXISTS messages_author_timestamp_index ON messages (author, timestamp)", NULL, NULL, NULL);
sqlite3_exec(ssb->db, sqlite3_exec(ssb->db,
"CREATE TABLE IF NOT EXISTS blobs (" "CREATE TABLE IF NOT EXISTS blobs ("
" id TEXT PRIMARY KEY," " id TEXT PRIMARY KEY,"