Validate port/IP in received peer tests

history.txt

@@ -8,6 +8,7 @@
  * SSU:
    - Throttle outbound destroys on shutdown
    - Limit outbound introduction offers
+   - Validate port/IP in received peer tests
 
 2012-10-05 zzz
  * configservice.jsp: Add GC button

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/transport/udp/PeerTestManager.java

@@ -437,7 +437,14 @@ class PeerTestManager {
         PeerTestState state = _activeTests.get(Long.valueOf(nonce));
         
         if (state == null) {
-            if ( (testIP == null) || (testPort <= 0) ) {
+            // NEW TEST
+            if ((testPort > 0 && (testPort < 1024 || testPort > 65535)) ||
+                (testIP != null && !_transport.isValid(testIP))) {
+                // spoof check, and don't respond to privileged ports
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Invalid IP/Port rcvd in PeerTest: " + Addresses.toString(testIP, testPort));
+                return;
+            } else if ( (testIP == null) || (testPort <= 0) ) {
                 // we are bob, since we haven't seen this nonce before AND its coming from alice
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("test IP/port are blank coming from " + from + ", assuming we are Bob and they are alice");
@@ -455,6 +462,7 @@ class PeerTestManager {
                 }
             }
         } else {
+            // EXISTING TEST
             if (state.getOurRole() == PeerTestState.BOB) {
                 if (DataHelper.eq(from.getIP(), state.getAliceIP().getAddress()) && 
                     (from.getPort() == state.getAlicePort()) ) {