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

deregistered router fix, v2

Browse Source
ubuntu/groovy
Jason Rhinelander 4 years ago
parent 883462f6fc
commit 78df66c72b
3 changed files with 304 additions and 1 deletions
Show Stats Download Patch File Download Diff File

302
debian/patches/0004-deregistered-router-fix-v2.patch vendored
Unescape Escape View File

@ -0,0 +1,302 @@
From: Jason Rhinelander <jason@imaginary.ca>
Date: Mon, 9 Nov 2020 23:26:32 -0400
Subject: deregistered router fix, v2
---
llarp/CMakeLists.txt | 1 +
llarp/link/i_link_manager.hpp | 12 ++++++++++++
llarp/link/link_manager.cpp | 32 +++++++++++++++++++++++++++++++
llarp/link/link_manager.hpp | 6 ++++++
llarp/link/server.cpp | 10 ++++++++++
llarp/link/server.hpp | 4 ++++
llarp/link/session.cpp | 11 +++++++++++
llarp/link/session.hpp | 4 ++++
llarp/router/outbound_message_handler.cpp | 11 ++++++++++-
llarp/router/outbound_message_handler.hpp | 4 +++-
llarp/router/router.cpp | 21 +++++++++++++++++++-
11 files changed, 113 insertions(+), 3 deletions(-)
create mode 100644 llarp/link/session.cpp
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 5896db3..1055889 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -150,6 +150,7 @@ add_library(liblokinet
iwp/message_buffer.cpp
iwp/session.cpp
link/link_manager.cpp
+ link/session.cpp
link/server.cpp
messages/dht_immediate.cpp
messages/link_intro.cpp
diff --git a/llarp/link/i_link_manager.hpp b/llarp/link/i_link_manager.hpp
index 52b16c3..c1614c8 100644
--- a/llarp/link/i_link_manager.hpp
+++ b/llarp/link/i_link_manager.hpp
@@ -7,6 +7,7 @@
#include <peerstats/peer_db.hpp>
#include <functional>
+#include <optional>
struct llarp_buffer_t;
@@ -38,6 +39,12 @@ namespace llarp
virtual bool
HasSessionTo(const RouterID& remote) const = 0;
+ /// return true if the session with this pubkey is a client
+ /// return false if the session with this pubkey is a router
+ /// return std::nullopt we have no session with this pubkey
+ virtual std::optional<bool>
+ SessionIsClient(RouterID remote) const = 0;
+
virtual void
PumpLinks() = 0;
@@ -63,6 +70,11 @@ namespace llarp
virtual void
ForEachInboundLink(std::function<void(LinkLayer_ptr)> visit) const = 0;
+ /// close all connections to this peer
+ /// remove all link layer commits
+ virtual void
+ DeregisterPeer(RouterID remote) = 0;
+
virtual size_t
NumberOfConnectedRouters() const = 0;
diff --git a/llarp/link/link_manager.cpp b/llarp/link/link_manager.cpp
index 447b7d9..736d6fc 100644
--- a/llarp/link/link_manager.cpp
+++ b/llarp/link/link_manager.cpp
@@ -60,6 +60,38 @@ namespace llarp
return GetLinkWithSessionTo(remote) != nullptr;
}
+ std::optional<bool>
+ LinkManager::SessionIsClient(RouterID remote) const
+ {
+ for (const auto& link : inboundLinks)
+ {
+ const auto session = link->FindSessionByPubkey(remote);
+ if (session)
+ return not session->IsRelay();
+ }
+ for (const auto& link : outboundLinks)
+ {
+ if (link->HasSessionTo(remote))
+ return false;
+ }
+ return std::nullopt;
+ }
+
+ void
+ LinkManager::DeregisterPeer(RouterID remote)
+ {
+ m_PersistingSessions.erase(remote);
+ for (const auto& link : inboundLinks)
+ {
+ link->CloseSessionTo(remote);
+ }
+ for (const auto& link : outboundLinks)
+ {
+ link->CloseSessionTo(remote);
+ }
+ LogInfo(remote, " has been de-registered");
+ }
+
void
LinkManager::PumpLinks()
{
diff --git a/llarp/link/link_manager.hpp b/llarp/link/link_manager.hpp
index ddd5468..89ff52e 100644
--- a/llarp/link/link_manager.hpp
+++ b/llarp/link/link_manager.hpp
@@ -34,6 +34,12 @@ namespace llarp
bool
HasSessionTo(const RouterID& remote) const override;
+ std::optional<bool>
+ SessionIsClient(RouterID remote) const override;
+
+ void
+ DeregisterPeer(RouterID remote) override;
+
void
PumpLinks() override;
diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp
index d41b42c..28e7be4 100644
--- a/llarp/link/server.cpp
+++ b/llarp/link/server.cpp
@@ -48,6 +48,16 @@ namespace llarp
return m_AuthedLinks.find(id) != m_AuthedLinks.end();
}
+ std::shared_ptr<ILinkSession>
+ ILinkLayer::FindSessionByPubkey(RouterID id)
+ {
+ Lock_t l(m_AuthedLinksMutex);
+ auto itr = m_AuthedLinks.find(id);
+ if (itr == m_AuthedLinks.end())
+ return nullptr;
+ return itr->second;
+ }
+
void
ILinkLayer::ForEachSession(std::function<void(const ILinkSession*)> visit, bool randomize) const
{
diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp
index 3d30dc2..19503df 100644
--- a/llarp/link/server.hpp
+++ b/llarp/link/server.hpp
@@ -121,6 +121,10 @@ namespace llarp
virtual std::shared_ptr<ILinkSession>
NewOutboundSession(const RouterContact& rc, const AddressInfo& ai) = 0;
+ /// fetch a session by the identity pubkey it claims
+ std::shared_ptr<ILinkSession>
+ FindSessionByPubkey(RouterID pk);
+
virtual void
Pump();
diff --git a/llarp/link/session.cpp b/llarp/link/session.cpp
new file mode 100644
index 0000000..b701496
--- /dev/null
+++ b/llarp/link/session.cpp
@@ -0,0 +1,11 @@
+#include <link/session.hpp>
+
+namespace llarp
+{
+ bool
+ ILinkSession::IsRelay() const
+ {
+ return GetRemoteRC().IsPublicRouter();
+ }
+
+} // namespace llarp
diff --git a/llarp/link/session.hpp b/llarp/link/session.hpp
index efb6f1d..73cf6cf 100644
--- a/llarp/link/session.hpp
+++ b/llarp/link/session.hpp
@@ -102,6 +102,10 @@ namespace llarp
virtual RouterContact
GetRemoteRC() const = 0;
+ /// is this session a session to a relay?
+ bool
+ IsRelay() const;
+
/// handle a valid LIM
std::function<bool(const LinkIntroMessage* msg)> GotLIM;
diff --git a/llarp/router/outbound_message_handler.cpp b/llarp/router/outbound_message_handler.cpp
index 431de0c..7b926ae 100644
--- a/llarp/router/outbound_message_handler.cpp
+++ b/llarp/router/outbound_message_handler.cpp
@@ -2,6 +2,7 @@
#include <messages/link_message.hpp>
#include <router/i_outbound_session_maker.hpp>
+#include <router/i_rc_lookup_handler.hpp>
#include <link/i_link_manager.hpp>
#include <constants/link_layer.hpp>
#include <util/meta/memfn.hpp>
@@ -22,6 +23,12 @@ namespace llarp
OutboundMessageHandler::QueueMessage(
const RouterID& remote, const ILinkMessage* msg, SendStatusHandler callback)
{
+ if (not _linkManager->SessionIsClient(remote) and not _lookupHandler->RemoteIsAllowed(remote))
+ {
+ DoCallback(callback, SendStatus::InvalidRouter);
+ return true;
+ }
+
const uint16_t priority = msg->Priority();
std::array<byte_t, MAX_LINK_MSG_SIZE> linkmsg_buffer;
llarp_buffer_t buf(linkmsg_buffer);
@@ -105,9 +112,11 @@ namespace llarp
}
void
- OutboundMessageHandler::Init(ILinkManager* linkManager, std::shared_ptr<Logic> logic)
+ OutboundMessageHandler::Init(
+ ILinkManager* linkManager, I_RCLookupHandler* lookupHandler, std::shared_ptr<Logic> logic)
{
_linkManager = linkManager;
+ _lookupHandler = lookupHandler;
_logic = logic;
outboundMessageQueues.emplace(zeroID, MessageQueue());
diff --git a/llarp/router/outbound_message_handler.hpp b/llarp/router/outbound_message_handler.hpp
index 44f53e6..44f1a8c 100644
--- a/llarp/router/outbound_message_handler.hpp
+++ b/llarp/router/outbound_message_handler.hpp
@@ -18,6 +18,7 @@ struct llarp_buffer_t;
namespace llarp
{
struct ILinkManager;
+ struct I_RCLookupHandler;
class Logic;
enum class SessionResult;
@@ -42,7 +43,7 @@ namespace llarp
ExtractStatus() const override;
void
- Init(ILinkManager* linkManager, std::shared_ptr<Logic> logic);
+ Init(ILinkManager* linkManager, I_RCLookupHandler* lookupHandler, std::shared_ptr<Logic> logic);
private:
using Message = std::pair<std::vector<byte_t>, SendStatusHandler>;
@@ -137,6 +138,7 @@ namespace llarp
std::queue<PathID_t> roundRobinOrder;
ILinkManager* _linkManager;
+ I_RCLookupHandler* _lookupHandler;
std::shared_ptr<Logic> _logic;
util::ContentionKiller m_Killer;
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index cbf2566..f0ee099 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -551,7 +551,7 @@ namespace llarp
LogInfo("Loaded ", bootstrapRCList.size(), " bootstrap routers");
// Init components after relevant config settings loaded
- _outboundMessageHandler.Init(&_linkManager, _logic);
+ _outboundMessageHandler.Init(&_linkManager, &_rcLookupHandler, _logic);
_outboundSessionMaker.Init(
this,
&_linkManager,
@@ -784,6 +784,25 @@ namespace llarp
return not _rcLookupHandler.RemoteIsAllowed(rc.pubkey);
});
+ // find all deregistered relays
+ std::unordered_set<PubKey, PubKey::Hash> closePeers;
+
+ _linkManager.ForEachPeer([&](auto session) {
+ if (whitelistRouters and not gotWhitelist)
+ return;
+ if (not session)
+ return;
+ const auto pk = session->GetPubKey();
+ if (session->IsRelay() and not _rcLookupHandler.RemoteIsAllowed(pk))
+ {
+ closePeers.emplace(pk);
+ }
+ });
+
+ // mark peers as de-registered
+ for (auto& peer : closePeers)
+ _linkManager.DeregisterPeer(std::move(peer));
+
_linkManager.CheckPersistingSessions(now);
if (HasClientExit())

2
debian/patches/0005-Move-default-user-group-into-deb-patch.patch vendored
Unescape Escape View File

@ -8,7 +8,7 @@ Rather than cramming it into CXXFLAGS in debian/rules.
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43cbb03..8e3e883 100644
index dac39e8..f46ee2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,9 @@ include(cmake/unix.cmake)

1
debian/patches/series vendored
Unescape Escape View File

@ -1,3 +1,4 @@
0004-Make-root-bootstraps-to-system-path.patch
0005-Move-default-user-group-into-deb-patch.patch
0007-Pass-debian-version-as-GIT_VERSION.patch
0004-deregistered-router-fix-v2.patch

Write Preview
Loading…
Cancel
Save