Add TCP support to DHT-based group chats.

.circleci/cmake-asan

@@ -21,6 +21,7 @@ cmake -B_build -H. -GNinja			\
   -DSTRICT_ABI=ON				\
   -DTEST_TIMEOUT_SECONDS=120			\
   -DUSE_IPV6=OFF				\
+  -DUSE_TEST_NETWORK=ON				\
   -DAUTOTEST=ON
 
 cd _build

.circleci/cmake-tsan

@@ -21,6 +21,7 @@ cmake -B_build -H. -GNinja			\
   -DSTRICT_ABI=ON				\
   -DTEST_TIMEOUT_SECONDS=120			\
   -DUSE_IPV6=OFF				\
+  -DUSE_TEST_NETWORK=ON				\
   -DAUTOTEST=ON
 
 cd _build

.cirrus.yml

@@ -1,7 +1,7 @@
 ---
 cirrus-ci_task:
   container:
-    image: toxchat/toktok-stack:0.0.7
+    image: toxchat/toktok-stack:0.0.10
     cpu: 2
     memory: 2G
   configure_script:
@@ -10,6 +10,6 @@ cirrus-ci_task:
     - bazel test -k
         --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
         --config=ci
-        --config=docker
         --config=release
+        --config=testnet
         //c-toxcore/...

.gitignore

@@ -87,3 +87,5 @@ cscope.files
 
 # rpm
 tox.spec
+
+.idea/

.travis/autotools-linux

