Added another point of Transaction I/O to DDoS protection. Fixes the …

…last source of forwarding unreasonably sized messages. Head to reduce the number of unconfirmed transactions triggering closer scrutiny.
muhatzg · Jul 23, 2017 · 803c8de · 803c8de
1 parent 22454c0
commit 803c8de
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/src/java/nxt/Constants.java b/src/java/nxt/Constants.java
@@ -124,7 +124,7 @@ public final class Constants {
     public static final int PRIORITY_MESSAGE_FEE = 50;
     //Prevents a single address from spaming too many transaction messages onto the network
     public static final int MAX_SENDER_MESSEGAE_BYTES = 10 * 1024;
-    public static final int NUM_UNCONFIRMED_TRANSACTIONS_INVESTIGATE = 1000;
+    public static final int NUM_UNCONFIRMED_TRANSACTIONS_INVESTIGATE = 200;
     public static final int BLOCK_MAX_MESSAGE_PAYLOAD = 20 * 1024;
     public static final int BLOCK_MAX_SENDER_MESSAGE_PAYLOAD = 10 * 1024;
     public static final int BLOCK_MAX_MESSAGES = 20;

diff --git a/src/java/nxt/DDosProtection.java b/src/java/nxt/DDosProtection.java
@@ -20,15 +20,15 @@
  * @author rainman
  */
 public class DDosProtection {
-    public static List<TransactionImpl> sanitizeTransactionList(Collection<TransactionImpl> transactionList)
+    public static List<? extends Transaction> sanitizeTransactionList(Collection<? extends Transaction> transactionList)
     {
         return sanitizeTransactionList(transactionList, "Unknown");
     }
 
-    public static List<TransactionImpl> sanitizeTransactionList(Collection<TransactionImpl> transactionList, String actor)
+    public static List<? extends Transaction> sanitizeTransactionList(Collection<? extends Transaction> transactionList, String actor)
     {
         int numTransactions = transactionList.size();
-        List<TransactionImpl> discardedTransactions = new ArrayList<>();
+        List<Transaction> discardedTransactions = new ArrayList<>();
 
         if(numTransactions > Constants.NUM_UNCONFIRMED_TRANSACTIONS_INVESTIGATE) //Something fishy seems to be happening. Investigate
         {
@@ -37,9 +37,9 @@ public static List<TransactionImpl> sanitizeTransactionList(Collection<Transacti
             boolean discardGlobalMessageWarning = false;
             boolean discardIndividualMessageWarning = false;
 
-            for(Iterator<TransactionImpl> transactionIterator = transactionList.iterator(); transactionIterator.hasNext();)
+            for(Iterator<? extends Transaction> transactionIterator = transactionList.iterator(); transactionIterator.hasNext();)
             {
-                TransactionImpl transaction = transactionIterator.next();
+                Transaction transaction = transactionIterator.next();
                 long senderId = transaction.getSenderId();
                 if(transaction.getMessage() != null && transaction.getAmountNQT() == 0 && limitMap.containsKey(senderId))
                 {

diff --git a/src/java/nxt/Nxt.java b/src/java/nxt/Nxt.java
@@ -18,7 +18,7 @@
 
 public final class Nxt {
 
-    public static final String VERSION = "1.2.8m";
+    public static final String VERSION = "1.2.8mu";
     public static final String APPLICATION = "NRS";
 
     private static volatile Time time = new Time.EpochTime();

diff --git a/src/java/nxt/TransactionProcessorImpl.java b/src/java/nxt/TransactionProcessorImpl.java
@@ -160,7 +160,8 @@ public void run() {
 
                         if(numTransactions > Constants.NUM_UNCONFIRMED_TRANSACTIONS_INVESTIGATE) //Something fishy seems to be happening. Investigate
                         {
-                            List<TransactionImpl> discardedTransactions = DDosProtection.sanitizeTransactionList(unconfirmedTransactions, "removeUnconfirmedTransactionsThread");
+                            //TODO: Cleanup transaction interface/ transactionimpl usage
+                            List<TransactionImpl> discardedTransactions = (List<TransactionImpl>)DDosProtection.sanitizeTransactionList(unconfirmedTransactions, "removeUnconfirmedTransactionsThread");
 
                             if(discardedTransactions.size() > 0)
                             {
@@ -214,7 +215,7 @@ public void run() {
                             transactionList.add(transaction);
                         }
                     }
-
+                    DDosProtection.sanitizeTransactionList(transactionList, "Transaction rebroadcaster");
                     if (transactionList.size() > 0) {
                         Peers.rebroadcastTransactions(transactionList);
                     }

diff --git a/src/java/nxt/peer/PeerImpl.java b/src/java/nxt/peer/PeerImpl.java
@@ -302,13 +302,6 @@ public JSONObject send(final JSONStreamAware request) {
         String log = null;
         boolean showLog = false;
         HttpURLConnection connection = null;
-
-        String txt = request.toString();
-        if(txt.length() > 250000)
-        {
-         Logger.logDebugMessage("About to upload a message that is " + txt.length() + " characters long");
-         Logger.logDebugMessage(txt);
-        }
 
         try {
 
@@ -339,8 +332,18 @@ public JSONObject send(final JSONStreamAware request) {
             try (Writer writer = new BufferedWriter(new OutputStreamWriter(cos, "UTF-8"))) {
                 request.writeJSONString(writer);
             }
+            long uploadVolume = cos.getCount();
+            if(uploadVolume > 250000)
+            {
+             Logger.logDebugMessage("About to upload a message that is " + uploadVolume + " characters long");
+            }
+
+
+
             updateUploadedVolume(cos.getCount());
 
+
+
             if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 CountingInputStream cis = new CountingInputStream(connection.getInputStream());
                 InputStream responseStream = cis;