Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

ara/peerbook-blank-pubkey-fixes #431

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ara/peerbook-blank-pubkey-fixes #431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 60 additions & 36 deletions src/peerbook/libp2p_peerbook.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,38 +104,42 @@ put(#peerbook{tid=TID, stale_time=StaleTime}=Handle, PeerList0, Prevalidated) ->
AllowRFC1918 = true, %% is_rfc1918_allowed(TID),
NewPeers = lists:foldl(
fun(NewPeer, Acc) ->
NewPeerId = libp2p_peer:pubkey_bin(NewPeer),
case unsafe_fetch_peer(NewPeerId, Handle) of
{error, not_found} ->
case AllowRFC1918 orelse not libp2p_peer:has_private_ip(NewPeer) of
true ->
store_peer(NewPeer, Handle),
[NewPeer | Acc];
false -> Acc
end;
{ok, ExistingPeer} ->
%% Only store peers that are not _this_ peer,
%% are newer than what we have,
%% are not stale themselves
case NewPeerId /= ThisPeerId
andalso (AllowRFC1918 orelse not libp2p_peer:has_private_ip(NewPeer))
andalso libp2p_peer:supersedes(NewPeer, ExistingPeer)
andalso not libp2p_peer:is_stale(NewPeer, StaleTime)
andalso libp2p_peer:network_id_allowable(NewPeer, libp2p_swarm:network_id(TID)) of
true ->
%% even if the peer is similar, we should still
%% store it because it's newer
store_peer(NewPeer, Handle),
case libp2p_peer:is_similar(NewPeer, ExistingPeer) of
false ->
[NewPeer | Acc];
true ->
Acc
end;
_ ->
Acc
end
end
case libp2p_peer:pubkey_bin(NewPeer) of
<<>> ->
Acc; %% Peer doesn't have a pubkey, skip
NewPeerId ->
case unsafe_fetch_peer(NewPeerId, Handle) of
{error, not_found} ->
case AllowRFC1918 orelse not libp2p_peer:has_private_ip(NewPeer) of
true ->
store_peer(NewPeer, Handle),
[NewPeer | Acc];
false -> Acc
end;
{ok, ExistingPeer} ->
%% Only store peers that are not _this_ peer,
%% are newer than what we have,
%% are not stale themselves
case NewPeerId /= ThisPeerId
andalso (AllowRFC1918 orelse not libp2p_peer:has_private_ip(NewPeer))
andalso libp2p_peer:supersedes(NewPeer, ExistingPeer)
andalso not libp2p_peer:is_stale(NewPeer, StaleTime)
andalso libp2p_peer:network_id_allowable(NewPeer, libp2p_swarm:network_id(TID)) of
true ->
%% even if the peer is similar, we should still
%% store it because it's newer
store_peer(NewPeer, Handle),
case libp2p_peer:is_similar(NewPeer, ExistingPeer) of
false ->
[NewPeer | Acc];
true ->
Acc
end;
_ ->
Acc
end
end
end,
end, [], PeerList),

% Notify group of new peers
Expand Down Expand Up @@ -177,7 +181,7 @@ random(Peerbook, Exclude, Pred) ->
random(Peerbook=#peerbook{tid=TID, store=Store, stale_time=StaleTime}, Exclude0, Pred, Tries) ->
Exclude = lists:map(fun rev/1, Exclude0),
{ok, Iterator} = rocksdb:iterator(Store, []),
case rocksdb:iterator_move(Iterator, first) of
case fuzzy_rocksdb(Iterator, first) of
{ok, FirstAddr = <<Start:(33*8)/integer-unsigned-big>>, FirstPeer} ->
{ok, <<End:(33*8)/integer-unsigned-big>>, _} = rocksdb:iterator_move(Iterator, last),
Difference = End - Start,
Expand Down Expand Up @@ -224,7 +228,7 @@ random(Peerbook=#peerbook{tid=TID, store=Store, stale_time=StaleTime}, Exclude0,
RandLoop(rocksdb:iterator_move(Iterator, next), T - 1);
false ->
case libp2p_peer:network_id_allowable(Peer, NetworkID)
andalso Pred(Peer) of
andalso Pred(Peer) of
true ->
rocksdb:iterator_close(Iterator),
{rev(Addr), Peer};
Expand All @@ -238,9 +242,10 @@ random(Peerbook=#peerbook{tid=TID, store=Store, stale_time=StaleTime}, Exclude0,
end
end
end(rocksdb:iterator_move(Iterator, <<SeekPoint:(33*8)/integer-unsigned-big>>), Tries)
end;
{error,invalid_iterator} ->
end
{error, Error} ->
%% no peers yet
lager:warning("~p while searching for random peer", [Error]),
false
end.

Expand Down Expand Up @@ -517,6 +522,25 @@ terminate(_Reason, _State) ->
%% Internal
%%

%% Should this exist? It's only needed if the peerbook continues to have <<>> pubkeys stored.
%% Other option is to purge peerbook of <<>> during gets / random peers
-spec fuzzy_rocksdb(rocksdb:iterator(), atom()) -> {ok, libp2p_crypto:pubkey_bin(), libp2p_peer:peer()} | {error, atom()}.
fuzzy_rocksdb(Iterator, ItrAction) ->
case rocksdb:iterator_move(Iterator, ItrAction) of
{ok, <<>>, _FirstPeer} ->
case ItrAction ->
first ->
fuzzy_rocksdb(Iterator, next);
next ->
fuzzy_rocksdb(Iterator, next);
last ->
fuzzy_rocksdb(Iterator, prev);
prev ->
fuzzy_rocksdb(Iterator, prev)
end;
Entry -> Entry;
end.

open_rocks(DataDir, CFOpts0, TTL) ->
CFOpts = [{create_if_missing, true}] ++ CFOpts0,
open_rocks(DataDir, CFOpts, TTL, clean).
Expand Down