Archives
/
lokinet
mirror of https://github.com/oxen-io/lokinet
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2080 from oxen-io/dev

Browse Source 
0.9.11 release
stable v0.9.11
Jason Rhinelander 1 year ago committed by GitHub
parent 1e5e34bd24 8959e84595
commit 81a61f3d03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 247 additions and 113 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape Escape View File

@ -25,7 +25,7 @@ endif()
project(lokinet
VERSION 0.9.10
VERSION 0.9.11
DESCRIPTION "lokinet - IP packet onion router"
LANGUAGES ${LANGS})

12
cmake/StaticBuild.cmake
Unescape Escape View File

@ -11,12 +11,12 @@ set(OPENSSL_SOURCE openssl-${OPENSSL_VERSION}.tar.gz)
set(OPENSSL_HASH SHA256=83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
CACHE STRING "openssl source hash")
set(EXPAT_VERSION 2.4.9 CACHE STRING "expat version")
set(EXPAT_VERSION 2.5.0 CACHE STRING "expat version")
string(REPLACE "." "_" EXPAT_TAG "R_${EXPAT_VERSION}")
set(EXPAT_MIRROR ${LOCAL_MIRROR} https://github.com/libexpat/libexpat/releases/download/${EXPAT_TAG}
CACHE STRING "expat download mirror(s)")
set(EXPAT_SOURCE expat-${EXPAT_VERSION}.tar.xz)
set(EXPAT_HASH SHA512=8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169
set(EXPAT_HASH SHA512=2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
CACHE STRING "expat source hash")
set(UNBOUND_VERSION 1.17.0 CACHE STRING "unbound version")
@ -25,11 +25,11 @@ set(UNBOUND_SOURCE unbound-${UNBOUND_VERSION}.tar.gz)
set(UNBOUND_HASH SHA512=f6b9f279330fb19b5feca09524959940aad8c4e064528aa82b369c726d77e9e8e5ca23f366f6e9edcf2c061b96f482ed7a2c26ac70fc15ae5762b3d7e36a5284
CACHE STRING "unbound source hash")
set(SQLITE3_VERSION 3390400 CACHE STRING "sqlite3 version")
set(SQLITE3_VERSION 3400000 CACHE STRING "sqlite3 version")
set(SQLITE3_MIRROR ${LOCAL_MIRROR} https://www.sqlite.org/2022
CACHE STRING "sqlite3 download mirror(s)")
set(SQLITE3_SOURCE sqlite-autoconf-${SQLITE3_VERSION}.tar.gz)
set(SQLITE3_HASH SHA3_256=431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090
set(SQLITE3_HASH SHA3_256=7ee8f02b21edb4489df5082b5cf5b7ef47bcebcdb0e209bf14240db69633c878
CACHE STRING "sqlite3 source hash")
set(SODIUM_VERSION 1.0.18 CACHE STRING "libsodium version")
@ -62,11 +62,11 @@ set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.xz)
set(ZLIB_HASH SHA256=d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
CACHE STRING "zlib source hash")
set(CURL_VERSION 7.85.0 CACHE STRING "curl version")
set(CURL_VERSION 7.86.0 CACHE STRING "curl version")
set(CURL_MIRROR ${LOCAL_MIRROR} https://curl.haxx.se/download https://curl.askapache.com
CACHE STRING "curl mirror(s)")
set(CURL_SOURCE curl-${CURL_VERSION}.tar.xz)
set(CURL_HASH SHA512=b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd
set(CURL_HASH SHA512=18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656
CACHE STRING "curl source hash")
include(ExternalProject)

2
external/oxen-encoding vendored

@ -1 +1 @@
Subproject commit 707a83609fb64d09b61ed1e56c82bf692050d2a1
Subproject commit a869ae2b0152ad70855e3774a425c39a25ae1ca6

2
gui

@ -1 +1 @@
Subproject commit 37f274e86fea7fe0fcc472727398d118a6917854
Subproject commit 1545d5479eb0db2df96db08b52bf76503eabf0ee

1
llarp/config/config.cpp
Unescape Escape View File

@ -1179,6 +1179,7 @@ namespace llarp
"lokid",
"rpc",
RelayOnly,
Required,
Comment{
"oxenmq control address for for communicating with oxend. Depends on oxend's",
"lmq-local-control configuration option. By default this value should be",

23
llarp/config/definition.cpp
Unescape Escape View File

@ -152,10 +152,8 @@ namespace llarp
const std::string& section, std::vector<std::string> comments)
{
auto& sectionComments = m_sectionComments[section];
for (size_t i = 0; i < comments.size(); ++i)
{
sectionComments.emplace_back(std::move(comments[i]));
}
for (auto& c : comments)
sectionComments.emplace_back(std::move(c));
}
void
@ -198,13 +196,22 @@ namespace llarp
if (useValues and def->getNumberFound() > 0)
{
for (const auto& val : def->valuesAsString())
fmt::format_to(sect_append, "\n{}={}\n", name, val);
fmt::format_to(sect_append, "\n{}={}", name, val);
*sect_append = '\n';
}
else if (not(def->hidden and not has_comment))
else if (not def->hidden)
{
for (const auto& val : def->defaultValuesAsString())
fmt::format_to(sect_append, "\n{}{}={}\n", def->required ? "" : "#", name, val);
if (auto defaults = def->defaultValuesAsString(); not defaults.empty())
for (const auto& val : defaults)
fmt::format_to(sect_append, "\n{}{}={}", def->required ? "" : "#", name, val);
else
// We have no defaults so we append it as "#opt-name=" so that we show the option name,
// and make it simple to uncomment and edit to the desired value.
fmt::format_to(sect_append, "\n#{}=", name);
*sect_append = '\n';
}
else if (has_comment)
*sect_append = '\n';
});
if (sect_str.empty())

