forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -1,15 +1,20 @@
|
||||
// clang-format off
|
||||
#include "../testing/support/public/simulated_environment.hh"
|
||||
#include "ping_array.h"
|
||||
// clang-format on
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "crypto_core_test_util.hh"
|
||||
#include "mem_test_util.hh"
|
||||
#include "mono_time.h"
|
||||
|
||||
namespace {
|
||||
|
||||
using tox::test::SimulatedEnvironment;
|
||||
|
||||
struct Ping_Array_Deleter {
|
||||
void operator()(Ping_Array *arr) { ping_array_kill(arr); }
|
||||
};
|
||||
@@ -17,59 +22,63 @@ struct Ping_Array_Deleter {
|
||||
using Ping_Array_Ptr = std::unique_ptr<Ping_Array, Ping_Array_Deleter>;
|
||||
|
||||
struct Mono_Time_Deleter {
|
||||
Mono_Time_Deleter(const Test_Memory &mem)
|
||||
Mono_Time_Deleter(Tox_Memory mem)
|
||||
: mem_(mem)
|
||||
{
|
||||
}
|
||||
void operator()(Mono_Time *arr) { mono_time_free(mem_, arr); }
|
||||
void operator()(Mono_Time *arr) { mono_time_free(&mem_, arr); }
|
||||
|
||||
private:
|
||||
const Test_Memory &mem_;
|
||||
Tox_Memory mem_;
|
||||
};
|
||||
|
||||
using Mono_Time_Ptr = std::unique_ptr<Mono_Time, Mono_Time_Deleter>;
|
||||
|
||||
TEST(PingArray, MinimumTimeoutIsOne)
|
||||
{
|
||||
Test_Memory mem;
|
||||
EXPECT_EQ(ping_array_new(mem, 1, 0), nullptr);
|
||||
EXPECT_NE(Ping_Array_Ptr(ping_array_new(mem, 1, 1)), nullptr);
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
EXPECT_EQ(ping_array_new(&c_mem, 1, 0), nullptr);
|
||||
EXPECT_NE(Ping_Array_Ptr(ping_array_new(&c_mem, 1, 1)), nullptr);
|
||||
}
|
||||
|
||||
TEST(PingArray, MinimumArraySizeIsOne)
|
||||
{
|
||||
Test_Memory mem;
|
||||
EXPECT_EQ(ping_array_new(mem, 0, 1), nullptr);
|
||||
EXPECT_NE(Ping_Array_Ptr(ping_array_new(mem, 1, 1)), nullptr);
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
EXPECT_EQ(ping_array_new(&c_mem, 0, 1), nullptr);
|
||||
EXPECT_NE(Ping_Array_Ptr(ping_array_new(&c_mem, 1, 1)), nullptr);
|
||||
}
|
||||
|
||||
TEST(PingArray, ArraySizeMustBePowerOfTwo)
|
||||
{
|
||||
Test_Memory mem;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
|
||||
Ping_Array_Ptr arr;
|
||||
arr.reset(ping_array_new(mem, 2, 1));
|
||||
arr.reset(ping_array_new(&c_mem, 2, 1));
|
||||
EXPECT_NE(arr, nullptr);
|
||||
arr.reset(ping_array_new(mem, 4, 1));
|
||||
arr.reset(ping_array_new(&c_mem, 4, 1));
|
||||
EXPECT_NE(arr, nullptr);
|
||||
arr.reset(ping_array_new(mem, 1024, 1));
|
||||
arr.reset(ping_array_new(&c_mem, 1024, 1));
|
||||
EXPECT_NE(arr, nullptr);
|
||||
|
||||
EXPECT_EQ(ping_array_new(mem, 1023, 1), nullptr);
|
||||
EXPECT_EQ(ping_array_new(mem, 1234, 1), nullptr);
|
||||
EXPECT_EQ(ping_array_new(&c_mem, 1023, 1), nullptr);
|
||||
EXPECT_EQ(ping_array_new(&c_mem, 1234, 1), nullptr);
|
||||
}
|
||||
|
||||
TEST(PingArray, StoredDataCanBeRetrieved)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint64_t const ping_id = ping_array_add(
|
||||
arr.get(), mono_time.get(), rng, std::vector<uint8_t>{1, 2, 3, 4}.data(), 4);
|
||||
arr.get(), mono_time.get(), &c_rng, std::vector<uint8_t>{1, 2, 3, 4}.data(), 4);
|
||||
EXPECT_NE(ping_id, 0);
|
||||
|
||||
std::vector<uint8_t> data(4);
|
||||
@@ -79,15 +88,16 @@ TEST(PingArray, StoredDataCanBeRetrieved)
|
||||
|
||||
TEST(PingArray, RetrievingDataWithTooSmallOutputBufferHasNoEffect)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint64_t const ping_id = ping_array_add(
|
||||
arr.get(), mono_time.get(), rng, (std::vector<uint8_t>{1, 2, 3, 4}).data(), 4);
|
||||
arr.get(), mono_time.get(), &c_rng, (std::vector<uint8_t>{1, 2, 3, 4}).data(), 4);
|
||||
EXPECT_NE(ping_id, 0);
|
||||
|
||||
std::vector<uint8_t> data(4);
|
||||
@@ -101,15 +111,16 @@ TEST(PingArray, RetrievingDataWithTooSmallOutputBufferHasNoEffect)
|
||||
|
||||
TEST(PingArray, ZeroLengthDataCanBeAdded)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint8_t c = 0;
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), rng, &c, sizeof(c));
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), &c_rng, &c, sizeof(c));
|
||||
EXPECT_NE(ping_id, 0);
|
||||
|
||||
EXPECT_EQ(ping_array_check(arr.get(), mono_time.get(), &c, sizeof(c), ping_id), 1);
|
||||
@@ -117,10 +128,11 @@ TEST(PingArray, ZeroLengthDataCanBeAdded)
|
||||
|
||||
TEST(PingArray, PingId0IsInvalid)
|
||||
{
|
||||
Test_Memory mem;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint8_t c = 0;
|
||||
@@ -130,15 +142,16 @@ TEST(PingArray, PingId0IsInvalid)
|
||||
// Protection against replay attacks.
|
||||
TEST(PingArray, DataCanOnlyBeRetrievedOnce)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 2, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint8_t c = 0;
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), rng, &c, sizeof(c));
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), &c_rng, &c, sizeof(c));
|
||||
EXPECT_NE(ping_id, 0);
|
||||
|
||||
EXPECT_EQ(ping_array_check(arr.get(), mono_time.get(), &c, sizeof(c), ping_id), 1);
|
||||
@@ -147,15 +160,16 @@ TEST(PingArray, DataCanOnlyBeRetrievedOnce)
|
||||
|
||||
TEST(PingArray, PingIdMustMatchOnCheck)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Ping_Array_Ptr const arr(ping_array_new(mem, 1, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(mem, nullptr, nullptr), mem);
|
||||
Ping_Array_Ptr const arr(ping_array_new(&c_mem, 1, 1));
|
||||
Mono_Time_Ptr const mono_time(mono_time_new(&c_mem, nullptr, nullptr), c_mem);
|
||||
ASSERT_NE(mono_time, nullptr);
|
||||
|
||||
uint8_t c = 0;
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), rng, &c, sizeof(c));
|
||||
uint64_t const ping_id = ping_array_add(arr.get(), mono_time.get(), &c_rng, &c, sizeof(c));
|
||||
EXPECT_NE(ping_id, 0);
|
||||
|
||||
uint64_t const bad_ping_id = ping_id == 1 ? 2 : 1;
|
||||
|
||||
Reference in New Issue
Block a user