media: Ed25519-подписи блоков, local_attrs, MediaBlockReader, файловые вложения

src/chat/db_sync.c

@@ -15,6 +15,7 @@
 #include "../../lib/platform_compat.h"
 #include <string.h>
 #include <openssl/evp.h>
+#include <unistd.h>
 
 // ---- Forward declarations ----
 struct DB_SYNC;
@@ -422,7 +423,8 @@ static int db_verify_author_sig(struct DB_SYNC_INSTANCE* si,
 static int db_record_insert(struct DB_SYNC_INSTANCE* si,
                             uint64_t id, uint64_t ts, uint64_t author_node_id,
                             const char* json, size_t jlen,
-                            const uint8_t* author_sig, int do_cascade)
+                            const uint8_t* author_sig, int do_cascade,
+                            const char* local_attrs)
 {
     DEBUG_TRACE(DEBUG_CATEGORY_DB_SYNC, "id=%llu ts=%llu author=%N len=%zu cascade=%d", (unsigned long long)id, (unsigned long long)ts, (unsigned long long)author_node_id, jlen, do_cascade);
     sqlite3* db = SI_DB(si);
@@ -465,8 +467,8 @@ static int db_record_insert(struct DB_SYNC_INSTANCE* si,
     if (si_prep(si, &stmt,
                 "INSERT INTO \"%s\""
                 " (timestamp,node_id,id,chain_hash,flags,data,"
-                "  author_signature,delivered_peers,delivery_chain)"
-                " VALUES (?,?,?,?,0,?,?,0,'')") != SQLITE_OK)
+                "  author_signature,local_attrs,delivered_peers,delivery_chain)"
+                " VALUES (?,?,?,?,0,?,?,?,0,'')") != SQLITE_OK)
     { DEBUG_ERROR(DEBUG_CATEGORY_DB_SYNC, "db_record_insert INSERT prep: %s", sqlite3_errmsg(db)); sqlite3_exec(db, "ROLLBACK", NULL, NULL, NULL); return -1; }
     sqlite3_bind_int64(stmt, 1, (sqlite3_int64)ts);
     sqlite3_bind_int64(stmt, 2, (sqlite3_int64)author_node_id);
