mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-19 09:25:28 +00:00
af6caf776a
* Config file API/comment improvements API improvements: ================= Make the config API use position-independent tag parameters (Required, Default{123}, MultiValue) rather than a sequence of bools with overloads. For example, instead of: conf.defineOption<int>("a", "b", false, true, 123, [] { ... }); you now write: conf.defineOption<int>("a", "b", MultiValue, Default{123}, [] { ... }); The tags are: - Required - MultiValue - Default{value} plus new abilities (see below): - Hidden - RelayOnly - ClientOnly - Comment{"line1", "line2", "line3"} Made option definition more powerful: ===================================== - `Hidden` allows you to define an option that won't show up in the generated config file if it isn't set. - `RelayOnly`/`ClientOnly` sets up an option that is only accepted and only shows up for relay or client configs. (If neither is specified the option shows up in both modes). - `Comment{...}` lets the option comments be specified as part of the defineOption. Comment improvements ==================== - Rewrote comments for various options to expand on details. - Inlined all the comments with the option definitions. - Several options that were missing comments got comments added. - Made various options for deprecated and or internal options hidden by default so that they don't show up in a default config file. - show the section comment (but not option comments) *after* the [section] tag instead of before it as it makes more sense that way (particularly for the [bind] section which has a new long comment to describe how it works). Disable profiling by default ============================ We had this weird state where we use and store profiling by default but never *load* it when starting up. This commit makes us just not use profiling at all unless explicitly enabled. Other misc changes: =================== - change default worker threads to 0 (= num cpus) instead of 1, and fix it to allow 0. - Actually apply worker-threads option - fixed default data-dir value erroneously having quotes around it - reordered ifname/ifaddr/mapaddr (was previously mapaddr/ifaddr/ifname) as mapaddr is a sort of specialization of ifaddr and so makes more sense to come after it (particularly because it now references ifaddr in its help message). - removed peer-stats option (since we always require it for relays and never use it for clients) - removed router profiles filename option (this doesn't need to be configurable) - removed defunct `service-node-seed` option - Change default logging output file to "" (which means stdout), and also made "-" work for stdout. * Router hive compilation fixes * Comments for SNApp SRV settings in ini file * Add extra blank line after section comments * Better deprecated option handling Allow {client,relay}-only options in {relay,client} configs to be specified as implicitly deprecated options: they warn, and don't set anything. Add an explicit `Deprecated` tag and move deprecated option handling into definition.cpp. * Move backwards compat options into section definitions Keep the "addBackwardsCompatibleConfigOptions" only for options in sections that no longer exist. * Fix INI parsing issues & C++17-ify - don't allow inline comments because it seems they aren't allowed in ini formats in general, and is going to cause problems if there is a comment character in a value (e.g. an exit auth string). Additionally it was breaking on a line such as: # some comment; see? because it was treating only `; see?` as the comment and then producing an error message about the rest of the line being invalid. - make section parsing stricter: the `[` and `]` have to be at the beginning at end of the line now (after stripping whitespace). - Move whitespace stripping to the top since everything in here does it. - chop off string_view suffix/prefix rather than maintaining position values - fix potential infinite loop/segfault when given a line such as `]foo[` * Make config parsing failure fatal Load() LogError's and returns false on failure, so we weren't aborting on config file errors. * Formatting: allow `{}` for empty functions/structs Instead of using two lines when empty: { } * Make default dns bind 127.0.0.1 on non-Linux * Don't show empty section; fix tests We can conceivably have sections that only make sense for clients or relays, and so want to completely omit that section if we have no options for the type of config being generated. Also fixes missing empty lines between tests. Co-authored-by: Thomas Winget <tewinget@gmail.com>
509 lines
12 KiB
C++
509 lines
12 KiB
C++
#include <nodedb.hpp>
|
|
|
|
#include <crypto/crypto.hpp>
|
|
#include <crypto/types.hpp>
|
|
#include <router_contact.hpp>
|
|
#include <util/buffer.hpp>
|
|
#include <util/fs.hpp>
|
|
#include <util/logging/logger.hpp>
|
|
#include <util/mem.hpp>
|
|
#include <util/thread/logic.hpp>
|
|
#include <util/str.hpp>
|
|
#include <dht/kademlia.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <fstream>
|
|
#include <unordered_map>
|
|
#include <utility>
|
|
|
|
static const char skiplist_subdirs[] = "0123456789abcdef";
|
|
static const std::string RC_FILE_EXT = ".signed";
|
|
|
|
llarp_nodedb::NetDBEntry::NetDBEntry(llarp::RouterContact value)
|
|
: rc(std::move(value)), inserted(llarp::time_now_ms())
|
|
{}
|
|
|
|
bool
|
|
llarp_nodedb::Remove(const llarp::RouterID& pk)
|
|
{
|
|
bool removed = false;
|
|
RemoveIf([&](const llarp::RouterContact& rc) -> bool {
|
|
if (rc.pubkey == pk)
|
|
{
|
|
removed = true;
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
return removed;
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::Clear()
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
entries.clear();
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::Get(const llarp::RouterID& pk, llarp::RouterContact& result)
|
|
{
|
|
llarp::util::Lock l(access);
|
|
auto itr = entries.find(pk);
|
|
if (itr == entries.end())
|
|
return false;
|
|
result = itr->second.rc;
|
|
return true;
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::RemoveIf(std::function<bool(const llarp::RouterContact& rc)> filter)
|
|
{
|
|
std::set<std::string> files;
|
|
{
|
|
llarp::util::Lock l(access);
|
|
auto itr = entries.begin();
|
|
while (itr != entries.end())
|
|
{
|
|
if (filter(itr->second.rc))
|
|
{
|
|
files.insert(getRCFilePath(itr->second.rc.pubkey));
|
|
itr = entries.erase(itr);
|
|
}
|
|
else
|
|
++itr;
|
|
}
|
|
}
|
|
disk([files = std::move(files)]() {
|
|
for (const auto& file : files)
|
|
fs::remove(file);
|
|
});
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::Has(const llarp::RouterID& pk)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
return entries.find(pk) != entries.end();
|
|
}
|
|
|
|
llarp::RouterContact
|
|
llarp_nodedb::FindClosestTo(const llarp::dht::Key_t& location)
|
|
{
|
|
llarp::RouterContact rc;
|
|
const llarp::dht::XorMetric compare(location);
|
|
visit([&rc, compare](const auto& otherRC) -> bool {
|
|
if (rc.pubkey.IsZero())
|
|
{
|
|
rc = otherRC;
|
|
return true;
|
|
}
|
|
if (compare(
|
|
llarp::dht::Key_t{otherRC.pubkey.as_array()}, llarp::dht::Key_t{rc.pubkey.as_array()}))
|
|
rc = otherRC;
|
|
return true;
|
|
});
|
|
return rc;
|
|
}
|
|
|
|
std::vector<llarp::RouterContact>
|
|
llarp_nodedb::FindClosestTo(const llarp::dht::Key_t& location, uint32_t numRouters)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
std::vector<const llarp::RouterContact*> all;
|
|
|
|
all.reserve(entries.size());
|
|
for (auto& entry : entries)
|
|
{
|
|
all.push_back(&entry.second.rc);
|
|
}
|
|
|
|
auto it_mid = numRouters < all.size() ? all.begin() + numRouters : all.end();
|
|
std::partial_sort(
|
|
all.begin(),
|
|
it_mid,
|
|
all.end(),
|
|
[compare = llarp::dht::XorMetric{location}](auto* a, auto* b) { return compare(*a, *b); });
|
|
|
|
std::vector<llarp::RouterContact> closest;
|
|
closest.reserve(numRouters);
|
|
for (auto it = all.begin(); it != it_mid; ++it)
|
|
closest.push_back(**it);
|
|
|
|
return closest;
|
|
}
|
|
|
|
/// skiplist directory is hex encoded first nibble
|
|
/// skiplist filename is <base32encoded>.snode.signed
|
|
std::string
|
|
llarp_nodedb::getRCFilePath(const llarp::RouterID& pubkey) const
|
|
{
|
|
std::string hexString = lokimq::to_hex(pubkey.begin(), pubkey.end());
|
|
std::string skiplistDir;
|
|
|
|
llarp::RouterID r(pubkey);
|
|
std::string fname = r.ToString();
|
|
|
|
skiplistDir += hexString[0];
|
|
fname += RC_FILE_EXT;
|
|
fs::path filepath = nodePath / skiplistDir / fname;
|
|
return filepath.string();
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::InsertAsync(
|
|
llarp::RouterContact rc,
|
|
std::shared_ptr<llarp::Logic> logic,
|
|
std::function<void(void)> completionHandler)
|
|
{
|
|
disk([this, rc, logic, completionHandler]() {
|
|
this->Insert(rc);
|
|
if (logic && completionHandler)
|
|
{
|
|
LogicCall(logic, completionHandler);
|
|
}
|
|
});
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::UpdateAsyncIfNewer(
|
|
llarp::RouterContact rc,
|
|
std::shared_ptr<llarp::Logic> logic,
|
|
std::function<void(void)> completionHandler)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
auto itr = entries.find(rc.pubkey);
|
|
if (itr == entries.end() || itr->second.rc.OtherIsNewer(rc))
|
|
{
|
|
InsertAsync(rc, logic, completionHandler);
|
|
return true;
|
|
}
|
|
if (itr != entries.end())
|
|
{
|
|
// insertion time is set on...insertion. But it should be updated here
|
|
// even if there is no insertion of a new RC, to show that the existing one
|
|
// is not "stale"
|
|
itr->second.inserted = llarp::time_now_ms();
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/// insert
|
|
bool
|
|
llarp_nodedb::Insert(const llarp::RouterContact& rc)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
auto itr = entries.find(rc.pubkey.as_array());
|
|
if (itr != entries.end())
|
|
entries.erase(itr);
|
|
entries.emplace(rc.pubkey.as_array(), rc);
|
|
LogDebug(
|
|
"Added or updated RC for ",
|
|
llarp::RouterID(rc.pubkey),
|
|
" to nodedb. Current nodedb count is: ",
|
|
entries.size());
|
|
return true;
|
|
}
|
|
|
|
ssize_t
|
|
llarp_nodedb::Load(const fs::path& path)
|
|
{
|
|
std::error_code ec;
|
|
if (!fs::exists(path, ec))
|
|
{
|
|
return -1;
|
|
}
|
|
ssize_t loaded = 0;
|
|
|
|
for (const char& ch : skiplist_subdirs)
|
|
{
|
|
if (!ch)
|
|
continue;
|
|
std::string p;
|
|
p += ch;
|
|
fs::path sub = path / p;
|
|
|
|
ssize_t l = loadSubdir(sub);
|
|
if (l > 0)
|
|
loaded += l;
|
|
}
|
|
m_NextSaveToDisk = llarp::time_now_ms() + m_SaveInterval;
|
|
return loaded;
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::SaveAll()
|
|
{
|
|
std::array<byte_t, MAX_RC_SIZE> tmp;
|
|
llarp::util::Lock lock(access);
|
|
for (const auto& item : entries)
|
|
{
|
|
llarp_buffer_t buf(tmp);
|
|
|
|
if (!item.second.rc.BEncode(&buf))
|
|
continue;
|
|
|
|
buf.sz = buf.cur - buf.base;
|
|
const auto filepath = getRCFilePath(item.second.rc.pubkey);
|
|
auto optional_ofs = llarp::util::OpenFileStream<std::ofstream>(
|
|
filepath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
|
|
if (!optional_ofs)
|
|
continue;
|
|
auto& ofs = *optional_ofs;
|
|
ofs.write((char*)buf.base, buf.sz);
|
|
ofs.flush();
|
|
ofs.close();
|
|
}
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::ShouldSaveToDisk(llarp_time_t now) const
|
|
{
|
|
if (now == 0s)
|
|
now = llarp::time_now_ms();
|
|
return m_NextSaveToDisk > 0s && m_NextSaveToDisk <= now;
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::AsyncFlushToDisk()
|
|
{
|
|
disk([this]() { SaveAll(); });
|
|
m_NextSaveToDisk = llarp::time_now_ms() + m_SaveInterval;
|
|
}
|
|
|
|
ssize_t
|
|
llarp_nodedb::loadSubdir(const fs::path& dir)
|
|
{
|
|
ssize_t sz = 0;
|
|
llarp::util::IterDir(dir, [&](const fs::path& f) -> bool {
|
|
if (fs::is_regular_file(f) && loadfile(f))
|
|
sz++;
|
|
return true;
|
|
});
|
|
return sz;
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::loadfile(const fs::path& fpath)
|
|
{
|
|
if (fpath.extension() != RC_FILE_EXT)
|
|
return false;
|
|
llarp::RouterContact rc;
|
|
if (!rc.Read(fpath))
|
|
{
|
|
llarp::LogError("failed to read file ", fpath);
|
|
return false;
|
|
}
|
|
if (!rc.Verify(llarp::time_now_ms()))
|
|
{
|
|
llarp::LogError(fpath, " contains invalid RC");
|
|
return false;
|
|
}
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
entries.emplace(rc.pubkey.as_array(), rc);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::visit(std::function<bool(const llarp::RouterContact&)> visit)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
auto itr = entries.begin();
|
|
while (itr != entries.end())
|
|
{
|
|
if (!visit(itr->second.rc))
|
|
return;
|
|
++itr;
|
|
}
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::VisitInsertedBefore(
|
|
std::function<void(const llarp::RouterContact&)> visit, llarp_time_t insertedAfter)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
auto itr = entries.begin();
|
|
while (itr != entries.end())
|
|
{
|
|
if (itr->second.inserted < insertedAfter)
|
|
visit(itr->second.rc);
|
|
++itr;
|
|
}
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::RemoveStaleRCs(const std::set<llarp::RouterID>& keep, llarp_time_t cutoff)
|
|
{
|
|
std::set<llarp::RouterID> removeStale;
|
|
// remove stale routers
|
|
VisitInsertedBefore(
|
|
[&](const llarp::RouterContact& rc) {
|
|
if (keep.find(rc.pubkey) != keep.end())
|
|
return;
|
|
LogInfo("removing stale router: ", llarp::RouterID(rc.pubkey));
|
|
removeStale.insert(rc.pubkey);
|
|
},
|
|
cutoff);
|
|
|
|
RemoveIf([&removeStale](const llarp::RouterContact& rc) -> bool {
|
|
return removeStale.count(rc.pubkey) > 0;
|
|
});
|
|
}
|
|
|
|
// write it to disk
|
|
void
|
|
disk_threadworker_setRC(llarp_async_verify_rc* verify_request)
|
|
{
|
|
verify_request->valid = verify_request->nodedb->Insert(verify_request->rc);
|
|
if (verify_request->logic)
|
|
{
|
|
LogicCall(verify_request->logic, [verify_request]() {
|
|
if (verify_request->hook)
|
|
verify_request->hook(verify_request);
|
|
});
|
|
}
|
|
}
|
|
|
|
// we run the crypto verify in the crypto threadpool worker
|
|
void
|
|
crypto_threadworker_verifyrc(llarp_async_verify_rc* verify_request)
|
|
{
|
|
llarp::RouterContact rc = verify_request->rc;
|
|
verify_request->valid = rc.Verify(llarp::time_now_ms());
|
|
// if it's valid we need to set it
|
|
if (verify_request->valid && rc.IsPublicRouter())
|
|
{
|
|
if (verify_request->disk)
|
|
{
|
|
llarp::LogDebug("RC is valid, saving to disk");
|
|
verify_request->disk(std::bind(&disk_threadworker_setRC, verify_request));
|
|
return;
|
|
}
|
|
}
|
|
// callback to logic thread
|
|
LogicCall(verify_request->logic, [verify_request]() {
|
|
if (verify_request->hook)
|
|
verify_request->hook(verify_request);
|
|
});
|
|
}
|
|
|
|
void
|
|
llarp_nodedb_async_verify(struct llarp_async_verify_rc* job)
|
|
{
|
|
job->worker(std::bind(&crypto_threadworker_verifyrc, job));
|
|
}
|
|
|
|
void
|
|
llarp_nodedb::ensure_dir(const fs::path& nodedbDir)
|
|
{
|
|
if (not fs::exists(nodedbDir))
|
|
{
|
|
// if the old 'netdb' directory exists, move it to this one
|
|
fs::path parent = nodedbDir.parent_path();
|
|
fs::path old = parent / "netdb";
|
|
if (fs::exists(old))
|
|
fs::rename(old, nodedbDir);
|
|
else
|
|
fs::create_directory(nodedbDir);
|
|
}
|
|
|
|
if (not fs::is_directory(nodedbDir))
|
|
throw std::runtime_error(llarp::stringify("nodedb ", nodedbDir, " is not a directory"));
|
|
|
|
for (const char& ch : skiplist_subdirs)
|
|
{
|
|
// this seems to be a problem on all targets
|
|
// perhaps cpp17::fs is just as screwed-up
|
|
// attempting to create a folder with no name
|
|
// what does this mean...?
|
|
if (!ch)
|
|
continue;
|
|
|
|
fs::path sub = nodedbDir / std::string(&ch, 1);
|
|
fs::create_directory(sub);
|
|
}
|
|
}
|
|
|
|
ssize_t
|
|
llarp_nodedb::LoadAll()
|
|
{
|
|
return Load(nodePath.c_str());
|
|
}
|
|
|
|
size_t
|
|
llarp_nodedb::num_loaded() const
|
|
{
|
|
std::shared_lock l{access};
|
|
return entries.size();
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::select_random_exit(llarp::RouterContact& result)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
const auto sz = entries.size();
|
|
auto itr = entries.begin();
|
|
if (sz < 3)
|
|
return false;
|
|
auto idx = llarp::randint() % sz;
|
|
if (idx)
|
|
std::advance(itr, idx - 1);
|
|
while (itr != entries.end())
|
|
{
|
|
if (itr->second.rc.IsExit())
|
|
{
|
|
result = itr->second.rc;
|
|
return true;
|
|
}
|
|
++itr;
|
|
}
|
|
// wrap around
|
|
itr = entries.begin();
|
|
while (idx--)
|
|
{
|
|
if (itr->second.rc.IsExit())
|
|
{
|
|
result = itr->second.rc;
|
|
return true;
|
|
}
|
|
++itr;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
llarp_nodedb::select_random_hop_excluding(
|
|
llarp::RouterContact& result, const std::set<llarp::RouterID>& exclude)
|
|
{
|
|
llarp::util::Lock lock(access);
|
|
/// checking for "guard" status for N = 0 is done by caller inside of
|
|
/// pathbuilder's scope
|
|
const size_t sz = entries.size();
|
|
if (sz < 3)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const size_t pos = llarp::randint() % sz;
|
|
const auto start = std::next(entries.begin(), pos);
|
|
for (auto itr = start; itr != entries.end(); ++itr)
|
|
{
|
|
if (exclude.count(itr->first) == 0 and itr->second.rc.IsPublicRouter())
|
|
{
|
|
result = itr->second.rc;
|
|
return true;
|
|
}
|
|
}
|
|
for (auto itr = entries.begin(); itr != start; ++itr)
|
|
{
|
|
if (exclude.count(itr->first) == 0 and itr->second.rc.IsPublicRouter())
|
|
{
|
|
result = itr->second.rc;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|