|
|
|
|
@ -12,407 +12,276 @@
|
|
|
|
|
|
|
|
|
|
namespace llarp
|
|
|
|
|
{
|
|
|
|
|
static auto logcat = log::Cat("RC");
|
|
|
|
|
|
|
|
|
|
NetID&
|
|
|
|
|
NetID::DefaultValue()
|
|
|
|
|
{
|
|
|
|
|
static NetID defaultID(reinterpret_cast<const byte_t*>(llarp::DEFAULT_NETID));
|
|
|
|
|
return defaultID;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool RouterContact::BlockBogons = true;
|
|
|
|
|
// RouterContact::RouterContact(std::string buf)
|
|
|
|
|
// {
|
|
|
|
|
// try
|
|
|
|
|
// {
|
|
|
|
|
// oxenc::bt_list_consumer btlc{buf};
|
|
|
|
|
|
|
|
|
|
/// 1 day rc lifespan
|
|
|
|
|
constexpr auto rc_lifetime = 24h;
|
|
|
|
|
/// an RC inserted long enough ago (4 hrs) is considered stale and is removed
|
|
|
|
|
constexpr auto rc_stale_age = 4h;
|
|
|
|
|
/// window of time in which a router wil try to update their RC before it is marked stale
|
|
|
|
|
constexpr auto rc_update_window = 5min;
|
|
|
|
|
/// update RCs shortly before they are about to expire
|
|
|
|
|
constexpr auto rc_update_interval = rc_stale_age - rc_update_window;
|
|
|
|
|
// // signature.from_string(btlc.consume_string());
|
|
|
|
|
// signed_bt_dict = btlc.consume_string();
|
|
|
|
|
|
|
|
|
|
llarp_time_t RouterContact::Lifetime = rc_lifetime;
|
|
|
|
|
llarp_time_t RouterContact::StaleInsertionAge = rc_stale_age;
|
|
|
|
|
llarp_time_t RouterContact::UpdateInterval = rc_update_interval;
|
|
|
|
|
// // TODO: parse bt dict
|
|
|
|
|
// }
|
|
|
|
|
// catch (...)
|
|
|
|
|
// {
|
|
|
|
|
// log::warning(llarp_cat, "Error: RouterContact failed to populate bt encoded contents!");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
/// how many rc lifetime intervals should we wait until purging an rc
|
|
|
|
|
constexpr auto expiration_lifetime_generations = 10;
|
|
|
|
|
/// the max age of an rc before we want to expire it
|
|
|
|
|
constexpr auto rc_expire_age = rc_lifetime * expiration_lifetime_generations;
|
|
|
|
|
|
|
|
|
|
NetID::NetID(const byte_t* val)
|
|
|
|
|
std::string
|
|
|
|
|
RouterContact::bt_encode() const
|
|
|
|
|
{
|
|
|
|
|
const size_t len = strnlen(reinterpret_cast<const char*>(val), size());
|
|
|
|
|
std::copy(val, val + len, begin());
|
|
|
|
|
oxenc::bt_dict_producer btdp;
|
|
|
|
|
bt_encode(btdp);
|
|
|
|
|
return std::move(btdp).str();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
NetID::NetID() : NetID(DefaultValue().data())
|
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
NetID::operator==(const NetID& other) const
|
|
|
|
|
void
|
|
|
|
|
RouterContact::bt_load(oxenc::bt_dict_consumer& data)
|
|
|
|
|
{
|
|
|
|
|
return ToString() == other.ToString();
|
|
|
|
|
}
|
|
|
|
|
if (int rc_ver = data.require<uint8_t>(""); rc_ver != RC_VERSION)
|
|
|
|
|
throw std::runtime_error{"Invalid RC: do not know how to parse v{} RCs"_format(rc_ver)};
|
|
|
|
|
|
|
|
|
|
std::string
|
|
|
|
|
NetID::ToString() const
|
|
|
|
|
{
|
|
|
|
|
return {begin(), std::find(begin(), end(), '\0')};
|
|
|
|
|
}
|
|
|
|
|
auto ipv4_port = data.require<std::string_view>("4");
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
NetID::BDecode(llarp_buffer_t* buf)
|
|
|
|
|
{
|
|
|
|
|
Zero();
|
|
|
|
|
llarp_buffer_t strbuf;
|
|
|
|
|
if (!bencode_read_string(buf, &strbuf))
|
|
|
|
|
return false;
|
|
|
|
|
if (ipv4_port.size() != 6)
|
|
|
|
|
throw std::runtime_error{
|
|
|
|
|
"Invalid RC address: expected 6-byte IPv4 IP/port, got {}"_format(ipv4_port.size())};
|
|
|
|
|
|
|
|
|
|
if (strbuf.sz > size())
|
|
|
|
|
return false;
|
|
|
|
|
sockaddr_in s4;
|
|
|
|
|
s4.sin_family = AF_INET;
|
|
|
|
|
|
|
|
|
|
std::copy(strbuf.base, strbuf.base + strbuf.sz, begin());
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
std::memcpy(&s4.sin_addr.s_addr, ipv4_port.data(), 4);
|
|
|
|
|
std::memcpy(&s4.sin_port, ipv4_port.data() + 4, 2);
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
NetID::BEncode(llarp_buffer_t* buf) const
|
|
|
|
|
{
|
|
|
|
|
auto term = std::find(begin(), end(), '\0');
|
|
|
|
|
return bencode_write_bytestring(buf, data(), std::distance(begin(), term));
|
|
|
|
|
}
|
|
|
|
|
_addr = oxen::quic::Address{&s4};
|
|
|
|
|
|
|
|
|
|
RouterContact::RouterContact(std::string buf)
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
if (!_addr.is_public())
|
|
|
|
|
throw std::runtime_error{"Invalid RC: IPv4 address is not a publicly routable IP"};
|
|
|
|
|
|
|
|
|
|
if (auto ipv6_port = data.maybe<std::string_view>("6"))
|
|
|
|
|
{
|
|
|
|
|
oxenc::bt_list_consumer btlc{buf};
|
|
|
|
|
if (ipv6_port->size() != 18)
|
|
|
|
|
throw std::runtime_error{
|
|
|
|
|
"Invalid RC address: expected 18-byte IPv6 IP/port, got {}"_format(ipv6_port->size())};
|
|
|
|
|
|
|
|
|
|
sockaddr_in6 s6{};
|
|
|
|
|
s6.sin6_family = AF_INET6;
|
|
|
|
|
|
|
|
|
|
signature.from_string(btlc.consume_string());
|
|
|
|
|
signed_bt_dict = btlc.consume_string();
|
|
|
|
|
std::memcpy(&s6.sin6_addr.s6_addr, ipv6_port->data(), 16);
|
|
|
|
|
std::memcpy(&s6.sin6_port, ipv6_port->data() + 16, 2);
|
|
|
|
|
|
|
|
|
|
// TODO: parse bt dict
|
|
|
|
|
_addr6.emplace(&s6);
|
|
|
|
|
if (!_addr6->is_public())
|
|
|
|
|
throw std::runtime_error{"Invalid RC: IPv6 address is not a publicly routable IP"};
|
|
|
|
|
}
|
|
|
|
|
catch (...)
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log::warning(llarp_cat, "Error: RouterContact failed to populate bt encoded contents!");
|
|
|
|
|
_addr6.reset();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string
|
|
|
|
|
RouterContact::bt_encode() const
|
|
|
|
|
{
|
|
|
|
|
oxenc::bt_list_producer btlp;
|
|
|
|
|
auto netid = data.maybe<std::string_view>("i").value_or(llarp::LOKINET_DEFAULT_NETID);
|
|
|
|
|
if (netid != ACTIVE_NETID)
|
|
|
|
|
throw std::runtime_error{
|
|
|
|
|
"Invalid RC netid: expected {}, got {}; this is an RC for a different network!"_format(
|
|
|
|
|
ACTIVE_NETID, netid)};
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
btlp.append(signature.ToView());
|
|
|
|
|
btlp.append(signed_bt_dict);
|
|
|
|
|
}
|
|
|
|
|
catch (...)
|
|
|
|
|
{
|
|
|
|
|
log::warning(llarp_cat, "Error: RouterContact failed to bt encode contents!");
|
|
|
|
|
}
|
|
|
|
|
auto pk = data.require<std::string_view>("p");
|
|
|
|
|
|
|
|
|
|
return std::move(btlp).str();
|
|
|
|
|
}
|
|
|
|
|
if (pk.size() != RouterID::SIZE)
|
|
|
|
|
throw std::runtime_error{"Invalid RC: router id has invalid size {}"_format(pk.size())};
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
RouterContact::bt_encode_subdict(oxenc::bt_list_producer& btlp) const
|
|
|
|
|
{
|
|
|
|
|
btlp.append(signature.ToView());
|
|
|
|
|
btlp.append(signed_bt_dict);
|
|
|
|
|
}
|
|
|
|
|
std::memcpy(_router_id.data(), pk.data(), RouterID::SIZE);
|
|
|
|
|
|
|
|
|
|
std::string
|
|
|
|
|
RouterContact::ToTXTRecord() const
|
|
|
|
|
{
|
|
|
|
|
std::string result;
|
|
|
|
|
auto out = std::back_inserter(result);
|
|
|
|
|
fmt::format_to(out, "addr={}; pk={}", addr.to_string(), pubkey);
|
|
|
|
|
fmt::format_to(out, "updated={}; onion_pk={}; ", last_updated.count(), enckey.ToHex());
|
|
|
|
|
if (routerVersion.has_value())
|
|
|
|
|
fmt::format_to(out, "router_version={}; ", *routerVersion);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
_timestamp = rc_time{std::chrono::seconds{data.require<int64_t>("t")}};
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::FromOurNetwork() const
|
|
|
|
|
{
|
|
|
|
|
return netID == NetID::DefaultValue();
|
|
|
|
|
}
|
|
|
|
|
auto ver = data.require<ustring_view>("v");
|
|
|
|
|
|
|
|
|
|
std::string
|
|
|
|
|
RouterContact::bencode_signed_section() const
|
|
|
|
|
{
|
|
|
|
|
oxenc::bt_dict_producer btdp;
|
|
|
|
|
if (ver.size() != 3)
|
|
|
|
|
throw std::runtime_error{
|
|
|
|
|
"Invalid RC router version: received {} bytes (!= 3)"_format(ver.size())};
|
|
|
|
|
|
|
|
|
|
btdp.append("a", addr.to_string());
|
|
|
|
|
btdp.append("i", netID.ToView());
|
|
|
|
|
btdp.append("k", pubkey.bt_encode());
|
|
|
|
|
btdp.append("p", enckey.ToView());
|
|
|
|
|
btdp.append("r", routerVersion->ToString());
|
|
|
|
|
for (int i = 0; i < 3; i++)
|
|
|
|
|
_router_version[i] = ver[i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (not srvRecords.empty())
|
|
|
|
|
{
|
|
|
|
|
auto sublist = btdp.append_list("s");
|
|
|
|
|
// std::string
|
|
|
|
|
// RouterContact::bencode_signed_section() const
|
|
|
|
|
// {
|
|
|
|
|
// oxenc::bt_dict_producer btdp;
|
|
|
|
|
|
|
|
|
|
for (auto& s : srvRecords)
|
|
|
|
|
sublist.append(s.bt_encode());
|
|
|
|
|
}
|
|
|
|
|
// btdp.append("4", _addr.to_string());
|
|
|
|
|
|
|
|
|
|
btdp.append("u", last_updated.count());
|
|
|
|
|
// if (_addr6)
|
|
|
|
|
// btdp.append("6", _addr6->to_string());
|
|
|
|
|
|
|
|
|
|
return std::move(btdp).str();
|
|
|
|
|
}
|
|
|
|
|
// if (ACTIVE_NETID != llarp::LOKINET_DEFAULT_NETID)
|
|
|
|
|
// btdp.append("i", ACTIVE_NETID);
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
RouterContact::Clear()
|
|
|
|
|
{
|
|
|
|
|
signature.Zero();
|
|
|
|
|
enckey.Zero();
|
|
|
|
|
pubkey.Zero();
|
|
|
|
|
routerVersion = std::optional<RouterVersion>{};
|
|
|
|
|
last_updated = 0s;
|
|
|
|
|
srvRecords.clear();
|
|
|
|
|
version = llarp::constants::proto_version;
|
|
|
|
|
}
|
|
|
|
|
// btdp.append("p", _router_id.bt_encode());
|
|
|
|
|
// btdp.append("t", _timestamp.time_since_epoch().count());
|
|
|
|
|
// btdp.append("v", _router_version.data());
|
|
|
|
|
|
|
|
|
|
// return std::move(btdp).str();
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
util::StatusObject
|
|
|
|
|
RouterContact::ExtractStatus() const
|
|
|
|
|
RouterContact::extract_status() const
|
|
|
|
|
{
|
|
|
|
|
util::StatusObject obj{
|
|
|
|
|
{"lastUpdated", last_updated.count()},
|
|
|
|
|
{"publicRouter", IsPublicRouter()},
|
|
|
|
|
{"identity", pubkey.ToString()},
|
|
|
|
|
{"address", addr.to_string()}};
|
|
|
|
|
{"lastUpdated", _timestamp.time_since_epoch().count()},
|
|
|
|
|
{"publicRouter", is_public_router()},
|
|
|
|
|
{"identity", _router_id.ToString()},
|
|
|
|
|
{"address", _addr.to_string()}};
|
|
|
|
|
|
|
|
|
|
// if (routerVersion)
|
|
|
|
|
// {
|
|
|
|
|
// obj["routerVersion"] = routerVersion->ToString();
|
|
|
|
|
// }
|
|
|
|
|
// std::vector<util::StatusObject> srv;
|
|
|
|
|
// for (const auto& record : srvRecords)
|
|
|
|
|
// {
|
|
|
|
|
// srv.emplace_back(record.ExtractStatus());
|
|
|
|
|
// }
|
|
|
|
|
// obj["srvRecords"] = srv;
|
|
|
|
|
|
|
|
|
|
if (routerVersion)
|
|
|
|
|
{
|
|
|
|
|
obj["routerVersion"] = routerVersion->ToString();
|
|
|
|
|
}
|
|
|
|
|
std::vector<util::StatusObject> srv;
|
|
|
|
|
for (const auto& record : srvRecords)
|
|
|
|
|
{
|
|
|
|
|
srv.emplace_back(record.ExtractStatus());
|
|
|
|
|
}
|
|
|
|
|
obj["srvRecords"] = srv;
|
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::BDecode(llarp_buffer_t* buf)
|
|
|
|
|
{
|
|
|
|
|
Clear();
|
|
|
|
|
|
|
|
|
|
if (*buf->cur == 'd') // old format
|
|
|
|
|
{
|
|
|
|
|
return DecodeVersion_0(buf);
|
|
|
|
|
}
|
|
|
|
|
else if (*buf->cur != 'l') // if not dict, should be new format and start with list
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
std::string_view buf_view(reinterpret_cast<char*>(buf->cur), buf->size_left());
|
|
|
|
|
oxenc::bt_list_consumer btlist(buf_view);
|
|
|
|
|
|
|
|
|
|
uint64_t outer_version = btlist.consume_integer<uint64_t>();
|
|
|
|
|
|
|
|
|
|
if (outer_version == 1)
|
|
|
|
|
{
|
|
|
|
|
bool decode_result = DecodeVersion_1(btlist);
|
|
|
|
|
|
|
|
|
|
// advance the llarp_buffer_t since lokimq serialization is unaware of it.
|
|
|
|
|
// FIXME: this is broken (current_buffer got dropped), but the whole thing is getting
|
|
|
|
|
// replaced.
|
|
|
|
|
// buf->cur += btlist.
|
|
|
|
|
// current_buffer().data() - buf_view.data() + 1;
|
|
|
|
|
|
|
|
|
|
return decode_result;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log::warning(logcat, "Received RouterContact with unkown version ({})", outer_version);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (const std::exception& e)
|
|
|
|
|
{
|
|
|
|
|
log::debug(logcat, "RouterContact::BDecode failed: {}", e.what());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::DecodeVersion_0(llarp_buffer_t* buf)
|
|
|
|
|
{
|
|
|
|
|
return bencode_decode_dict(*this, buf);
|
|
|
|
|
}
|
|
|
|
|
// TODO: unfuck all of this
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::DecodeVersion_1(oxenc::bt_list_consumer& btlist)
|
|
|
|
|
{
|
|
|
|
|
auto signature_string = btlist.consume_string_view();
|
|
|
|
|
signed_bt_dict = btlist.consume_dict_data();
|
|
|
|
|
(void)buf;
|
|
|
|
|
|
|
|
|
|
if (not btlist.is_finished())
|
|
|
|
|
{
|
|
|
|
|
log::debug(logcat, "RouterContact serialized list too long for specified version.");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// clear();
|
|
|
|
|
|
|
|
|
|
llarp_buffer_t sigbuf(signature_string.data(), signature_string.size());
|
|
|
|
|
if (not signature.FromBytestring(&sigbuf))
|
|
|
|
|
{
|
|
|
|
|
log::debug(logcat, "RouterContact serialized signature had invalid length.");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// if (*buf->cur == 'd') // old format
|
|
|
|
|
// {
|
|
|
|
|
// return DecodeVersion_0(buf);
|
|
|
|
|
// }
|
|
|
|
|
// else if (*buf->cur != 'l') // if not dict, should be new format and start with list
|
|
|
|
|
// {
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// try
|
|
|
|
|
// {
|
|
|
|
|
// std::string_view buf_view(reinterpret_cast<char*>(buf->cur), buf->size_left());
|
|
|
|
|
// oxenc::bt_list_consumer btlist(buf_view);
|
|
|
|
|
|
|
|
|
|
// uint64_t outer_version = btlist.consume_integer<uint64_t>();
|
|
|
|
|
|
|
|
|
|
// if (outer_version == 1)
|
|
|
|
|
// {
|
|
|
|
|
// bool decode_result = DecodeVersion_1(btlist);
|
|
|
|
|
|
|
|
|
|
// // advance the llarp_buffer_t since lokimq serialization is unaware of it.
|
|
|
|
|
// // FIXME: this is broken (current_buffer got dropped), but the whole thing is getting
|
|
|
|
|
// // replaced.
|
|
|
|
|
// // buf->cur += btlist.
|
|
|
|
|
// // current_buffer().data() - buf_view.data() + 1;
|
|
|
|
|
|
|
|
|
|
// return decode_result;
|
|
|
|
|
// }
|
|
|
|
|
// else
|
|
|
|
|
// {
|
|
|
|
|
// log::warning(logcat, "Received RouterContact with unkown version ({})", outer_version);
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// catch (const std::exception& e)
|
|
|
|
|
// {
|
|
|
|
|
// log::debug(logcat, "RouterContact::BDecode failed: {}", e.what());
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
llarp_buffer_t data_dict_buf(signed_bt_dict.data(), signed_bt_dict.size());
|
|
|
|
|
return bencode_decode_dict(*this, &data_dict_buf);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::decode_key(const llarp_buffer_t& key, llarp_buffer_t* buf)
|
|
|
|
|
{
|
|
|
|
|
bool read = false;
|
|
|
|
|
(void)key;
|
|
|
|
|
|
|
|
|
|
// TOFIX: fuck everything about llarp_buffer_t
|
|
|
|
|
|
|
|
|
|
// if (!BEncodeMaybeReadDictEntry("a", addr, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictEntry("i", netID, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictEntry("i", netID, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictEntry("k", pubkey, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictEntry("k", _router_id, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (key.startswith("r"))
|
|
|
|
|
{
|
|
|
|
|
RouterVersion r;
|
|
|
|
|
if (not r.BDecode(buf))
|
|
|
|
|
return false;
|
|
|
|
|
routerVersion = r;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
// if (key.startswith("r"))
|
|
|
|
|
// {
|
|
|
|
|
// RouterVersion r;
|
|
|
|
|
// if (not r.BDecode(buf))
|
|
|
|
|
// return false;
|
|
|
|
|
// routerVersion = r;
|
|
|
|
|
// return true;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if (not BEncodeMaybeReadDictList("s", srvRecords, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (not BEncodeMaybeReadDictList("s", srvRecords, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictEntry("p", enckey, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictEntry("p", enckey, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictInt("u", last_updated, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictInt("u", _timestamp, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictInt("v", version, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictInt("v", version, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
if (key.startswith("x") and serializeExit)
|
|
|
|
|
{
|
|
|
|
|
return bencode_discard(buf);
|
|
|
|
|
}
|
|
|
|
|
// if (key.startswith("x") and serializeExit)
|
|
|
|
|
// {
|
|
|
|
|
// return bencode_discard(buf);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if (!BEncodeMaybeReadDictEntry("z", signature, read, key, buf))
|
|
|
|
|
return false;
|
|
|
|
|
// if (!BEncodeMaybeReadDictEntry("z", signature, read, key, buf))
|
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
|
|
return read or bencode_discard(buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::IsPublicRouter() const
|
|
|
|
|
RouterContact::is_public_router() const
|
|
|
|
|
{
|
|
|
|
|
if (not routerVersion)
|
|
|
|
|
if (_router_version.empty())
|
|
|
|
|
return false;
|
|
|
|
|
return addr.is_addressable();
|
|
|
|
|
return _addr.is_addressable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::IsExpired(llarp_time_t now) const
|
|
|
|
|
RouterContact::is_expired(llarp_time_t now) const
|
|
|
|
|
{
|
|
|
|
|
return Age(now) >= rc_expire_age;
|
|
|
|
|
return age(now) >= _timestamp.time_since_epoch() + LIFETIME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
llarp_time_t
|
|
|
|
|
RouterContact::TimeUntilExpires(llarp_time_t now) const
|
|
|
|
|
RouterContact::time_to_expiry(llarp_time_t now) const
|
|
|
|
|
{
|
|
|
|
|
const auto expiresAt = last_updated + Lifetime;
|
|
|
|
|
return now < expiresAt ? expiresAt - now : 0s;
|
|
|
|
|
const auto expiry = _timestamp.time_since_epoch() + LIFETIME;
|
|
|
|
|
return now < expiry ? expiry - now : 0s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
llarp_time_t
|
|
|
|
|
RouterContact::Age(llarp_time_t now) const
|
|
|
|
|
{
|
|
|
|
|
return now > last_updated ? now - last_updated : 0s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::ExpiresSoon(llarp_time_t now, llarp_time_t dlt) const
|
|
|
|
|
{
|
|
|
|
|
return TimeUntilExpires(now) <= dlt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::Sign(const SecretKey& secretkey)
|
|
|
|
|
RouterContact::age(llarp_time_t now) const
|
|
|
|
|
{
|
|
|
|
|
pubkey = llarp::seckey_topublic(secretkey);
|
|
|
|
|
signature.Zero();
|
|
|
|
|
last_updated = time_now_ms();
|
|
|
|
|
|
|
|
|
|
signed_bt_dict = bencode_signed_section();
|
|
|
|
|
|
|
|
|
|
return crypto::sign(
|
|
|
|
|
signature,
|
|
|
|
|
secretkey,
|
|
|
|
|
reinterpret_cast<uint8_t*>(signed_bt_dict.data()),
|
|
|
|
|
signed_bt_dict.size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::Verify(llarp_time_t now, bool allowExpired) const
|
|
|
|
|
{
|
|
|
|
|
if (netID != NetID::DefaultValue())
|
|
|
|
|
{
|
|
|
|
|
log::error(
|
|
|
|
|
logcat, "netid mismatch: '{}' (theirs) != '{}' (ours)", netID, NetID::DefaultValue());
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (IsExpired(now) and not allowExpired)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
// TODO: make net* overridable
|
|
|
|
|
const auto* net = net::Platform::Default_ptr();
|
|
|
|
|
|
|
|
|
|
if (net->IsBogon(addr.in4()) && BlockBogons)
|
|
|
|
|
{
|
|
|
|
|
log::error(logcat, "invalid address info: {}", addr);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!VerifySignature())
|
|
|
|
|
{
|
|
|
|
|
log::error(logcat, "invalid signature: {}", *this);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
auto delta = now - _timestamp.time_since_epoch();
|
|
|
|
|
return delta > 0s ? delta : 0s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::VerifySignature() const
|
|
|
|
|
RouterContact::expires_within_delta(llarp_time_t now, llarp_time_t dlt) const
|
|
|
|
|
{
|
|
|
|
|
RouterContact copy;
|
|
|
|
|
copy = *this;
|
|
|
|
|
copy.signature.Zero();
|
|
|
|
|
|
|
|
|
|
auto bte = copy.bt_encode();
|
|
|
|
|
return crypto::verify(pubkey, reinterpret_cast<uint8_t*>(bte.data()), bte.size(), signature);
|
|
|
|
|
return time_to_expiry(now) <= dlt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static constexpr std::array obsolete_bootstraps = {
|
|
|
|
|
@ -421,18 +290,18 @@ namespace llarp
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::IsObsoleteBootstrap() const
|
|
|
|
|
RouterContact::is_obsolete_bootstrap() const
|
|
|
|
|
{
|
|
|
|
|
for (const auto& k : obsolete_bootstraps)
|
|
|
|
|
{
|
|
|
|
|
if (pubkey.ToHex() == k)
|
|
|
|
|
if (_router_id.ToHex() == k)
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::Write(const fs::path& fname) const
|
|
|
|
|
RouterContact::write(const fs::path& fname) const
|
|
|
|
|
{
|
|
|
|
|
std::array<byte_t, MAX_RC_SIZE> tmp;
|
|
|
|
|
llarp_buffer_t buf(tmp);
|
|
|
|
|
@ -453,13 +322,13 @@ namespace llarp
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
RouterContact::Read(const fs::path& fname)
|
|
|
|
|
RouterContact::read(const fs::path& fname)
|
|
|
|
|
{
|
|
|
|
|
std::array<byte_t, MAX_RC_SIZE> tmp;
|
|
|
|
|
llarp_buffer_t buf(tmp);
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
util::slurp_file(fname, tmp.data(), tmp.size());
|
|
|
|
|
util::file_to_buffer(fname, tmp.data(), tmp.size());
|
|
|
|
|
}
|
|
|
|
|
catch (const std::exception& e)
|
|
|
|
|
{
|
|
|
|
|
@ -468,19 +337,4 @@ namespace llarp
|
|
|
|
|
}
|
|
|
|
|
return BDecode(&buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string
|
|
|
|
|
RouterContact::ToString() const
|
|
|
|
|
{
|
|
|
|
|
return fmt::format(
|
|
|
|
|
"[RC k={} updated={} netid={} v={} ai={{{}}} e={} z={}]",
|
|
|
|
|
pubkey,
|
|
|
|
|
last_updated.count(),
|
|
|
|
|
netID,
|
|
|
|
|
version,
|
|
|
|
|
fmt::format("{}", addr),
|
|
|
|
|
enckey,
|
|
|
|
|
signature);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace llarp
|
|
|
|
|
|
dr7ana
7 months ago