@@ -475,6 +477,8 @@ static int db_record_insert(struct DB_SYNC_INSTANCE* si,
     if (jlen > 0) sqlite3_bind_blob(stmt, 5, json, (int)jlen, SQLITE_STATIC);
     else          sqlite3_bind_null(stmt, 5);
     sqlite3_bind_blob(stmt, 6, author_sig, DB_SIG_SIZE, SQLITE_STATIC);
+    if (local_attrs && local_attrs[0]) sqlite3_bind_text(stmt, 7, local_attrs, -1, SQLITE_STATIC);
+    else                               sqlite3_bind_text(stmt, 7, "", -1, SQLITE_STATIC);
     rc = sqlite3_step(stmt);
     sqlite3_finalize(stmt);
     if (rc != SQLITE_DONE) { DEBUG_ERROR(DEBUG_CATEGORY_DB_SYNC, "INSERT: %s", sqlite3_errmsg(db)); sqlite3_exec(db, "ROLLBACK", NULL, NULL, NULL); return -1; }
@@ -923,7 +927,7 @@ static void db_handle_send_data(struct DB_SYNC_INSTANCE* si, uint64_t src, const
         const uint8_t* save = ptr;
         uint64_t rid, rts, rauthor; uint32_t rdlen; const uint8_t* rdata, *rsig; int rsiglen;
         if (si_parse_record(&ptr, p + len, &rid, &rts, &rauthor, &rdlen, &rdata, &rsig, &rsiglen) != 0) { parse_fails++; break; }
-        int ret = db_record_insert(si, rid, rts, rauthor, (const char*)rdata, rdlen, rsig, 0);
+        int ret = db_record_insert(si, rid, rts, rauthor, (const char*)rdata, rdlen, rsig, 0, NULL);
         if (ret >= 0) { recv_ts[recv_cnt] = rts; if (rsig && rsiglen >= 8) memcpy(&recv_sig8[recv_cnt], rsig, 8); else recv_sig8[recv_cnt] = 0; recv_cnt++; }
         if (ret >= 0) { if (received == 0) first_id = rid; last_id = rid; received++; }
         if (ret == 1) duplicates++;
@@ -1160,7 +1164,7 @@ static void db_handle_push(struct DB_SYNC_INSTANCE* si, uint64_t src, const uint
     if (si_parse_record(&ptr, p + len, &rid, &rts, &rauthor, &rdlen, &rdata, &rsig, &rsiglen) != 0) return;
     DEBUG_TRACE(DEBUG_CATEGORY_DB_SYNC, "from=%016llx id=%llu author=%016llx ts=%llu len=%u", (unsigned long long)src, (unsigned long long)rid, (unsigned long long)rauthor, (unsigned long long)rts, rdlen);
 
-    int ret = db_record_insert(si, rid, rts, rauthor, (const char*)rdata, rdlen, rsig, 0);
+    int ret = db_record_insert(si, rid, rts, rauthor, (const char*)rdata, rdlen, rsig, 0, NULL);
     if (ret == 0) {
         uint32_t ins_pos = si_find_pos(si, rts, rsig);
         uint32_t total = db_count(si);
@@ -1672,6 +1676,7 @@ struct DB_SYNC_INSTANCE* db_sync_instance_add(struct UTUN_INSTANCE* inst, const
                  " flags INTEGER NOT NULL DEFAULT 0,"
                  " data BLOB,"
                  " author_signature BLOB NOT NULL,"
+                 " local_attrs TEXT DEFAULT '',"
                  " delivered_peers INTEGER NOT NULL DEFAULT 0,"
                  " delivery_chain TEXT NOT NULL DEFAULT '',"
                  " PRIMARY KEY (timestamp, author_signature))",
@@ -1746,7 +1751,8 @@ void db_sync_instance_remove(struct DB_SYNC_INSTANCE* si)
 }
 
 int db_sync_insert_signed(struct DB_SYNC_INSTANCE* si, const char* json_data, size_t len,
-                           const uint8_t* sig, size_t sig_len, uint64_t ts)
+                           const uint8_t* sig, size_t sig_len, uint64_t ts,
+                           const char* local_attrs)
 {
     if (!si || !si->enabled || !json_data || len == 0) { DEBUG_ERROR(DEBUG_CATEGORY_DB_SYNC, "insert invalid args"); return -1; }
     if (!sig || sig_len != DB_SIG_SIZE) { DEBUG_ERROR(DEBUG_CATEGORY_DB_SYNC, "insert_signed: signature required (64 bytes Ed25519)"); return -1; }
@@ -1755,22 +1761,25 @@ int db_sync_insert_signed(struct DB_SYNC_INSTANCE* si, const char* json_data, si
     uint64_t id = si->next_id;
     uint64_t author_node_id = si->db_sync->inst->node_id;
 
-    int ret = db_record_insert(si, id, ts, author_node_id, json_data, len, sig, 1);
+    int ret = db_record_insert(si, id, ts, author_node_id, json_data, len, sig, 1, local_attrs);
     if (ret != 0) return ret;
     if (si->on_insert) si->on_insert(si, ts, json_data, len, author_node_id, si->on_insert_arg);
 
     // Build PUSH: [DB_MSG_PUSH][id:8][ts:8][author:8][dlen:4][data][sig_len:1=64][sig:64]
     uint32_t sl = DB_SIG_SIZE;
-    uint8_t pbuf[2560];
+    size_t push_overhead = 1 + 8 + 8 + 8 + 4 + 1 + 64;
+    size_t push_total = push_overhead + (len > 0 ? len : 0);
+    uint8_t* pbuf = (uint8_t*)u_malloc(push_total);
+    if (!pbuf) { DEBUG_ERROR(DEBUG_CATEGORY_DB_SYNC, "push alloc failed size=%zu", push_total); return -1; }
     uint32_t off = 0;
     pbuf[off++] = DB_MSG_PUSH;
     memcpy(pbuf + off, &id, 8);        off += 8;
     memcpy(pbuf + off, &ts, 8);        off += 8;
     memcpy(pbuf + off, &author_node_id, 8); off += 8;
     memcpy(pbuf + off, &len, 4);       off += 4;
-    if (len > 0 && off + len <= sizeof(pbuf)) { memcpy(pbuf + off, json_data, len); off += len; }
+    if (len > 0) { memcpy(pbuf + off, json_data, len); off += (uint32_t)len; }
     pbuf[off++] = (uint8_t)sl;
-    if (off + sl <= sizeof(pbuf)) { memcpy(pbuf + off, sig, sl); off += sl; }
+    memcpy(pbuf + off, sig, sl); off += sl;
 
     // Push to all synced peers
     int push_count = 0;
@@ -1783,6 +1792,7 @@ int db_sync_insert_signed(struct DB_SYNC_INSTANCE* si, const char* json_data, si
     if (push_count > 0)
         DEBUG_INFO(DEBUG_CATEGORY_DB_SYNC, "sync [%s:ME--] → PUSH out: new msg id=%llu ts=%llu → forwarded to %d synced peers",
                    SI_SHRT(si), (unsigned long long)id, (unsigned long long)ts, push_count);
+    u_free(pbuf);
     return 0;
 }