diff --git a/src/chat/chat_channel.c b/src/chat/chat_channel.c index 4d55a6560..0c0bec188 100644 --- a/src/chat/chat_channel.c +++ b/src/chat/chat_channel.c @@ -201,62 +201,51 @@ void chat_core_create_channel_auto_trampoline(void* arg) { u_free(arg); } -void chat_core_create_channel_auto(struct UTUN_INSTANCE* inst, const char* name) { - struct chat_core_ctx* cc = CC(inst); - if (!cc || !cc->initialized || !name) { - DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "%s: create_channel_auto — not initialized or NULL name", CC_ID); - return; +/* Генерация двух независимых типов ключей с проверкой всех стадий OpenSSL. */ +static int channel_generate_keypair(int type, uint8_t public_key[32], uint8_t private_key[32]) { + EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(type, NULL); EVP_PKEY* key = NULL; + const char* stage = "context"; size_t public_size = 32, private_size = 32; + if (!ctx) goto error; + stage = "initialize"; if (EVP_PKEY_keygen_init(ctx) != 1) goto error; + stage = "generate"; if (EVP_PKEY_keygen(ctx, &key) != 1) goto error; + stage = "public key"; + if (EVP_PKEY_get_raw_public_key(key, public_key, &public_size) != 1 || public_size != 32) goto error; + stage = "private key"; + if (EVP_PKEY_get_raw_private_key(key, private_key, &private_size) != 1 || private_size != 32) goto error; + EVP_PKEY_free(key); EVP_PKEY_CTX_free(ctx); return 0; +error: + DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "channel key generation: type=%d stage=%s public_bytes=%zu private_bytes=%zu", + type, stage, public_size, private_size); + EVP_PKEY_free(key); EVP_PKEY_CTX_free(ctx); return -1; +} + +uint64_t chat_core_create_channel_auto(struct UTUN_INSTANCE* inst, const char* name) { + struct chat_core_ctx* cc = inst ? CC(inst) : NULL; + if (!cc || !cc->initialized || !cc->db || !inst->topo_groups || !name || strnlen(name, 128) == 128) { + DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "channel auto create: invalid context/name or name exceeds127 bytes"); return 0; } - DEBUG_INFO(DEBUG_CATEGORY_CHAT_SYNC, "%s: create_channel_auto BEGIN name=%s", CC_ID, name); - - uint8_t x25519_pub[32] = {0}, x25519_priv[32] = {0}; - { EVP_PKEY* pkey = NULL; EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, NULL); - if (ctx) { EVP_PKEY_keygen_init(ctx); EVP_PKEY_keygen(ctx, &pkey); EVP_PKEY_CTX_free(ctx); } - if (pkey) { size_t pkLen = 32, skLen = 32; EVP_PKEY_get_raw_public_key(pkey, x25519_pub, &pkLen); EVP_PKEY_get_raw_private_key(pkey, x25519_priv, &skLen); EVP_PKEY_free(pkey); } } - - uint8_t ed25519_pub[32] = {0}, ed25519_priv[32] = {0}; - EVP_PKEY* ed_pkey = NULL; - { EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_ED25519, NULL); - if (ctx) { EVP_PKEY_keygen_init(ctx); EVP_PKEY_keygen(ctx, &ed_pkey); EVP_PKEY_CTX_free(ctx); } - if (ed_pkey) { size_t pkLen = 32, skLen = 32; EVP_PKEY_get_raw_public_key(ed_pkey, ed25519_pub, &pkLen); EVP_PKEY_get_raw_private_key(ed_pkey, ed25519_priv, &skLen); } } - - uint64_t chId = 0; RAND_bytes((uint8_t*)&chId, sizeof(chId)); - chId &= 0x7FFFFFFFFFFFFFFFULL; /* как node_id — всегда < 2^63 (помещается в signed Long) */ - if (chId == 0) chId = 1; - char channelId[64]; snprintf(channelId, sizeof(channelId), "%llu", (unsigned long long)chId); - - uint8_t sig[64] = {0}; - if (ed_pkey) { - size_t nameLen = strlen(name); - size_t chIdLen = strlen(channelId); - size_t msgLen = chIdLen + 1 + nameLen + 1 + 8 + 32 + 32; - uint8_t* msg = u_malloc(msgLen); - if (msg) { - uint8_t* p = msg; - memcpy(p, channelId, chIdLen); p += chIdLen; *p++ = '\0'; - memcpy(p, name, nameLen); p += nameLen; *p++ = '\0'; - memcpy(p, &cc->my_node_id, 8); p += 8; - memcpy(p, x25519_pub, 32); p += 32; - memcpy(p, ed25519_pub, 32); - EVP_MD_CTX* mdctx = EVP_MD_CTX_new(); - if (mdctx) { EVP_DigestSignInit(mdctx, NULL, NULL, NULL, ed_pkey); size_t sl = 64; EVP_DigestSign(mdctx, sig, &sl, msg, msgLen); EVP_MD_CTX_free(mdctx); } - u_free(msg); - } - EVP_PKEY_free(ed_pkey); + if (!sqlite3_get_autocommit(cc->db)) { + DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "channel auto create: external transaction rejected before key generation"); return 0; } - - struct chat_channel_create* req = u_calloc(1, sizeof(*req)); - if (!req) return; - req->inst = inst; - snprintf(req->channel_id, sizeof(req->channel_id), "%s", channelId); - snprintf(req->name, sizeof(req->name), "%s", name); - req->owner_node_id = cc->my_node_id; - memcpy(req->x25519_pubkey, x25519_pub, 32); memcpy(req->x25519_privkey, x25519_priv, 32); - memcpy(req->ed25519_pubkey, ed25519_pub, 32); memcpy(req->ed25519_privkey, ed25519_priv, 32); - memcpy(req->signature, sig, 64); - - chat_core_create_channel(inst, req); - u_free(req); + struct chat_channel_create req = {.inst = inst, .owner_node_id = inst->node_id}; + uint8_t description[CHAT_CHANNEL_DESCRIPTION_MAX]; uint64_t group_id = 0; int result = -1; + if (channel_generate_keypair(EVP_PKEY_X25519, req.x25519_pubkey, req.x25519_privkey) || + channel_generate_keypair(EVP_PKEY_ED25519, req.ed25519_pubkey, req.ed25519_privkey)) goto done; + if (RAND_bytes((uint8_t*)&group_id, sizeof(group_id)) != 1) { + DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "channel auto create: ID generation failed"); goto done; + } + group_id &= INT64_MAX; if (!group_id) group_id = 1; + snprintf(req.channel_id, sizeof(req.channel_id), "%llu", (unsigned long long)group_id); + memcpy(req.name, name, strlen(name) + 1); + int bytes = chat_channel_description_data(req.channel_id, req.name, req.owner_node_id, + req.x25519_pubkey, req.ed25519_pubkey, description, sizeof(description)); + if (bytes < 0 || sc_ed25519_sign(req.ed25519_privkey, description, (size_t)bytes, req.signature) != SC_OK) { + DEBUG_ERROR(DEBUG_CATEGORY_CHAT_SYNC, "channel auto create: description signing failed ch=%s", req.channel_id); goto done; + } + result = chat_core_create_channel(inst, &req); +done: + OPENSSL_cleanse(&req, sizeof(req)); + return result == 0 ? group_id : 0; } /* ─── управление подключением к каналу (выбор в GUI) ─── */ diff --git a/src/chat/chat_core.h b/src/chat/chat_core.h index 8326044e1..673139e28 100644 --- a/src/chat/chat_core.h +++ b/src/chat/chat_core.h @@ -143,8 +143,10 @@ int chat_core_create_channel(struct UTUN_INSTANCE* inst, const struct chat_chann void chat_core_create_channel_trampoline(void* arg); -// Сгенерировать ключи и создать канал, добавив себя владельцем. -void chat_core_create_channel_auto(struct UTUN_INSTANCE* inst, const char* name); +/* Сгенерировать независимые пары X25519/Ed25519 и создать канал. ID>0 — сохранён,0 — отказ. + * name — NUL-строка<=127байт,не обрезается. Проверяет RNG/генерацию/извлечение/подписи; + * временные приватные ключи очищаются. Внешняя транзакция отклоняется до генерации. */ +uint64_t chat_core_create_channel_auto(struct UTUN_INSTANCE* inst, const char* name); void chat_core_create_channel_auto_trampoline(void* arg);