10
llarp/config/definition.hpp
Unescape Escape View File

@ -202,6 +202,16 @@ namespace llarp
OptionDefinition(std::string section_, std::string name_, Options&&... opts)
: OptionDefinitionBase(section_, name_, opts...)
{
constexpr bool has_default =
((config::is_default_array<Options> || config::is_default<Options>) || ...);
constexpr bool has_required =
(std::is_same_v<config::remove_cvref_t<Options>, config::Required_t> || ...);
constexpr bool has_hidden =
(std::is_same_v<config::remove_cvref_t<Options>, config::Hidden_t> || ...);
static_assert(
not(has_default and has_required), "Default{...} and Required are mutually exclusive");
static_assert(not(has_hidden and has_required), "Hidden and Required are mutually exclusive");
(extractDefault(std::forward<Options>(opts)), ...);
(extractAcceptor(std::forward<Options>(opts)), ...);
(extractComments(std::forward<Options>(opts)), ...);

58
llarp/dns/server.cpp
Unescape Escape View File

@ -146,6 +146,7 @@ namespace llarp::dns
static void
Callback(void* data, int err, ub_result* _result)
{
log::debug(logcat, "got dns response from libunbound");
// take ownership of ub_result
std::unique_ptr<ub_result, ub_result_deleter> result{_result};
// borrow query
@ -158,6 +159,8 @@ namespace llarp::dns
return;
}
log::trace(logcat, "queueing dns response from libunbound to userland");
// rewrite response
OwnedBuffer pkt{(const byte_t*)result->answer_packet, (size_t)result->answer_len};
llarp_buffer_t buf{pkt};
@ -452,20 +455,6 @@ namespace llarp::dns
Up(m_conf);
}
bool
WouldLoop(const SockAddr& to, const SockAddr& from) const override
{
#if defined(ANDROID)
(void)to;
(void)from;
return false;
#else
const auto& vec = m_conf.m_upstreamDNS;
return std::find(vec.begin(), vec.end(), to) != std::end(vec)
or std::find(vec.begin(), vec.end(), from) != std::end(vec);
#endif
}
template <typename Callable>
void
call(Callable&& f)
@ -483,13 +472,15 @@ namespace llarp::dns
const SockAddr& to,
const SockAddr& from) override
{
if (WouldLoop(to, from))
return false;
auto tmp = std::make_shared<Query>(weak_from_this(), query, source, to, from);
// no questions, send fail
if (query.questions.empty())
{
log::info(
logcat,
"dns from {} to {} has empty query questions, sending failure reply",
from,
to);
tmp->Cancel();
return true;
}
@ -499,6 +490,12 @@ namespace llarp::dns
// dont process .loki or .snode
if (q.HasTLD(".loki") or q.HasTLD(".snode"))
{
log::warning(
logcat,
"dns from {} to {} is for .loki or .snode but got to the unbound resolver, sending "
"failure reply",
from,
to);
tmp->Cancel();
return true;
}
@ -506,6 +503,12 @@ namespace llarp::dns
if (not m_ctx)
{
// we are down
log::debug(
logcat,
"dns from {} to {} got to the unbound resolver, but the resolver isn't set up, "
"sending failure reply",
from,
to);
tmp->Cancel();
return true;
}
@ -514,6 +517,12 @@ namespace llarp::dns
if (not running)
{
// we are stopping the win32 thread
log::debug(
logcat,
"dns from {} to {} got to the unbound resolver, but the resolver isn't running, "
"sending failure reply",
from,
to);
tmp->Cancel();
return true;
}
@ -533,7 +542,10 @@ namespace llarp::dns
tmp->Cancel();
}
else
{
log::trace(logcat, "dns from {} to {} processing via libunbound", from, to);
m_Pending.insert(std::move(tmp));
}
return true;
}
@ -549,6 +561,12 @@ namespace llarp::dns
{
parent_ptr->call(
[self = shared_from_this(), parent_ptr = std::move(parent_ptr), buf = replyBuf.copy()] {
log::trace(
logcat,
"forwarding dns response from libunbound to userland (resolverAddr: {}, "
"askerAddr: {})",
self->resolverAddr,
self->askerAddr);
self->src->SendTo(self->askerAddr, self->resolverAddr, OwnedBuffer::copy_from(buf));
// remove query
parent_ptr->RemovePending(self);
@ -742,10 +760,14 @@ namespace llarp::dns
{
if (auto res_ptr = resolver.lock())
{
log::debug(
log::trace(
logcat, "check resolver {} for dns from {} to {}", res_ptr->ResolverName(), from, to);
if (res_ptr->MaybeHookDNS(ptr, msg, to, from))
{
log::trace(
logcat, "resolver {} handling dns from {} to {}", res_ptr->ResolverName(), from, to);
return true;
}
}
}
return false;

10
llarp/dns/server.hpp
Unescape Escape View File

@ -197,16 +197,6 @@ namespace llarp::dns
const Message& query,
const SockAddr& to,
const SockAddr& from) = 0;
/// Returns true if a packet with to and from addresses is something that would cause a
/// resolution loop and thus should not be used on this resolver
virtual bool
WouldLoop(const SockAddr& to, const SockAddr& from) const
{
(void)to;
(void)from;
return false;
}
};
// Base class for DNS proxy

4
llarp/router_contact.cpp
Unescape Escape View File

@ -534,7 +534,9 @@ namespace llarp
}
static constexpr std::array obsolete_bootstraps = {
"7a16ac0b85290bcf69b2f3b52456d7e989ac8913b4afbb980614e249a3723218"sv};
"7a16ac0b85290bcf69b2f3b52456d7e989ac8913b4afbb980614e249a3723218"sv,
"e6b3a6fe5e32c379b64212c72232d65b0b88ddf9bbaed4997409d329f8519e0b"sv,
};
bool
RouterContact::IsObsoleteBootstrap() const

