[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/net/IPRange.java test/...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 14 10:49:06 2014
New Revision: 682

URL: http://svn.shibboleth.net/view/utilities?rev=682&view=rev
Log:
JSPT-49 - array bounds exception in IPRange parser

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java?rev=682&r1=681&r2=682&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java Fri Nov 14 10:49:06 2014
@@ -173,6 +173,9 @@
         }
 
         String[] blockParts = block.split("/");
+        if (blockParts.length != 2) {
+            throw new IllegalArgumentException("CIDR block definition is invalid, check for missing or extra slash");
+        }
         try {
             validateIPAddress(blockParts[0]);
             InetAddress address = InetAddress.getByName(blockParts[0]);

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java?rev=682&r1=681&r2=682&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java Fri Nov 14 10:49:06 2014
@@ -31,6 +31,8 @@
         testInvalid("1234:5678:90ab:cdef:FfFf:AaAa:BBBB:GHIJ/128");
         testInvalid("/32");
         testInvalid("f/32");
+        testInvalid("1.2.3.4");
+        testInvalid("1.2.3.4/32/1");
         
         try{
             new IPRange(new byte[]{1, 2 ,3}, 32);