Add protection tools to offer

common/src/main/java/bisq/common/proto/ProtoUtil.java

@@ -28,6 +28,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -105,4 +106,7 @@ public static List<String> protocolStringListToList(ProtocolStringList protocolS
         return CollectionUtils.isEmpty(protocolStringList) ? new ArrayList<>() : new ArrayList<>(protocolStringList);
     }
 
+    public static Set<String> protocolStringListToSet(ProtocolStringList protocolStringList) {
+        return CollectionUtils.isEmpty(protocolStringList) ? new HashSet<>() : new HashSet<>(protocolStringList);
+    }
 }

core/src/main/java/bisq/core/api/CoreApi.java

@@ -112,6 +112,15 @@ public List<Offer> getOffers(String direction, String currencyCode) {
         return coreOffersService.getOffers(direction, currencyCode);
     }
 
+    /**
+     * @param direction     The offer direction
+     * @param currencyCode  The offer currency
+     * @return Returns the offers which can be taken
+     */
+    List<Offer> getOffersAvailableForTaker(String direction, String currencyCode) {
+        return coreOffersService.getOffersAvailableForTaker(direction, currencyCode, true);
+    }
+
     public void createAnPlaceOffer(String currencyCode,
                                    String directionAsString,
                                    String priceAsString,
@@ -202,6 +211,7 @@ public void takeOffer(String offerId,
         coreTradesService.takeOffer(offer,
                 paymentAccountId,
                 takerFeeCurrencyCode,
+                true,
                 resultHandler);
     }
 

core/src/main/java/bisq/core/api/CoreOffersService.java

@@ -22,6 +22,7 @@
 import bisq.core.offer.CreateOfferService;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OfferBookService;
+import bisq.core.offer.OfferFilter;
 import bisq.core.offer.OfferUtil;
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.payment.PaymentAccount;
@@ -58,27 +59,33 @@ class CoreOffersService {
     private final OpenOfferManager openOfferManager;
     private final OfferUtil offerUtil;
     private final User user;
+    private final OfferFilter offerFilter;
 
     @Inject
     public CoreOffersService(CreateOfferService createOfferService,
                              OfferBookService offerBookService,
                              OpenOfferManager openOfferManager,
                              OfferUtil offerUtil,
-                             User user) {
+                             User user,
+                             OfferFilter offerFilter) {
         this.createOfferService = createOfferService;
         this.offerBookService = offerBookService;
         this.openOfferManager = openOfferManager;
         this.offerUtil = offerUtil;
         this.user = user;
+        this.offerFilter = offerFilter;
     }
 
+    // TODO should we add a check for offerFilter.canTakeOffer?
     Offer getOffer(String id) {
         return offerBookService.getOffers().stream()
                 .filter(o -> o.getId().equals(id))
                 .findAny().orElseThrow(() ->
                         new IllegalStateException(format("offer with id '%s' not found", id)));
     }
 
+    // TODO returns all offers also those which cannot be taken. Should we use the filter from
+    //  getOffersAvailableForTaker here and remove the getOffersAvailableForTaker method?
     List<Offer> getOffers(String direction, String currencyCode) {
         List<Offer> offers = offerBookService.getOffers().stream()
                 .filter(o -> {
@@ -99,6 +106,12 @@ List<Offer> getOffers(String direction, String currencyCode) {
         return offers;
     }
 
+    List<Offer> getOffersAvailableForTaker(String direction, String currencyCode, boolean isTakerApiUser) {
+        return getOffers(direction, currencyCode).stream()
+                .filter(offer -> offerFilter.canTakeOffer(offer, isTakerApiUser).isValid())
+                .collect(Collectors.toList());
+    }
+
     // Create and place new offer.
     void createAndPlaceOffer(String currencyCode,
                              String directionAsString,

core/src/main/java/bisq/core/api/CoreTradesService.java

@@ -82,6 +82,7 @@ public CoreTradesService(CoreWalletsService coreWalletsService,
     void takeOffer(Offer offer,
                    String paymentAccountId,
                    String takerFeeCurrencyCode,
+                   boolean isTakerApiUser,
                    Consumer<Trade> resultHandler) {
         coreWalletsService.verifyWalletsAreAvailable();
         coreWalletsService.verifyEncryptedWalletIsUnlocked();
@@ -108,6 +109,7 @@ void takeOffer(Offer offer,
                 offer,
                 paymentAccountId,
                 useSavingsWallet,
+                isTakerApiUser,
                 resultHandler::accept,
                 errorMessage -> {
                     log.error(errorMessage);

core/src/main/java/bisq/core/app/CoreModule.java

@@ -21,6 +21,7 @@
 import bisq.core.btc.BitcoinModule;
 import bisq.core.dao.DaoModule;
 import bisq.core.filter.FilterModule;
+import bisq.core.network.CoreNetworkFilter;
 import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
 import bisq.core.offer.OfferModule;
 import bisq.core.presentation.CorePresentationModule;
@@ -35,6 +36,7 @@
 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.seed.SeedNodeRepository;
 
 import bisq.common.app.AppModule;
@@ -44,6 +46,8 @@
 import bisq.common.proto.network.NetworkProtoResolver;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
 
+import com.google.inject.Singleton;
+
 import java.io.File;
 
 import static bisq.common.config.Config.*;
@@ -62,6 +66,7 @@ protected void configure() {
         bind(BridgeAddressProvider.class).to(Preferences.class);
 
         bind(SeedNodeRepository.class).to(DefaultSeedNodeRepository.class);
+        bind(NetworkFilter.class).to(CoreNetworkFilter.class).in(Singleton.class);
 
         bind(File.class).annotatedWith(named(STORAGE_DIR)).toInstance(config.storageDir);
 

core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java

@@ -22,6 +22,7 @@
 import bisq.core.btc.BitcoinModule;
 import bisq.core.dao.DaoModule;
 import bisq.core.filter.FilterModule;
+import bisq.core.network.CoreNetworkFilter;
 import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
 import bisq.core.offer.OfferModule;
 import bisq.core.proto.network.CoreNetworkProtoResolver;
@@ -33,6 +34,7 @@
 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.seed.SeedNodeRepository;
 
 import bisq.common.ClockWatcher;
@@ -73,6 +75,7 @@ protected void configure() {
         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(File.class).annotatedWith(named(STORAGE_DIR)).toInstance(config.storageDir);
         bind(File.class).annotatedWith(named(KEY_STORAGE_DIR)).toInstance(config.keyStorageDir);

core/src/main/java/bisq/core/filter/Filter.java

@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -47,7 +48,7 @@
 @Value
 public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
     private final List<String> bannedOfferIds;
-    private final List<String> bannedNodeAddress;
+    private final List<String> nodeAddressesBannedFromTrading;
     private final List<String> bannedAutoConfExplorers;
     private final List<PaymentAccountFilter> bannedPaymentAccounts;
     private final List<String> bannedCurrencies;
@@ -91,10 +92,14 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
     // added at v1.3.8
     private final boolean disableAutoConf;
 
+    // added at v1.5.5
+    private final Set<String> nodeAddressesBannedFromNetwork;
+    private final boolean disableApi;
+
     // After we have created the signature from the filter data we clone it and apply the signature
     static Filter cloneWithSig(Filter filter, String signatureAsBase64) {
         return new Filter(filter.getBannedOfferIds(),
-                filter.getBannedNodeAddress(),
+                filter.getNodeAddressesBannedFromTrading(),
                 filter.getBannedPaymentAccounts(),
                 filter.getBannedCurrencies(),
                 filter.getBannedPaymentMethods(),
@@ -117,13 +122,15 @@ static Filter cloneWithSig(Filter filter, String signatureAsBase64) {
                 filter.getSignerPubKeyAsHex(),
                 filter.getBannedPrivilegedDevPubKeys(),
                 filter.isDisableAutoConf(),
-                filter.getBannedAutoConfExplorers());
+                filter.getBannedAutoConfExplorers(),
+                filter.getNodeAddressesBannedFromNetwork(),
+                filter.isDisableApi());
     }
 
     // Used for signature verification as we created the sig without the signatureAsBase64 field we set it to null again
     static Filter cloneWithoutSig(Filter filter) {
         return new Filter(filter.getBannedOfferIds(),
-                filter.getBannedNodeAddress(),
+                filter.getNodeAddressesBannedFromTrading(),
                 filter.getBannedPaymentAccounts(),
                 filter.getBannedCurrencies(),
                 filter.getBannedPaymentMethods(),
@@ -146,11 +153,13 @@ static Filter cloneWithoutSig(Filter filter) {
                 filter.getSignerPubKeyAsHex(),
                 filter.getBannedPrivilegedDevPubKeys(),
                 filter.isDisableAutoConf(),
-                filter.getBannedAutoConfExplorers());
+                filter.getBannedAutoConfExplorers(),
+                filter.getNodeAddressesBannedFromNetwork(),
+                filter.isDisableApi());
     }
 
     public Filter(List<String> bannedOfferIds,
-                  List<String> bannedNodeAddress,
+                  List<String> nodeAddressesBannedFromTrading,
                   List<PaymentAccountFilter> bannedPaymentAccounts,
                   List<String> bannedCurrencies,
                   List<String> bannedPaymentMethods,
@@ -170,9 +179,11 @@ public Filter(List<String> bannedOfferIds,
                   String signerPubKeyAsHex,
                   List<String> bannedPrivilegedDevPubKeys,
                   boolean disableAutoConf,
-                  List<String> bannedAutoConfExplorers) {
+                  List<String> bannedAutoConfExplorers,
+                  Set<String> nodeAddressesBannedFromNetwork,
+                  boolean disableApi) {
         this(bannedOfferIds,
-                bannedNodeAddress,
+                nodeAddressesBannedFromTrading,
                 bannedPaymentAccounts,
                 bannedCurrencies,
                 bannedPaymentMethods,
@@ -195,7 +206,9 @@ public Filter(List<String> bannedOfferIds,
                 signerPubKeyAsHex,
                 bannedPrivilegedDevPubKeys,
                 disableAutoConf,
-                bannedAutoConfExplorers);
+                bannedAutoConfExplorers,
+                nodeAddressesBannedFromNetwork,
+                disableApi);
     }
 
 
@@ -205,7 +218,7 @@ public Filter(List<String> bannedOfferIds,
 
     @VisibleForTesting
     public Filter(List<String> bannedOfferIds,
-                  List<String> bannedNodeAddress,
+                  List<String> nodeAddressesBannedFromTrading,
                   List<PaymentAccountFilter> bannedPaymentAccounts,
                   List<String> bannedCurrencies,
                   List<String> bannedPaymentMethods,
@@ -228,9 +241,11 @@ public Filter(List<String> bannedOfferIds,
                   String signerPubKeyAsHex,
                   List<String> bannedPrivilegedDevPubKeys,
                   boolean disableAutoConf,
-                  List<String> bannedAutoConfExplorers) {
+                  List<String> bannedAutoConfExplorers,
+                  Set<String> nodeAddressesBannedFromNetwork,
+                  boolean disableApi) {
         this.bannedOfferIds = bannedOfferIds;
-        this.bannedNodeAddress = bannedNodeAddress;
+        this.nodeAddressesBannedFromTrading = nodeAddressesBannedFromTrading;
         this.bannedPaymentAccounts = bannedPaymentAccounts;
         this.bannedCurrencies = bannedCurrencies;
         this.bannedPaymentMethods = bannedPaymentMethods;
@@ -254,6 +269,8 @@ public Filter(List<String> bannedOfferIds,
         this.bannedPrivilegedDevPubKeys = bannedPrivilegedDevPubKeys;
         this.disableAutoConf = disableAutoConf;
         this.bannedAutoConfExplorers = bannedAutoConfExplorers;
+        this.nodeAddressesBannedFromNetwork = nodeAddressesBannedFromNetwork;
+        this.disableApi = disableApi;
 
         // ownerPubKeyBytes can be null when called from tests
         if (ownerPubKeyBytes != null) {
@@ -270,7 +287,7 @@ public protobuf.StoragePayload toProtoMessage() {
                 .collect(Collectors.toList());
 
         protobuf.Filter.Builder builder = protobuf.Filter.newBuilder().addAllBannedOfferIds(bannedOfferIds)
-                .addAllBannedNodeAddress(bannedNodeAddress)
+                .addAllNodeAddressesBannedFromTrading(nodeAddressesBannedFromTrading)
                 .addAllBannedPaymentAccounts(paymentAccountFilterList)
                 .addAllBannedCurrencies(bannedCurrencies)
                 .addAllBannedPaymentMethods(bannedPaymentMethods)
@@ -291,7 +308,9 @@ public protobuf.StoragePayload toProtoMessage() {
                 .setCreationDate(creationDate)
                 .addAllBannedPrivilegedDevPubKeys(bannedPrivilegedDevPubKeys)
                 .setDisableAutoConf(disableAutoConf)
-                .addAllBannedAutoConfExplorers(bannedAutoConfExplorers);
+                .addAllBannedAutoConfExplorers(bannedAutoConfExplorers)
+                .addAllNodeAddressesBannedFromNetwork(nodeAddressesBannedFromNetwork)
+                .setDisableApi(disableApi);
 
         Optional.ofNullable(signatureAsBase64).ifPresent(builder::setSignatureAsBase64);
         Optional.ofNullable(extraDataMap).ifPresent(builder::putAllExtraData);
@@ -306,7 +325,7 @@ public static Filter fromProto(protobuf.Filter proto) {
 
 
         return new Filter(ProtoUtil.protocolStringListToList(proto.getBannedOfferIdsList()),
-                ProtoUtil.protocolStringListToList(proto.getBannedNodeAddressList()),
+                ProtoUtil.protocolStringListToList(proto.getNodeAddressesBannedFromTradingList()),
                 bannedPaymentAccountsList,
                 ProtoUtil.protocolStringListToList(proto.getBannedCurrenciesList()),
                 ProtoUtil.protocolStringListToList(proto.getBannedPaymentMethodsList()),
@@ -329,7 +348,9 @@ public static Filter fromProto(protobuf.Filter proto) {
                 proto.getSignerPubKeyAsHex(),
                 ProtoUtil.protocolStringListToList(proto.getBannedPrivilegedDevPubKeysList()),
                 proto.getDisableAutoConf(),
-                ProtoUtil.protocolStringListToList(proto.getBannedAutoConfExplorersList())
+                ProtoUtil.protocolStringListToList(proto.getBannedAutoConfExplorersList()),
+                ProtoUtil.protocolStringListToSet(proto.getNodeAddressesBannedFromNetworkList()),
+                proto.getDisableApi()
         );
     }
 
@@ -347,7 +368,7 @@ public long getTTL() {
     public String toString() {
         return "Filter{" +
                 "\n     bannedOfferIds=" + bannedOfferIds +
-                ",\n     bannedNodeAddress=" + bannedNodeAddress +
+                ",\n     nodeAddressesBannedFromTrading=" + nodeAddressesBannedFromTrading +
                 ",\n     bannedAutoConfExplorers=" + bannedAutoConfExplorers +
                 ",\n     bannedPaymentAccounts=" + bannedPaymentAccounts +
                 ",\n     bannedCurrencies=" + bannedCurrencies +
@@ -372,6 +393,8 @@ public String toString() {
                 ",\n     extraDataMap=" + extraDataMap +
                 ",\n     ownerPubKey=" + ownerPubKey +
                 ",\n     disableAutoConf=" + disableAutoConf +
+                ",\n     nodeAddressesBannedFromNetwork=" + nodeAddressesBannedFromNetwork +
+                ",\n     disableApi=" + disableApi +
                 "\n}";
     }
 }

core/src/main/java/bisq/core/filter/FilterManager.java

@@ -28,6 +28,7 @@
 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.storage.HashMapChangedListener;
 import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
 
@@ -115,6 +116,7 @@ public FilterManager(P2PService p2PService,
                          Preferences preferences,
                          Config config,
                          ProvidersRepository providersRepository,
+                         NetworkFilter networkFilter,
                          @Named(Config.IGNORE_DEV_MSG) boolean ignoreDevMsg,
                          @Named(Config.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
         this.p2PService = p2PService;
@@ -131,6 +133,7 @@ public FilterManager(P2PService p2PService,
                         "029340c3e7d4bb0f9e651b5f590b434fecb6175aeaa57145c7804ff05d210e534f",
                         "034dc7530bf66ffd9580aa98031ea9a18ac2d269f7c56c0e71eca06105b9ed69f9");
 
+        networkFilter.setBannedNodeFunction(this::isNodeAddressBannedFromNetwork);
     }
 
 
@@ -394,7 +397,13 @@ public boolean isOfferIdBanned(String offerId) {
 
     public boolean isNodeAddressBanned(NodeAddress nodeAddress) {
         return getFilter() != null &&
-                getFilter().getBannedNodeAddress().stream()
+                getFilter().getNodeAddressesBannedFromTrading().stream()
+                        .anyMatch(e -> e.equals(nodeAddress.getFullAddress()));
+    }
+
+    public boolean isNodeAddressBannedFromNetwork(NodeAddress nodeAddress) {
+        return getFilter() != null &&
+                getFilter().getNodeAddressesBannedFromNetwork().stream()
                         .anyMatch(e -> e.equals(nodeAddress.getFullAddress()));
     }