I still need to update the surefire plugin to set -Djdk.map.althashin…

…g.threshold=10
boonproject · May 14, 2014 · fa4c649 · fa4c649
1 parent 3742f88
commit fa4c649
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/src/main/java/org/boon/collections/LazyMap.java b/src/main/java/org/boon/collections/LazyMap.java
@@ -28,6 +28,7 @@
 
 package org.boon.collections;
 
+import org.boon.core.Sys;
 import org.boon.primitive.Arry;
 import org.boon.Maps;
 
@@ -124,7 +125,14 @@ public Object get( Object key ) {
 
     private void buildIfNeeded() {
         if ( map == null ) {
-            map = new LinkedHashMap<>( size, 0.01f );
+
+            /** added to avoid hash collision attack. */
+            if (Sys.is1_7OrLater() && System.getProperty("jdk.map.althashing.threshold") != null) {
+                map = new LinkedHashMap<>( size, 0.01f );
+            } else {
+                map = new TreeMap<>();
+            }
+
             for ( int index = 0; index < size; index++ ) {
                 map.put( keys[ index ], values[ index ] );
             }

diff --git a/src/main/java/org/boon/core/value/LazyValueMap.java b/src/main/java/org/boon/core/value/LazyValueMap.java
@@ -28,6 +28,7 @@
 
 package org.boon.core.value;
 
+import org.boon.core.Sys;
 import org.boon.core.Value;
 import org.boon.primitive.Arry;
 
@@ -214,7 +215,14 @@ public Set<Entry<String, Object>> entrySet() {
 
     private final void buildMap() {
 
-        map = new HashMap<>( items.length );
+
+        /** added to avoid hash collision attack. */
+        if (Sys.is1_7OrLater() && System.getProperty("jdk.map.althashing.threshold") != null) {
+            map = new HashMap<>( items.length );
+        } else {
+            map = new TreeMap<>();
+        }
+
 
         for ( Entry<String, Value> miv : items ) {
             if ( miv == null ) {

diff --git a/src/test/java/com/examples/EvilJsonParse.java b/src/test/java/com/examples/EvilJsonParse.java
@@ -30,6 +30,9 @@
 import org.boon.IO;
 import org.boon.json.JsonParserAndMapper;
 import org.boon.json.JsonParserFactory;
+
+import java.util.Map;
+
 import static org.boon.Boon.puts;
 
 /**
@@ -41,11 +44,19 @@ public static void main (String... args) {
         long start;
         long stop;
         long time;
+
+
         final String json = IO.read("/Users/Richard/dos_100000.json"); //talking IO time out of the equation
         final JsonParserAndMapper mapper = new JsonParserFactory().create();
 
         start = System.nanoTime();
-        Employee employee = mapper.parse(Employee.class, json);
+
+        final Map<String,Object> map = mapper.parseMap(json);
+
+        map.size();
+
+
+
         stop = System.nanoTime();
         time = (stop - start) / 1_000_000; //milli-seconds
         puts ("time", time, "ms");