108
llarp/win32/windivert.cpp
Unescape Escape View File

@ -12,6 +12,94 @@ extern "C"
#include <windivert.h>
}
namespace
{
using namespace oxen::log::literals;
std::string
windivert_addr_to_string(const WINDIVERT_ADDRESS& addr)
{
std::string layer_str{};
std::string ifidx_str{};
switch (addr.Layer)
{
case WINDIVERT_LAYER_NETWORK:
layer_str = "WINDIVERT_LAYER_NETWORK";
ifidx_str =
"Network: [IfIdx: {}, SubIfIdx: {}]"_format(addr.Network.IfIdx, addr.Network.SubIfIdx);
break;
case WINDIVERT_LAYER_NETWORK_FORWARD:
layer_str = "WINDIVERT_LAYER_NETWORK_FORWARD";
break;
case WINDIVERT_LAYER_FLOW:
layer_str = "WINDIVERT_LAYER_FLOW";
break;
case WINDIVERT_LAYER_SOCKET:
layer_str = "WINDIVERT_LAYER_SOCKET";
break;
case WINDIVERT_LAYER_REFLECT:
layer_str = "WINDIVERT_LAYER_REFLECT";
break;
default:
layer_str = "unknown";
}
std::string event_str{};
switch (addr.Event)
{
case WINDIVERT_EVENT_NETWORK_PACKET:
event_str = "WINDIVERT_EVENT_NETWORK_PACKET";
break;
case WINDIVERT_EVENT_FLOW_ESTABLISHED:
event_str = "WINDIVERT_EVENT_FLOW_ESTABLISHED";
break;
case WINDIVERT_EVENT_FLOW_DELETED:
event_str = "WINDIVERT_EVENT_FLOW_DELETED";
break;
case WINDIVERT_EVENT_SOCKET_BIND:
event_str = "WINDIVERT_EVENT_SOCKET_BIND";
break;
case WINDIVERT_EVENT_SOCKET_CONNECT:
event_str = "WINDIVERT_EVENT_SOCKET_CONNECT";
break;
case WINDIVERT_EVENT_SOCKET_LISTEN:
event_str = "WINDIVERT_EVENT_SOCKET_LISTEN";
break;
case WINDIVERT_EVENT_SOCKET_ACCEPT:
event_str = "WINDIVERT_EVENT_SOCKET_ACCEPT";
break;
case WINDIVERT_EVENT_SOCKET_CLOSE:
event_str = "WINDIVERT_EVENT_SOCKET_CLOSE";
break;
case WINDIVERT_EVENT_REFLECT_OPEN:
event_str = "WINDIVERT_EVENT_REFLECT_OPEN";
break;
case WINDIVERT_EVENT_REFLECT_CLOSE:
event_str = "WINDIVERT_EVENT_REFLECT_CLOSE";
break;
default:
event_str = "unknown";
}
return fmt::format(
"Windivert WINDIVERT_ADDRESS -- Timestamp: {}, Layer: {}, Event: {}, Sniffed: {}, "
"Outbound: {}, Loopback: {}, Imposter: {}, IPv6: {}, IPChecksum: {}, TCPChecksum: {}, "
"UDPChecksum: {}, {}",
addr.Timestamp,
layer_str,
event_str,
addr.Sniffed ? "true" : "false",
addr.Outbound ? "true" : "false",
addr.Loopback ? "true" : "false",
addr.Impostor ? "true" : "false",
addr.IPv6 ? "true" : "false",
addr.IPChecksum ? "true" : "false",
addr.TCPChecksum ? "true" : "false",
addr.UDPChecksum ? "true" : "false",
ifidx_str);
}
} // namespace
namespace llarp::win32
{
static auto logcat = log::Cat("windivert");
@ -23,6 +111,7 @@ namespace llarp::win32
decltype(::WinDivertOpen)* open = nullptr;
decltype(::WinDivertClose)* close = nullptr;
decltype(::WinDivertShutdown)* shutdown = nullptr;
decltype(::WinDivertHelperCalcChecksums)* calc_checksum = nullptr;
decltype(::WinDivertSend)* send = nullptr;
decltype(::WinDivertRecv)* recv = nullptr;
decltype(::WinDivertHelperFormatIPv4Address)* format_ip4 = nullptr;
@ -41,6 +130,7 @@ namespace llarp::win32
"WinDivertOpen", open,
"WinDivertClose", close,
"WinDivertShutdown", shutdown,
"WinDivertHelperCalcChecksums", calc_checksum,
"WinDivertSend", send,
"WinDivertRecv", recv,
"WinDivertHelperFormatIPv4Address", format_ip4,
@ -106,18 +196,28 @@ namespace llarp::win32
throw win32::error{
err, fmt::format("failed to receive packet from windivert (code={})", err)};
}
log::trace(logcat, "got packet of size {}B", sz);
pkt.resize(sz);
log::trace(logcat, "got packet of size {}B", sz);
log::trace(logcat, "{}", windivert_addr_to_string(addr));
return Packet{std::move(pkt), std::move(addr)};
}
void
send_packet(const Packet& w_pkt) const
send_packet(Packet w_pkt) const
{
const auto& pkt = w_pkt.pkt;
const auto* addr = &w_pkt.addr;
auto& pkt = w_pkt.pkt;
auto* addr = &w_pkt.addr;
addr->Outbound = !addr->Outbound; // re-used from recv, so invert direction
log::trace(logcat, "send dns packet of size {}B", pkt.size());
log::trace(logcat, "{}", windivert_addr_to_string(w_pkt.addr));
UINT sz{};
// recalc IP packet checksum in case it needs it
wd::calc_checksum(pkt.data(), pkt.size(), addr, 0);
if (!wd::send(m_Handle, pkt.data(), pkt.size(), &sz, addr))
throw win32::error{"windivert send failed"};
}

