From da8f49a71263ead65eb3b5fb88889ff119516a58 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 23 Apr 2020 18:56:03 +0000
Subject: [PATCH] Router: GarlicMessage debug logging improvements

---
 .../java/src/net/i2p/data/i2np/GarlicMessage.java   |  7 ++++---
 .../i2p/router/message/GarlicMessageBuilder.java    | 13 ++++++-------
 .../i2p/router/message/GarlicMessageReceiver.java   |  8 +++-----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java
index f02ad636d..b85bc290c 100644
--- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java
+++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java
@@ -81,9 +81,10 @@ public class GarlicMessage extends FastI2NPMessageImpl {
     @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
-        buf.append("[GarlicMessage: ");
-        buf.append("Data length: ").append(getData().length).append(" bytes");
-        buf.append("]");
+        buf.append("[GarlicMessage " +
+                   "ID: ").append(getUniqueId())
+           .append(" Data: ").append(_data.length).append(" bytes" +
+                   "]");
         return buf.toString();
     }
 }
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
index 9cd344134..6c44b77f3 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
@@ -238,11 +238,8 @@ public class GarlicMessageBuilder {
                 log.debug("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
             return null;
         }
-        
-        if (log.shouldLog(Log.DEBUG))
-            log.debug("CloveSet (" + config.getCloveCount() + " cloves) for message " + msg.getUniqueId() + " is " + cloveSet.length
-                     + " bytes and encrypted message data is " + encData.length + " bytes");
-        
+        if (log.shouldDebug())
+            log.debug("Built ElG CloveSet (" + config.getCloveCount() + " cloves " + cloveSet.length + " bytes) in " + msg);
         return msg;
     }
     
@@ -266,6 +263,9 @@ public class GarlicMessageBuilder {
             return null;
         msg.setData(encData);
         msg.setMessageExpiration(config.getExpiration());
+        Log log = ctx.logManager().getLog(GarlicMessageBuilder.class);
+        if (log.shouldDebug())
+            log.debug("Built ECIES CloveSet (" + config.getCloveCount() + " cloves) in " + msg);
         return msg;
     }
     
@@ -329,8 +329,7 @@ public class GarlicMessageBuilder {
             return null;
         }
         if (log.shouldDebug())
-            log.debug("CloveSet (" + config.getCloveCount() + " cloves) for message " + msg.getUniqueId()
-                     + " encrypted message data is " + encData.length + " bytes");
+            log.debug("Built ECIES CloveSet (" + config.getCloveCount() + " cloves) in " + msg);
         return msg;
     }
     
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java b/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java
index 1873c7e99..8d7ec11e2 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageReceiver.java
@@ -77,7 +77,7 @@ public class GarlicMessageReceiver {
                 }
             } else {
                 if (_log.shouldLog(Log.WARN))
-                    _log.warn("Not trying to decrypt a garlic routed message to a disconnected client");
+                    _log.warn("Not decrypting " + message + " for disconnected " + _clientDestination.toBase32());
                 return;
             }
         } else {
@@ -99,10 +99,8 @@ public class GarlicMessageReceiver {
         } else {
             if (_log.shouldLog(Log.WARN)) {
                 String d = (_clientDestination != null) ? _clientDestination.toBase32() : "the router";
-                _log.warn("CloveMessageParser failed to decrypt the " + message.getData().length +
-                          " byte message [" + message.getUniqueId() 
-                           + "] for " + d + " with key " + decryptionKey.getType(),
-                          new Exception("Decrypt garlic failed"));
+                String keys = (decryptionKey2 != null) ? "both ElGamal and ECIES keys" : decryptionKey.getType().toString();
+                _log.warn("Failed to decrypt " + message + " for " + d + " with " + keys);
             }
             _context.statManager().addRateData("crypto.garlic.decryptFail", 1);
             _context.messageHistory().messageProcessingError(message.getUniqueId(),