@@ -31,6 +31,7 @@ travis_script() {
   add_config_flag --with-nacl-libs="$CACHEDIR/lib/amd64"
   add_config_flag --with-nacl-headers="$CACHEDIR/include/amd64"
   add_config_flag --disable-ipv6
+  add_config_flag --enable-test-network
   add_config_flag --enable-nacl
   add_config_flag --enable-daemon
   add_config_flag --enable-logging

.travis/cmake-linux

@@ -81,6 +81,7 @@ travis_script() {
     -DSTRICT_ABI=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
     -DUSE_IPV6=OFF \
+    -DUSE_TEST_NETWORK=ON \
     -DAUTOTEST=ON
 
   cmake --build _build --parallel "$NPROC" --target install -- -k 0

CMakeLists.txt

@@ -545,15 +545,4 @@ if (BUILD_MISC_TESTS)
     testing/afl_toxsave.c)
   target_link_modules(afl_toxsave toxcore)
 
-  add_executable(group_announce_test ${CPUFEATURES}
-    testing/groupchats/group_announce_test.c)
-  target_link_modules(group_announce_test toxcore misc_tools)
-
-  add_executable(group_bootstrap_n_chat ${CPUFEATURES}
-    testing/groupchats/group_bootstrap_n_chat.c)
-  target_link_modules(group_bootstrap_n_chat toxcore misc_tools)
-
-  add_executable(group_newpeers_dos_attack ${CPUFEATURES}
-    testing/groupchats/group_newpeers_dos_attack.c)
-  target_link_modules(group_newpeers_dos_attack toxcore misc_tools)
 endif()

auto_tests/TCP_test.c

@@ -122,7 +122,8 @@ START_TEST(test_basic)
     memcpy(f_nonce_r, response_plain + CRYPTO_SHARED_KEY_SIZE, CRYPTO_NONCE_SIZE);
 
     // Building a request
-    uint8_t r_req_p[1 + CRYPTO_PUBLIC_KEY_SIZE] = {0};
+    uint8_t r_req_p[1 + CRYPTO_PUBLIC_KEY_SIZE];
+    r_req_p[0] = TCP_PACKET_ROUTING_REQUEST;
     memcpy(r_req_p + 1, f_public_key, CRYPTO_PUBLIC_KEY_SIZE);
     uint8_t r_req[2 + 1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE];
     uint16_t size = 1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE;
@@ -162,7 +163,8 @@ START_TEST(test_basic)
     ck_assert_msg(ret != -1, "Failed to decrypt the TCP server's response.");
     increment_nonce(f_nonce_r);
 
-    ck_assert_msg(packet_resp_plain[0] == 1, "Server sent the wrong packet id: %u", packet_resp_plain[0]);
+    ck_assert_msg(packet_resp_plain[0] == TCP_PACKET_ROUTING_RESPONSE, "Server sent the wrong packet id: %u",
+                  packet_resp_plain[0]);
     ck_assert_msg(packet_resp_plain[1] == 0, "Server did not refuse the connection.");
     ck_assert_msg(public_key_cmp(packet_resp_plain + 2, f_public_key) == 0, "Server sent the wrong public key.");
 
@@ -284,7 +286,7 @@ START_TEST(test_some)
     struct sec_TCP_con *con3 = new_TCP_con(tcp_s, mono_time);
 
     uint8_t requ_p[1 + CRYPTO_PUBLIC_KEY_SIZE];
-    requ_p[0] = 0;
+    requ_p[0] = TCP_PACKET_ROUTING_REQUEST;
 
     // Sending wrong public keys to test server response.
     memcpy(requ_p + 1, con3->public_key, CRYPTO_PUBLIC_KEY_SIZE);
@@ -298,14 +300,14 @@ START_TEST(test_some)
     uint8_t data[2048];
     int len = read_packet_sec_TCP(con1, data, 2 + 1 + 1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == 1 + 1 + CRYPTO_PUBLIC_KEY_SIZE, "Wrong response packet length of %d.", len);
-    ck_assert_msg(data[0] == 1, "Wrong response packet id of %d.", data[0]);
+    ck_assert_msg(data[0] == TCP_PACKET_ROUTING_RESPONSE, "Wrong response packet id of %d.", data[0]);
     ck_assert_msg(data[1] == 16, "Server didn't refuse connection using wrong public key.");
     ck_assert_msg(public_key_cmp(data + 2, con3->public_key) == 0, "Key in response packet wrong.");
 
     // Connection 3
     len = read_packet_sec_TCP(con3, data, 2 + 1 + 1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == 1 + 1 + CRYPTO_PUBLIC_KEY_SIZE, "Wrong response packet length of %d.", len);
-    ck_assert_msg(data[0] == 1, "Wrong response packet id of %d.", data[0]);
+    ck_assert_msg(data[0] == TCP_PACKET_ROUTING_RESPONSE, "Wrong response packet id of %d.", data[0]);
     ck_assert_msg(data[1] == 16, "Server didn't refuse connection using wrong public key.");
     ck_assert_msg(public_key_cmp(data + 2, con1->public_key) == 0, "Key in response packet wrong.");
 
@@ -319,11 +321,11 @@ START_TEST(test_some)
 
     len = read_packet_sec_TCP(con1, data, 2 + 2 + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == 2, "wrong len %d", len);
-    ck_assert_msg(data[0] == 2, "wrong packet id %u", data[0]);
+    ck_assert_msg(data[0] == TCP_PACKET_CONNECTION_NOTIFICATION, "wrong packet id %u", data[0]);
     ck_assert_msg(data[1] == 16, "wrong peer id %u", data[1]);
     len = read_packet_sec_TCP(con3, data, 2 + 2 + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == 2, "wrong len %d", len);
-    ck_assert_msg(data[0] == 2, "wrong packet id %u", data[0]);
+    ck_assert_msg(data[0] == TCP_PACKET_CONNECTION_NOTIFICATION, "wrong packet id %u", data[0]);
     ck_assert_msg(data[1] == 16, "wrong peer id %u", data[1]);
     len = read_packet_sec_TCP(con1, data, 2 + sizeof(test_packet) + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == sizeof(test_packet), "wrong len %d", len);
@@ -354,14 +356,14 @@ START_TEST(test_some)
     ck_assert_msg(memcmp(data, test_packet, sizeof(test_packet)) == 0, "packet is wrong %u %u %u %u", data[0], data[1],
                   data[sizeof(test_packet) - 2], data[sizeof(test_packet) - 1]);
 
-    uint8_t ping_packet[1 + sizeof(uint64_t)] = {4, 8, 6, 9, 67};
+    uint8_t ping_packet[1 + sizeof(uint64_t)] = {TCP_PACKET_PING, 8, 6, 9, 67};
     write_packet_TCP_secure_connection(con1, ping_packet, sizeof(ping_packet));
 
     do_TCP_server_delay(tcp_s, mono_time, 50);
 
     len = read_packet_sec_TCP(con1, data, 2 + sizeof(ping_packet) + CRYPTO_MAC_SIZE);
     ck_assert_msg(len == sizeof(ping_packet), "wrong len %d", len);
-    ck_assert_msg(data[0] == 5, "wrong packet id %u", data[0]);
+    ck_assert_msg(data[0] == TCP_PACKET_PONG, "wrong packet id %u", data[0]);
     ck_assert_msg(memcmp(ping_packet + 1, data + 1, sizeof(uint64_t)) == 0, "wrong packet data");
 
     // Kill off the connections

auto_tests/group_announce_test.c

@@ -19,13 +19,17 @@ typedef struct State {
 
 #include "run_auto_test.h"
 
+#define TEST_MESSAGE "The kiosk in my temporal lobe is shaped like Rosalynn Carter"
+#define TEST_GROUP_NAME "NASA Headquarters"
+#define PEER0_NICK "Lois"
+#define PEER1_NICK "Benjamin"
+
 static void group_invite_handler(Tox *tox, uint32_t friend_number, const uint8_t *invite_data, size_t length,
-                                 void *user_data)
+                                 const uint8_t *group_name, size_t group_name_length, void *user_data)
 {
-    printf("invite arrived; accepting\n");
-    TOX_ERR_GROUP_INVITE_ACCEPT err_accept;
-    tox_group_invite_accept(tox, invite_data, length, nullptr, 0, &err_accept);
-    ck_assert(err_accept == TOX_ERR_GROUP_INVITE_ACCEPT_OK);
+    if (tox != nullptr) {
+        ck_abort_msg("we should not get invited");
+    }
 }
 
 static const char *tox_str_group_join_fail(TOX_GROUP_JOIN_FAIL v)
@@ -62,29 +66,37 @@ static void group_peer_join_handler(Tox *tox, uint32_t groupnumber, uint32_t pee
 static void group_message_handler(Tox *tox, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
                                   const uint8_t *message, size_t length, void *user_data)
 {
+    if (length > TOX_MAX_MESSAGE_LENGTH) {
+        printf("Failed to receive message. Invalid length: %zu\n", length);
+        return;
+    }
+
+    char message_buf[TOX_MAX_MESSAGE_LENGTH + 1];
+    memcpy(message_buf, message, length);
+    message_buf[length] = 0;
+
     State *state = (State *)user_data;
-    printf("peer %u sent message: %s\n", peer_id, (const char *)message);
-    ck_assert(memcmp(message, "hello", 6) == 0);
+    printf("peer %u sent message: %s\n", peer_id, (const char *)message_buf);
+    ck_assert(memcmp(message_buf, TEST_MESSAGE, length) == 0);
     state->message_received = true;
 }
 
 static void group_message_test(Tox **toxes, State *state)
 {
     tox_self_set_name(toxes[0], (const uint8_t *)"a", 1, nullptr);
     tox_self_set_name(toxes[1], (const uint8_t *)"b", 1, nullptr);
-    tox_self_set_name(toxes[2], (const uint8_t *)"c", 1, nullptr);
 
-    tox_callback_group_invite(toxes[1], group_invite_handler, nullptr);
-    tox_callback_group_join_fail(toxes[1], group_join_fail_handler, nullptr);
-    tox_callback_group_peer_join(toxes[1], group_peer_join_handler, nullptr);
-    tox_callback_group_message(toxes[0], group_message_handler, nullptr);
+    tox_callback_group_invite(toxes[1], group_invite_handler);
+    tox_callback_group_join_fail(toxes[1], group_join_fail_handler);
+    tox_callback_group_peer_join(toxes[1], group_peer_join_handler);
+    tox_callback_group_message(toxes[0], group_message_handler);
 
     // tox0 makes new group.
     TOX_ERR_GROUP_NEW err_new;
     uint32_t group_number =
         tox_group_new(
             toxes[0], TOX_GROUP_PRIVACY_STATE_PUBLIC,
-            (const uint8_t *)"my cool group", strlen("my cool group"), &err_new);
+            (const uint8_t *) TEST_GROUP_NAME, strlen(TEST_GROUP_NAME), (const uint8_t *)PEER0_NICK, strlen(PEER0_NICK), &err_new);
     ck_assert(err_new == TOX_ERR_GROUP_NEW_OK);
 
     // get the chat id of the new group.
@@ -93,25 +105,21 @@ static void group_message_test(Tox **toxes, State *state)
     tox_group_get_chat_id(toxes[0], group_number, chat_id, &err_id);
     ck_assert(err_id == TOX_ERR_GROUP_STATE_QUERIES_OK);
 
-    // tox1 and tox2 joins it.
+    // tox1 joins it.
     TOX_ERR_GROUP_JOIN err_join;
-    tox_group_join(toxes[1], chat_id, nullptr, 0, &err_join);
-    ck_assert(err_join == TOX_ERR_GROUP_JOIN_OK);
-
-    tox_group_join(toxes[2], chat_id, nullptr, 0, &err_join);
+    tox_group_join(toxes[1], chat_id, (const uint8_t *)PEER1_NICK, strlen(PEER1_NICK), nullptr, 0, &err_join);
     ck_assert(err_join == TOX_ERR_GROUP_JOIN_OK);
 
     while (!state[0].message_received) {
-        iterate_all_wait(3, toxes, state, ITERATION_INTERVAL);
+        iterate_all_wait(2, toxes, state, ITERATION_INTERVAL);
 
         if (state[1].peer_joined && !state[1].message_sent) {
             TOX_ERR_GROUP_SEND_MESSAGE err_send;
-            tox_group_send_message(toxes[1], group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)"hello", 6, &err_send);
+            tox_group_send_message(toxes[1], group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)TEST_MESSAGE,
+                                   strlen(TEST_MESSAGE), &err_send);
             ck_assert(err_send == TOX_ERR_GROUP_SEND_MESSAGE_OK);
             state[1].message_sent = true;
         }
-
-        c_sleep(ITERATION_INTERVAL);
     }
 
     TOX_ERR_GROUP_LEAVE err_exit;