11
test/config/test_llarp_config_definition.cpp
Unescape Escape View File

@ -104,7 +104,7 @@ TEST_CASE("OptionDefinition acceptor throws test", "[config]")
TEST_CASE("OptionDefinition tryAccept missing option test", "[config]")
{
int unset = -1;
llarp::OptionDefinition<int> def("foo", "bar", Required, Default{1}, [&](int arg) {
llarp::OptionDefinition<int> def("foo", "bar", Required, [&](int arg) {
(void)arg;
unset = 0; // should never be called
});
@ -170,7 +170,6 @@ TEST_CASE("ConfigDefinition required test", "[config]")
config.defineOption(std::make_unique<llarp::OptionDefinition<int>>(
"router",
"threads",
Default{1},
Required));
CHECK_THROWS(config.validateRequiredFields());
@ -186,13 +185,13 @@ TEST_CASE("ConfigDefinition section test", "[config]")
config.defineOption(std::make_unique<llarp::OptionDefinition<int>>(
"foo",
"bar",
Required,
Default{1}));
Required
));
config.defineOption(std::make_unique<llarp::OptionDefinition<int>>(
"goo",
"bar",
Required,
Default{1}));
Required
));
CHECK_THROWS(config.validateRequiredFields());

68
test/config/test_llarp_config_output.cpp
Unescape Escape View File

