remove DoS protection in remote search for intranet hosts

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7144 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/yacy/search.java

@@ -36,6 +36,7 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import net.yacy.cora.document.RSSMessage;
+import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.storage.WeakPriorityBlockingQueue.ReverseElement;
@@ -145,28 +146,31 @@ public final class search {
         
         // check the search tracker
         TreeSet<Long> trackerHandles = sb.remoteSearchTracker.get(client);
-        if (trackerHandles == null) trackerHandles = new TreeSet<Long>();
+        if (!Domains.isLocal(client)) {
-        boolean block = false;
+            if (trackerHandles == null) trackerHandles = new TreeSet<Long>();
-        synchronized (trackerHandles) {
+            boolean block = false;
-            if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() -   3000)).size() >  1) {
+            synchronized (trackerHandles) {
-                block = true;
+                if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() -   3000)).size() >  1) {
-            }
+                    block = true;
-            if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() -  60000)).size() > 12) {
+                }
-                block = true;
+                if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() -  60000)).size() > 12) {
+                    block = true;
+                }
+                if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() - 600000)).size() > 36) {
+                    block = true;
+                }
             }
-            if (trackerHandles.tailSet(Long.valueOf(System.currentTimeMillis() - 600000)).size() > 36) {
+            if (block) {
-                block = true;
+                prop.put("links", "");
+                prop.put("linkcount", "0");
+                prop.put("references", "");
+                prop.put("searchtime", "0");
+                return prop;
             }
         }
-        if (block) {
-            prop.put("links", "");
-            prop.put("linkcount", "0");
-            prop.put("references", "");
-            return prop;
-        }
         
         // tell all threads to do nothing for a specific time
-        sb.intermissionAllThreads(500);
+        sb.intermissionAllThreads(100);
 
         EventTracker.delete(EventTracker.EClass.SEARCH);
         final HandleSet abstractSet = ((abstracts.length() == 0) || (abstracts.equals("auto"))) ? null : QueryParams.hashes2Set(abstracts);