@@ -120,15 +128,17 @@ static void group_message_test(Tox **toxes, State *state)
 
     tox_group_leave(toxes[1], group_number, nullptr, 0, &err_exit);
     ck_assert(err_exit == TOX_ERR_GROUP_LEAVE_OK);
-
-    tox_group_leave(toxes[2], group_number, nullptr, 0, &err_exit);
-    ck_assert(err_exit == TOX_ERR_GROUP_LEAVE_OK);
 }
 
+#undef PEER1_NICK
+#undef PEER0_NICK
+#undef TEST_GROUP_NAME
+#undef TEST_MESSAGE
+
 int main(void)
 {
     setvbuf(stdout, nullptr, _IONBF, 0);
 
-    run_auto_test(3, group_message_test, false);
+    run_auto_test(2, group_message_test, false);
     return 0;
 }

auto_tests/group_message_test.c

@@ -19,12 +19,18 @@ typedef struct State {
 
 #include "run_auto_test.h"
 
+#define TEST_MESSAGE "Where is it I've read that someone condemned to death says or thinks, an hour before his death, that if he had to live on some high rock, on such a narrow ledge that he'd only room to stand, and the ocean, everlasting darkness, everlasting solitude, everlasting tempest around him, if he had to remain standing on a square yard of space all his life, a thousand years, eternity, it were better to live so than to die at once. Only to live, to live and live! Life, whatever it may be!"
+#define TEST_GROUP_NAME "Utah Data Center"
+#define PEER0_NICK "Victor"
+#define PEER1_NICK "George"
+
 static void group_invite_handler(Tox *tox, uint32_t friend_number, const uint8_t *invite_data, size_t length,
-                                 void *user_data)
+                                 const uint8_t *group_name, size_t group_name_length, void *user_data)
 {
     printf("invite arrived; accepting\n");
     TOX_ERR_GROUP_INVITE_ACCEPT err_accept;
-    tox_group_invite_accept(tox, invite_data, length, nullptr, 0, &err_accept);
+    tox_group_invite_accept(tox, friend_number, invite_data, length, (const uint8_t *)PEER0_NICK, strlen(PEER0_NICK),
+                            nullptr, 0, &err_accept);
     ck_assert(err_accept == TOX_ERR_GROUP_INVITE_ACCEPT_OK);
 }
 