@ -8,37 +8,37 @@ TEST_CASE("ConfigDefinition simple generate test", "[config]")
{
llarp::ConfigDefinition config{true};
config.defineOption<int>("foo", "bar", Required, Default{1});
config.defineOption<int>("foo", "bar", Required);
config.defineOption<int>("foo", "baz", Default{2});
config.defineOption(std::make_unique<llarp::OptionDefinition<std::string>>(
"foo", "quux", Required, Default{"hello"}));
config.defineOption(
std::make_unique<llarp::OptionDefinition<std::string>>("foo", "quux", Default{"hello"}));
config.defineOption<int>("argle", "bar", RelayOnly, Required, Default{3});
config.defineOption<int>("argle", "bar", RelayOnly, Required);
config.defineOption<int>("argle", "baz", Default{4});
config.defineOption<std::string>("argle", "quux", Required, Default{"the quick brown fox"});
config.defineOption<std::string>("argle", "quux", Default{"the quick brown fox"});
config.defineOption<int>("not", "for-routers", ClientOnly, Required, Default{1});
config.defineOption<int>("not", "for-routers", ClientOnly, Default{1});
std::string output = config.generateINIConfig();
CHECK(output == R"raw([foo]
bar=1
#bar=
#baz=2
quux=hello
#quux=hello
[argle]
bar=3
#bar=
#baz=4
quux=the quick brown fox
#quux=the quick brown fox
)raw");
}
@ -46,16 +46,24 @@ TEST_CASE("ConfigDefinition useValue test", "[config]")
{
llarp::ConfigDefinition config{true};
config.defineOption<int>("foo", "bar", Required, Default{1});
config.defineOption<int>("foo", "bar", Default{1});
constexpr auto expected = "[foo]\n\n\nbar=1\n";
constexpr auto expected = R"raw([foo]
#bar=1
)raw";
CHECK(config.generateINIConfig(false) == expected);
CHECK(config.generateINIConfig(true) == expected);
config.addConfigValue("foo", "bar", "2");
constexpr auto expectedWhenValueProvided = "[foo]\n\n\nbar=2\n";
constexpr auto expectedWhenValueProvided = R"raw([foo]
bar=2
)raw";
CHECK(config.generateINIConfig(false) == expected);
CHECK(config.generateINIConfig(true) == expectedWhenValueProvided);
@ -67,8 +75,7 @@ TEST_CASE("ConfigDefinition section comments test")
config.addSectionComments("foo", {"test comment"});
config.addSectionComments("foo", {"test comment 2"});
config.defineOption(std::make_unique<llarp::OptionDefinition<int>>(
"foo", "bar", Required, Default{1}));
config.defineOption(std::make_unique<llarp::OptionDefinition<int>>("foo", "bar", Default{1}));
std::string output = config.generateINIConfig();
@ -77,7 +84,7 @@ TEST_CASE("ConfigDefinition section comments test")
# test comment 2
bar=1
#bar=1
)raw");
}
@ -87,18 +94,21 @@ TEST_CASE("ConfigDefinition option comments test")
config.addOptionComments("foo", "bar", {"test comment 1"});
config.addOptionComments("foo", "bar", {"test comment 2"});
config.defineOption<int>("foo", "bar", Required, Default{1});
config.defineOption<int>("foo", "bar", Default{1});
config.defineOption<std::string>("foo", "far", Default{"abc"},
config.defineOption<std::string>(
"foo",
"far",
Default{"abc"},
Comment{
"Fill in the missing values:",
"___defg",
"Fill in the missing values:",
"___defg",
});
config.defineOption<int>("client", "omg", ClientOnly, Default{1}, Comment{"hi"});
config.defineOption<int>("relay", "ftw", RelayOnly, Default{1}, Comment{"bye"});
// has comment, so still gets shown.
// has comment, but is hidden: we show only the comment but not the value/default.
config.defineOption<int>("foo", "old-bar", Hidden, Default{456});
config.addOptionComments("foo", "old-bar", {"old bar option"});
@ -112,14 +122,13 @@ TEST_CASE("ConfigDefinition option comments test")
# test comment 1
# test comment 2
bar=1
#bar=1
# Fill in the missing values:
# ___defg
#far=abc
# old bar option
#old-bar=456
[relay]
@ -139,7 +148,7 @@ TEST_CASE("ConfigDefinition empty comments test")
config.addOptionComments("foo", "bar", {"option comment"});
config.addOptionComments("foo", "bar", {""});
config.defineOption<int>("foo", "bar", Required, Default{1});
config.defineOption<int>("foo", "bar", Default{1});
std::string output = config.generateINIConfig();
@ -150,7 +159,7 @@ TEST_CASE("ConfigDefinition empty comments test")
# option comment
#
bar=1
#bar=1
)raw");
}
@ -161,10 +170,10 @@ TEST_CASE("ConfigDefinition multi option comments")
config.addSectionComments("foo", {"foo section comment"});
config.addOptionComments("foo", "bar", {"foo bar option comment"});
config.defineOption<int>("foo", "bar", Required, Default{1});
config.defineOption<int>("foo", "bar", Default{1});
config.addOptionComments("foo", "baz", {"foo baz option comment"});
config.defineOption<int>("foo", "baz", Required, Default{1});
config.defineOption<int>("foo", "baz", Default{1});
std::string output = config.generateINIConfig();
@ -173,10 +182,9 @@ TEST_CASE("ConfigDefinition multi option comments")
# foo bar option comment
bar=1
#bar=1
# foo baz option comment
baz=1
#baz=1
)raw");
}

