mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 02:39:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename NetworkFilter to BanFilter

Browse source
This commit is contained in:
Alva Swanson 2023-02-12 19:30:04 +01:00
parent b4822761a8
commit f9a0e5d6d0
No known key found for this signature in database
GPG key ID: 004760E77F753090
13 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/app/CoreModule.java
View file

@ -21,7 +21,7 @@ import bisq.core.alert.AlertModule;
import bisq.core.btc.BitcoinModule;
import bisq.core.dao.DaoModule;
import bisq.core.filter.FilterModule;
import bisq.core.network.CoreNetworkFilter;
import bisq.core.network.CoreBanFilter;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.offer.OfferModule;
import bisq.core.presentation.CorePresentationModule;
@ -36,7 +36,7 @@ import bisq.core.util.coin.ImmutableCoinFormatter;
import bisq.network.crypto.EncryptionServiceModule;
import bisq.network.p2p.P2PModule;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.BanFilter;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.app.AppModule;
@ -66,7 +66,7 @@ public class CoreModule extends AppModule {
bind(BridgeAddressProvider.class).to(Preferences.class);
bind(SeedNodeRepository.class).to(DefaultSeedNodeRepository.class);
bind(NetworkFilter.class).to(CoreNetworkFilter.class).in(Singleton.class);
bind(BanFilter.class).to(CoreBanFilter.class).in(Singleton.class);
bind(File.class).annotatedWith(named(STORAGE_DIR)).toInstance(config.storageDir);

6
core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java
View file

@ -22,7 +22,7 @@ import bisq.core.app.TorSetup;
import bisq.core.btc.BitcoinModule;
import bisq.core.dao.DaoModule;
import bisq.core.filter.FilterModule;
import bisq.core.network.CoreNetworkFilter;
import bisq.core.network.CoreBanFilter;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.offer.OfferModule;
import bisq.core.proto.network.CoreNetworkProtoResolver;
@ -34,7 +34,7 @@ import bisq.core.user.User;
import bisq.network.crypto.EncryptionServiceModule;
import bisq.network.p2p.P2PModule;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.BanFilter;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.ClockWatcher;
@ -75,7 +75,7 @@ public class ModuleForAppWithP2p extends AppModule {
bind(TorSetup.class).in(Singleton.class);
bind(SeedNodeRepository.class).to(DefaultSeedNodeRepository.class).in(Singleton.class);
bind(NetworkFilter.class).to(CoreNetworkFilter.class).in(Singleton.class);
bind(BanFilter.class).to(CoreBanFilter.class).in(Singleton.class);
bind(File.class).annotatedWith(named(STORAGE_DIR)).toInstance(config.storageDir);
bind(File.class).annotatedWith(named(KEY_STORAGE_DIR)).toInstance(config.keyStorageDir);

6
core/src/main/java/bisq/core/filter/FilterManager.java
View file

@ -29,7 +29,7 @@ import bisq.core.user.User;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.P2PServiceListener;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.BanFilter;
import bisq.network.p2p.storage.HashMapChangedListener;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
@ -121,7 +121,7 @@ public class FilterManager {
Preferences preferences,
Config config,
ProvidersRepository providersRepository,
NetworkFilter networkFilter,
BanFilter banFilter,
@Named(Config.IGNORE_DEV_MSG) boolean ignoreDevMsg,
@Named(Config.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
this.p2PService = p2PService;
@ -138,7 +138,7 @@ public class FilterManager {
"029340c3e7d4bb0f9e651b5f590b434fecb6175aeaa57145c7804ff05d210e534f",
"034dc7530bf66ffd9580aa98031ea9a18ac2d269f7c56c0e71eca06105b9ed69f9");
networkFilter.setBannedNodePredicate(this::isNodeAddressBannedFromNetwork);
banFilter.setBannedNodePredicate(this::isNodeAddressBannedFromNetwork);
}

6
core/src/main/java/bisq/core/network/CoreNetworkFilter.java → core/src/main/java/bisq/core/network/CoreBanFilter.java
View file

@ -18,7 +18,7 @@
package bisq.core.network;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.BanFilter;
import bisq.common.config.Config;
@ -33,7 +33,7 @@ import java.util.function.Predicate;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class CoreNetworkFilter implements NetworkFilter {
public class CoreBanFilter implements BanFilter {
private final Set<NodeAddress> bannedPeersFromOptions = new HashSet<>();
private Predicate<NodeAddress> bannedNodePredicate;
@ -41,7 +41,7 @@ public class CoreNetworkFilter implements NetworkFilter {
* @param banList List of banned peers from program argument
*/
@Inject
public CoreNetworkFilter(@Named(Config.BAN_LIST) List<String> banList) {
public CoreBanFilter(@Named(Config.BAN_LIST) List<String> banList) {
banList.stream().map(NodeAddress::new).forEach(bannedPeersFromOptions::add);
}

8
p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java
View file

@ -19,7 +19,7 @@ package bisq.network.p2p;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.LocalhostNetworkNode;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.BanFilter;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.NewTor;
import bisq.network.p2p.network.RunningTor;
@ -44,7 +44,7 @@ public class NetworkNodeProvider implements Provider<NetworkNode> {
@Inject
public NetworkNodeProvider(NetworkProtoResolver networkProtoResolver,
BridgeAddressProvider bridgeAddressProvider,
@Nullable NetworkFilter networkFilter,
@Nullable BanFilter banFilter,
@Named(Config.MAX_CONNECTIONS) int maxConnections,
@Named(Config.USE_LOCALHOST_FOR_P2P) boolean useLocalhostForP2P,
@Named(Config.NODE_PORT) int port,
@ -57,7 +57,7 @@ public class NetworkNodeProvider implements Provider<NetworkNode> {
@Named(Config.TOR_STREAM_ISOLATION) boolean streamIsolation,
@Named(Config.TOR_CONTROL_USE_SAFE_COOKIE_AUTH) boolean useSafeCookieAuthentication) {
if (useLocalhostForP2P) {
networkNode = new LocalhostNetworkNode(port, networkProtoResolver, networkFilter, maxConnections);
networkNode = new LocalhostNetworkNode(port, networkProtoResolver, banFilter, maxConnections);
} else {
TorMode torMode = getTorMode(bridgeAddressProvider,
torDir,
@ -67,7 +67,7 @@ public class NetworkNodeProvider implements Provider<NetworkNode> {
password,
cookieFile,
useSafeCookieAuthentication);
networkNode = new TorNetworkNode(port, networkProtoResolver, streamIsolation, torMode, networkFilter, maxConnections);
networkNode = new TorNetworkNode(port, networkProtoResolver, streamIsolation, torMode, banFilter, maxConnections);
}
}

2
p2p/src/main/java/bisq/network/p2p/network/NetworkFilter.java → p2p/src/main/java/bisq/network/p2p/network/BanFilter.java
View file

@ -21,7 +21,7 @@ import bisq.network.p2p.NodeAddress;
import java.util.function.Predicate;
public interface NetworkFilter {
public interface BanFilter {
boolean isPeerBanned(NodeAddress nodeAddress);
void setBannedNodePredicate(Predicate<NodeAddress> isNodeAddressBanned);

18
p2p/src/main/java/bisq/network/p2p/network/Connection.java
View file

@ -130,7 +130,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
private final Socket socket;
private final ConnectionListener connectionListener;
@Nullable
private final NetworkFilter networkFilter;
private final BanFilter banFilter;
@Getter
private final String uid;
private final ExecutorService executorService;
@ -175,10 +175,10 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
ConnectionListener connectionListener,
@Nullable NodeAddress peersNodeAddress,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter) {
@Nullable BanFilter banFilter) {
this.socket = socket;
this.connectionListener = connectionListener;
this.networkFilter = networkFilter;
this.banFilter = banFilter;
this.uid = UUID.randomUUID().toString();
this.executorService = SingleThreadExecutorUtils.getSingleThreadExecutor("Executor service for connection with uid " + uid);
@ -208,7 +208,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
if (peersNodeAddress != null) {
setPeersNodeAddress(peersNodeAddress);
if (networkFilter != null && networkFilter.isPeerBanned(peersNodeAddress)) {
if (banFilter != null && banFilter.isPeerBanned(peersNodeAddress)) {
log.warn("We created an outbound connection with a banned peer");
reportInvalidRequest(RuleViolation.PEER_BANNED);
}
@ -237,9 +237,9 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
return;
}
if (networkFilter != null &&
if (banFilter != null &&
peersNodeAddressOptional.isPresent() &&
networkFilter.isPeerBanned(peersNodeAddressOptional.get())) {
banFilter.isPeerBanned(peersNodeAddressOptional.get())) {
log.warn("We tried to send a message to a banned peer. message={}", networkEnvelope.getClass().getSimpleName());
reportInvalidRequest(RuleViolation.PEER_BANNED);
return;
@ -685,7 +685,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
setPeersNodeAddress(senderNodeAddress);
}
if (networkFilter != null && networkFilter.isPeerBanned(senderNodeAddress)) {
if (banFilter != null && banFilter.isPeerBanned(senderNodeAddress)) {
log.warn("We got a message from a banned peer. message={}", sendersNodeAddressMessage.getClass().getSimpleName());
reportInvalidRequest(RuleViolation.PEER_BANNED);
return false;
@ -749,9 +749,9 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
return;
}
if (networkFilter != null &&
if (banFilter != null &&
peersNodeAddressOptional.isPresent() &&
networkFilter.isPeerBanned(peersNodeAddressOptional.get())) {
banFilter.isPeerBanned(peersNodeAddressOptional.get())) {
log.warn("We got a message from a banned peer. proto={}", Utilities.toTruncatedString(proto));
reportInvalidRequest(RuleViolation.PEER_BANNED);

4
p2p/src/main/java/bisq/network/p2p/network/InboundConnection.java
View file

@ -28,7 +28,7 @@ public class InboundConnection extends Connection {
MessageListener messageListener,
ConnectionListener connectionListener,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter) {
super(socket, messageListener, connectionListener, null, networkProtoResolver, networkFilter);
@Nullable BanFilter banFilter) {
super(socket, messageListener, connectionListener, null, networkProtoResolver, banFilter);
}
}

4
p2p/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java
View file

@ -56,9 +56,9 @@ public class LocalhostNetworkNode extends NetworkNode {
public LocalhostNetworkNode(int port,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter,
@Nullable BanFilter banFilter,
int maxConnections) {
super(port, networkProtoResolver, networkFilter, maxConnections);
super(port, networkProtoResolver, banFilter, maxConnections);
}
@Override

10
p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java
View file

@ -71,7 +71,7 @@ public abstract class NetworkNode implements MessageListener {
final int servicePort;
private final NetworkProtoResolver networkProtoResolver;
@Nullable
private final NetworkFilter networkFilter;
private final BanFilter banFilter;
private final CopyOnWriteArraySet<InboundConnection> inBoundConnections = new CopyOnWriteArraySet<>();
private final CopyOnWriteArraySet<MessageListener> messageListeners = new CopyOnWriteArraySet<>();
@ -93,11 +93,11 @@ public abstract class NetworkNode implements MessageListener {
NetworkNode(int servicePort,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter,
@Nullable BanFilter banFilter,
int maxConnections) {
this.servicePort = servicePort;
this.networkProtoResolver = networkProtoResolver;
this.networkFilter = networkFilter;
this.banFilter = banFilter;
connectionExecutor = Utilities.getListeningExecutorService("NetworkNode.connection",
maxConnections * 2,
@ -212,7 +212,7 @@ public abstract class NetworkNode implements MessageListener {
connectionListener,
peersNodeAddress,
networkProtoResolver,
networkFilter);
banFilter);
if (log.isDebugEnabled()) {
log.debug("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
@ -497,7 +497,7 @@ public abstract class NetworkNode implements MessageListener {
NetworkNode.this,
connectionListener,
networkProtoResolver,
networkFilter);
banFilter);
server.start();
}

4
p2p/src/main/java/bisq/network/p2p/network/OutboundConnection.java
View file

@ -31,7 +31,7 @@ public class OutboundConnection extends Connection {
ConnectionListener connectionListener,
NodeAddress peersNodeAddress,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter) {
super(socket, messageListener, connectionListener, peersNodeAddress, networkProtoResolver, networkFilter);
@Nullable BanFilter banFilter) {
super(socket, messageListener, connectionListener, peersNodeAddress, networkProtoResolver, banFilter);
}
}

8
p2p/src/main/java/bisq/network/p2p/network/Server.java
View file

@ -40,7 +40,7 @@ class Server implements Runnable {
private final MessageListener messageListener;
private final ConnectionListener connectionListener;
@Nullable
private final NetworkFilter networkFilter;
private final BanFilter banFilter;
private final ServerSocket serverSocket;
private final int localPort;
@ -54,13 +54,13 @@ class Server implements Runnable {
MessageListener messageListener,
ConnectionListener connectionListener,
NetworkProtoResolver networkProtoResolver,
@Nullable NetworkFilter networkFilter) {
@Nullable BanFilter banFilter) {
this.networkProtoResolver = networkProtoResolver;
this.serverSocket = serverSocket;
this.localPort = serverSocket.getLocalPort();
this.messageListener = messageListener;
this.connectionListener = connectionListener;
this.networkFilter = networkFilter;
this.banFilter = banFilter;
}
public void start() {
@ -82,7 +82,7 @@ class Server implements Runnable {
messageListener,
connectionListener,
networkProtoResolver,
networkFilter);
banFilter);
log.debug("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"Server created new inbound connection:"

4
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
View file

@ -69,9 +69,9 @@ public class TorNetworkNode extends NetworkNode {
NetworkProtoResolver networkProtoResolver,
boolean useStreamIsolation,
TorMode torMode,
@Nullable NetworkFilter networkFilter,
@Nullable BanFilter banFilter,
int maxConnections) {
super(servicePort, networkProtoResolver, networkFilter, maxConnections);
super(servicePort, networkProtoResolver, banFilter, maxConnections);
this.torMode = torMode;
this.streamIsolation = useStreamIsolation;