@@ -62,9 +68,44 @@ static void group_peer_join_handler(Tox *tox, uint32_t groupnumber, uint32_t pee
 static void group_message_handler(Tox *tox, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
                                   const uint8_t *message, size_t length, void *user_data)
 {
+    if (length > TOX_MAX_MESSAGE_LENGTH) {
+        printf("Failed to receive message. Invalid length: %zu\n", length);
+        return;
+    }
+
+    char message_buf[TOX_MAX_MESSAGE_LENGTH + 1];
+    memcpy(message_buf, message, length);
+    message_buf[length] = 0;
+
+    TOX_ERR_GROUP_PEER_QUERY q_err;
+    size_t peer_name_len = tox_group_peer_get_name_size(tox, groupnumber, peer_id, &q_err);
+
+    ck_assert(q_err == TOX_ERR_GROUP_PEER_QUERY_OK);
+    ck_assert(peer_name_len <= TOX_MAX_NAME_LENGTH);
+
+    char peer_name[TOX_MAX_NAME_LENGTH + 1];
+    tox_group_peer_get_name(tox, groupnumber, peer_id, (uint8_t *) peer_name, &q_err);
+    peer_name[peer_name_len] = 0;
+
+    ck_assert(q_err == TOX_ERR_GROUP_PEER_QUERY_OK);
+    ck_assert(memcmp(peer_name, PEER1_NICK, peer_name_len));
+
+    TOX_ERR_GROUP_SELF_QUERY s_err;
+    size_t self_name_len = tox_group_self_get_name_size(tox, groupnumber, &s_err);
+    ck_assert(s_err == TOX_ERR_GROUP_SELF_QUERY_OK);
+    ck_assert(self_name_len <= TOX_MAX_NAME_LENGTH);
+
+    char self_name[TOX_MAX_NAME_LENGTH + 1];
+    tox_group_self_get_name(tox, groupnumber, (uint8_t *) self_name, &s_err);
+    self_name[self_name_len] = 0;
+
+    ck_assert(s_err == TOX_ERR_GROUP_SELF_QUERY_OK);
+    ck_assert(memcmp(self_name, PEER0_NICK, self_name_len));
+
+    printf("%s sent message to %s: %s\n", peer_name, self_name, message_buf);
+    ck_assert(memcmp(message_buf, TEST_MESSAGE, length) == 0);
+
     State *state = (State *)user_data;
-    printf("peer %u sent message: %s\n", peer_id, (const char *)message);
-    ck_assert(memcmp(message, "hello", 6) == 0);
     state->message_received = true;
 }
 
@@ -73,17 +114,17 @@ static void group_message_test(Tox **toxes, State *state)
     tox_self_set_name(toxes[0], (const uint8_t *)"a", 1, nullptr);
     tox_self_set_name(toxes[1], (const uint8_t *)"b", 1, nullptr);
 
-    tox_callback_group_invite(toxes[1], group_invite_handler, nullptr);
-    tox_callback_group_join_fail(toxes[1], group_join_fail_handler, nullptr);
-    tox_callback_group_peer_join(toxes[1], group_peer_join_handler, nullptr);
-    tox_callback_group_message(toxes[0], group_message_handler, nullptr);
+    tox_callback_group_invite(toxes[1], group_invite_handler);
+    tox_callback_group_join_fail(toxes[1], group_join_fail_handler);
+    tox_callback_group_peer_join(toxes[1], group_peer_join_handler);
+    tox_callback_group_message(toxes[0], group_message_handler);
 
     // tox0 makes new group.
     TOX_ERR_GROUP_NEW err_new;
     uint32_t group_number =
         tox_group_new(
             toxes[0], TOX_GROUP_PRIVACY_STATE_PRIVATE,
-            (const uint8_t *)"my cool group", strlen("my cool group"), &err_new);
+            (const uint8_t *)TEST_GROUP_NAME, strlen(TEST_GROUP_NAME), (const uint8_t *)PEER1_NICK, strlen(PEER1_NICK), &err_new);
     ck_assert(err_new == TOX_ERR_GROUP_NEW_OK);
 
     // tox0 invites tox1
@@ -97,7 +138,8 @@ static void group_message_test(Tox **toxes, State *state)
 
         if (state[1].peer_joined && !state[1].message_sent) {
             TOX_ERR_GROUP_SEND_MESSAGE err_send;
-            tox_group_send_message(toxes[1], group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)"hello", 6, &err_send);
+            tox_group_send_message(toxes[1], group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)TEST_MESSAGE,
+                                   strlen(TEST_MESSAGE), &err_send);
             ck_assert(err_send == TOX_ERR_GROUP_SEND_MESSAGE_OK);
             state[1].message_sent = true;
         }
@@ -112,6 +154,11 @@ static void group_message_test(Tox **toxes, State *state)
     }
 }
 
+#undef PEER1_NICK
+#undef PEER0_NICK
+#undef TEST_GROUP_NAME
+#undef TEST_MESSAGE
+
 int main(void)
 {
     setvbuf(stdout, nullptr, _IONBF, 0);