Make sure that version number resembles a valid API version

i2p · Apr 22, 2024 · 2b36361 · 2b36361
1 parent b0f4e69
commit 2b36361
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/core/java/src/net/i2p/util/VersionComparator.java b/core/java/src/net/i2p/util/VersionComparator.java
@@ -115,4 +115,16 @@ private static long parseLong(String s, int start, int end) {
             return -1;
         return rv;
     }
+
+    /**
+     * Validate an API version string.
+     * 
+     * @param version
+     * @return true if valid
+     */
+    public static boolean isValid(String version) {
+        if (version.split(".").length != 3)
+            return false;
+        return true;
+    }
 }
diff --git a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
@@ -39,6 +39,7 @@
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleByteCache;
+import net.i2p.util.VersionComparator;
 
 /**
  *
@@ -793,6 +794,7 @@ protected void releaseBufs(boolean isVerified) {
      * get a list of caps and versions which should be soft-banned from the router.config file
      * 
      * @since 0.5.63
+     * @return a map of caps and versions
      */
     private HashMap<String, String> banCapsForVersion() {
         HashMap caps = new HashMap<String, String>();
@@ -801,7 +803,13 @@ private HashMap<String, String> banCapsForVersion() {
         String[] pairs = _context.getProperty("router.banVersionCaps", "0.9.56:LU").split(",");
         for (String pair : pairs) {
             String[] split = pair.split(":");
-            if (split.length == 2) caps.put(split[0], split[1]);
+            if (split.length == 2) {
+                String validatedVersion = split[0];
+                if (!VersionComparator.isValid(validatedVersion))
+                    continue;
+                String validatedCaps = split[1];
+                caps.put(validatedVersion, validatedCaps);
+            }
         }
         return caps;
     }

diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
@@ -1050,7 +1050,9 @@ public synchronized void queuePossibleDataPacket(UDPPacket packet) {
     /**
      * get a list of caps and versions which should be soft-banned from the router.config file
      * 
-     * @since 0.5.63
+     * 
+     * @since 0.9.63
+     * @return a map of caps and versions
      */
     private HashMap<String, String> banCapsForVersion() {
         HashMap caps = new HashMap<String, String>();
@@ -1059,7 +1061,13 @@ private HashMap<String, String> banCapsForVersion() {
         String[] pairs = _context.getProperty("router.banVersionCaps", "0.9.56:LU").split(",");
         for (String pair : pairs) {
             String[] split = pair.split(":");
-            if (split.length == 2) caps.put(split[0], split[1]);
+            if (split.length == 2) {
+                String validatedVersion = split[0];
+                if (!VersionComparator.isValid(validatedVersion))
+                    continue;
+                String validatedCaps = split[1];
+                caps.put(validatedVersion, validatedCaps);
+            }
         }
         return caps;
     }