49
test/config/test_llarp_config_values.cpp
Unescape Escape View File

@ -75,6 +75,8 @@ run_config_test(mocks::Network env, std::string_view ini_str)
throw std::runtime_error{"non zero return"};
}
const std::string ini_minimal = "[lokid]\nrpc=ipc://dummy\n";
TEST_CASE("service node bind section on valid network", "[config]")
{
std::unordered_multimap<std::string, llarp::IPRange> env{
@ -92,15 +94,14 @@ TEST_CASE("service node bind section on valid network", "[config]")
REQUIRE(not mock_net.IsBogon(*maybe_addr));
}
SECTION("empty config")
SECTION("minimal config")
{
std::string_view ini_str = "";
REQUIRE_NOTHROW(run_config_test(env, ini_str));
REQUIRE_NOTHROW(run_config_test(env, ini_minimal));
}
SECTION("explicit bind via ifname")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
mock0=443
)";
@ -108,7 +109,7 @@ mock0=443
}
SECTION("explicit bind via ip address")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
inbound=1.1.1.1:443
)";
@ -116,7 +117,7 @@ inbound=1.1.1.1:443
}
SECTION("explicit bind via ip address with old syntax")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
1.1.1.1=443
)";
@ -125,7 +126,7 @@ inbound=1.1.1.1:443
}
SECTION("ip spoof fails")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=8.8.8.8
public-port=443
@ -136,7 +137,7 @@ inbound=1.1.1.1:443
}
SECTION("explicit bind via ifname but fails from non existing ifname")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
ligma0=443
)";
@ -145,7 +146,7 @@ ligma0=443
SECTION("explicit bind via ifname but fails from using loopback")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
lo=443
)";
@ -154,7 +155,7 @@ lo=443
SECTION("explicit bind via explicit loopback")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
inbound=127.0.0.1:443
)";
@ -162,7 +163,7 @@ inbound=127.0.0.1:443
}
SECTION("public ip provided but no bind section")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -171,7 +172,7 @@ public-port=443
}
SECTION("public ip provided with ip in bind section")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -196,7 +197,7 @@ TEST_CASE("service node bind section on nat network", "[config]")
SECTION("public ip provided via inbound directive")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -209,7 +210,7 @@ inbound=10.1.1.1:443
SECTION("public ip provided with bind via ifname")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -222,7 +223,7 @@ mock0=443
SECTION("public ip provided bind via wildcard ip")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -232,7 +233,6 @@ inbound=0.0.0.0:443
)";
REQUIRE_THROWS(run_config_test(env, ini_str));
}
}
TEST_CASE("service node bind section with multiple public ip", "[config]")
@ -242,14 +242,9 @@ TEST_CASE("service node bind section with multiple public ip", "[config]")
{"mock0", llarp::IPRange::FromIPv4(2, 1, 1, 1, 32)},
{"lo", llarp::IPRange::FromIPv4(127, 0, 0, 1, 8)},
};
SECTION("empty config")
{
std::string_view ini_str = "";
REQUIRE_NOTHROW(run_config_test(env, ini_str));
}
SECTION("with old style wildcard for inbound and no public ip, fails")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
0.0.0.0=443
)";
@ -257,7 +252,7 @@ TEST_CASE("service node bind section with multiple public ip", "[config]")
}
SECTION("with old style wildcard for outbound")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
*=1443
)";
@ -265,7 +260,7 @@ TEST_CASE("service node bind section with multiple public ip", "[config]")
}
SECTION("with wildcard via inbound directive no public ip given, fails")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
inbound=0.0.0.0:443
)";
@ -274,7 +269,7 @@ inbound=0.0.0.0:443
}
SECTION("with wildcard via inbound directive primary public ip given")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=1.1.1.1
public-port=443
@ -286,7 +281,7 @@ inbound=0.0.0.0:443
}
SECTION("with wildcard via inbound directive secondary public ip given")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[router]
public-ip=2.1.1.1
public-port=443
@ -298,7 +293,7 @@ inbound=0.0.0.0:443
}
SECTION("with bind via interface name")
{
std::string_view ini_str = R"(
auto ini_str = ini_minimal + R"(
[bind]
mock0=443
)";

Write Preview
Loading…
Cancel
Save