[freenet-dev] Keys in logs.

[Tom Kaitchuck]

I don't think Freenet should reveal the a specific key in the logs, purely for 
anonymity reasons. Here is the first of several patches that will make sure 
than keys only get logged when debug logging is on.
diff -ruBb freenet.bak/freenet/src/freenet/client/InternalClient.java freenet/freenet/src/freenet/client/InternalClient.java
--- freenet.bak/freenet/src/freenet/client/InternalClient.java	2003-07-08 15:38:26.000000000 -0500
+++ freenet/freenet/src/freenet/client/InternalClient.java	2003-08-01 23:34:26.000000000 -0500
@@ -238,7 +238,10 @@
 			if(dcos.chunkPos > skipBytes) {
 			    skipBytes = dcos.chunkPos;
 			    if(skipBytes != 0)
+			    	if(Core.logger.shouldLog(Logger.DEBUG))
 				Core.logger.log(this, "Restarting InternalClient request for "+clientKey+", next pass will skip first "+skipBytes, Core.logger.MINOR);
+				else
+				Core.logger.log(this, "Restarting InternalClient request for a clientKey, next pass will skip first "+skipBytes, Core.logger.MINOR);
 			}
 		    }
 		}
diff -ruBb freenet.bak/freenet/src/freenet/node/states/FCP/ClientGetToken.java freenet/freenet/src/freenet/node/states/FCP/ClientGetToken.java
--- freenet.bak/freenet/src/freenet/node/states/FCP/ClientGetToken.java	2003-07-08 15:38:32.000000000 -0500
+++ freenet/freenet/src/freenet/node/states/FCP/ClientGetToken.java	2003-08-01 23:47:06.000000000 -0500
@@ -71,6 +71,10 @@
             sendMessage(msg);
             return null;
         } catch (KeyException e) {
+	if(!Core.logger.shouldLog(Logger.DEBUG))
+	    Core.logger.log(this, "ClientGetToken got "+e+" trying to decode a key",
+			    Logger.MINOR);
+	else
 	    Core.logger.log(this, "ClientGetToken got "+e+" trying to decode "+ckey,
 			    Logger.MINOR);
 	    ClientMessage msg = new Failed(id, "Data found, but could not start decode.");
diff -ruBb freenet.bak/freenet/src/freenet/transport/ThrottledSelectorLoop.java freenet/freenet/src/freenet/transport/ThrottledSelectorLoop.java
--- freenet.bak/freenet/src/freenet/transport/ThrottledSelectorLoop.java	2003-07-30 21:04:43.000000000 -0500
+++ freenet/freenet/src/freenet/transport/ThrottledSelectorLoop.java	2003-08-02 00:03:15.000000000 -0500
@@ -115,15 +115,23 @@
 							// Already thinks it is registered
 						}
 					} catch (CancelledKeyException e) {
+						if(Core.logger.shouldLog(Logger.DEBUG))
 						Core.logger.log(this, "Key ("+current+
 										") cancelled but not removed: "+e, e,
 										Logger.ERROR);
+						else
+						  Core.logger.log(this, "Key cancelled but not removed: "+e, e,
+										Logger.ERROR)
 						queueClose(current);
 						closed++;
 					} catch (ClosedChannelException e) {
+						if(Core.logger.shouldLog(Logger.DEBUG))
 						Core.logger.log(this, "Key ("+current+
 										") channel closed but not removed: "+e,
 										e, Logger.ERROR);
+						else
+						  Core.logger.log(this, "Key channel closed but not removed: "+e,
+										e, Logger.ERROR);
 						queueClose(current);
 						closed++;
 						continue;