stella 0.7.5.001 → 0.7.6.001

data/CHANGES.txt

@@ -1,6 +1,12 @@
 STELLA, CHANGES
 
 
+#### 0.7.6 (2009-11-24) ###############################
+
+* FIXED: httpclient fix: use full request URI (i.e. path and query string) in authentication (NOTE: SSPINegotiateAuth and NegotiateAuth not tested)
+* FIXED: Use request URI in authentication domain
+
+
 #### 0.7.5 (2009-11-16) ###############################
 
 * FIXED: Correctly capture exceptions in Client

data/lib/stella/cli.rb

@@ -36,14 +36,19 @@ class Stella::CLI < Drydock::Command
     [:'disable-templates', :'disable-stats'].each do |opt|
       opts[opt] = @global.send(opt) unless @global.send(opt).nil?
     end
+    
     case @global.engine
     when "package"
       ret = Stella::Engine::LoadPackage.run @testplan, opts
     when "create" 
       ret = Stella::Engine::LoadCreate.run @testplan, opts
+    when "em" 
+      ret = Stella::Engine::LoadEventMachine.run @testplan, opts
     else 
       ret = Stella::Engine::LoadQueue.run @testplan, opts
     end
+    Stella.ld "ENGINE: #{@global.engine}: #{ret.class}"
+    
     @exit_code = (ret ? 0 : 1)
   end
   

data/lib/stella/client.rb

@@ -1,5 +1,6 @@
 require "observer"
 require "nokogiri"
+require 'pp'
 
 Stella::Utils.require_vendor "httpclient", '2.1.5.2'
 
@@ -51,11 +52,12 @@ module Stella
           container.params, container.headers = params, headers
         
           uri = build_request_uri req.uri, params, container
-        
+          
           if http_auth = usecase.http_auth || req.http_auth
             # TODO: The first arg is domain and can include a URI path. 
             #       Are there cases where this is important?
-            domain = '%s://%s%s' % [uri.scheme, uri.host, '/'] #File.dirname(uri.path)
+            domain = '%s://%s:%d%s' % [uri.scheme, uri.host, uri.port, req.uri] 
+            Stella.ld "DOMAIN " << domain
             user, pass = http_auth.user, http_auth.pass
             user = container.instance_eval &user if Proc === user
             pass = container.instance_eval &pass if Proc === pass
@@ -72,7 +74,7 @@ module Stella
         
           container.unique_id = stella_id
           params['__stella'] = headers['X-Stella-ID'] = container.unique_id[0..10]
-        
+          
           meth = req.http_method.to_s.downcase
           Stella.ld "#{req.http_method}: " << "#{req.uri} " << params.inspect
         
@@ -178,7 +180,7 @@ module Stella
       }
       http_client = HTTPClient.new opts
       http_client.set_proxy_auth(@proxy.user, @proxy.pass) if @proxy.user
-      http_client.debug_dev = STDOUT if Stella.debug? && Stella.stdout.lev > 3
+      http_client.debug_dev = STDOUT if Stella.debug? 
       http_client.protocol_version = "HTTP/1.1"
       http_client.ssl_config.verify_mode = ::OpenSSL::SSL::VERIFY_NONE
       http_client

data/lib/stella/common.rb

@@ -3,7 +3,6 @@
 $KCODE = "u" if RUBY_VERSION =~ /^1.8/
 
 
-
 # Assumes Time::Units and Numeric mixins are available. 
 
 class String
@@ -26,6 +25,14 @@ class Thread
   attic :stats
 end
 
+# Fix for eventmachine in Ruby 1.9
+class Thread
+  unless method_defined? :kill!
+    def kill!(*args) kill( *args) end
+  end
+end
+
+
 class Time
   module Units
     PER_MICROSECOND = 0.000001.freeze

data/lib/stella/engine/load_em.rb

@@ -0,0 +1,139 @@
+require 'eventmachine'
+
+module Stella::Engine
+  module LoadEventMachine
+    extend Stella::Engine::Base
+    extend Stella::Engine::Load
+    extend self
+    
+    def execute_test_plan(packages, reps=1,duration=0,arrival=nil)
+      time_started = Time.now
+
+      pqueue = Queue.new
+      packages.each { |p| pqueue << p  }
+
+      @real_reps += 1  # Increments when duration is specified.
+      @threads = []
+      
+      
+      EM.run{
+        
+        conn = EM::Protocols::HttpClient2.connect 'solutious.com', 80
+
+        req = conn.get('/')
+        req.callback{ |response|
+          p(response.status)
+          p(response.headers)
+          #p(response.content)
+        }
+        
+        operation = proc {
+          # perform a long-running operation here, such as a database query.
+          "result" # as usual, the last expression evaluated in the block will be the return value.
+        }
+        callback = proc {|result|
+          # do something with result here, such as send it back to a network client.
+        }
+
+        t = EventMachine.defer( operation, callback )
+
+        sleep 0.1
+        
+        EM.stop 
+      }
+      
+    end
+    
+  end
+  
+  module LoadQueue2
+    extend Stella::Engine::Base
+    extend Stella::Engine::Load
+    extend self
+    ROTATE_TIMELINE = 15
+    def execute_test_plan(packages, reps=1,duration=0,arrival=nil)
+      time_started = Time.now
+      
+      pqueue = Queue.new
+      packages.each { |p| pqueue << p  }
+      
+      @real_reps += 1  # Increments when duration is specified.
+      @threads = []
+      packages.size.times {
+        @max_clients += 1
+        @threads << Thread.new do
+          package = pqueue.pop
+          Thread.current[:real_reps] = 0
+          Thread.current[:real_uctime] = Benelux::Stats::Calculator.new
+          c, uc = package.client, package.usecase
+          Stella.stdout.info4 $/, "======== THREAD %s: START" % [c.digest.short]  
+
+          # This thread will stay on this one track. 
+          Benelux.current_track c.digest
+          
+          Benelux.add_thread_tags :usecase => uc.digest_cache
+          Thread.current[:real_uctime].first_tick
+          prev_ptime ||= Time.now
+          reps.times { |rep| 
+            break if Stella.abort?
+            Thread.current[:real_reps] += 1
+            args = [c.digest.short, uc.desc, uc.digest.short, Thread.current[:real_reps]]
+            Stella.stdout.info4 $/, "======== THREAD %s: %s:%s (rep: %d)" % args
+            
+            Benelux.add_thread_tags :rep =>  rep
+            #Stella.stdout.info [package.client.gibbler.shorter, package.usecase.gibbler.shorter, rep].inspect
+            Stella::Engine::Load.rescue(c.digest_cache) {
+              break if Stella.abort?
+              print '.' if Stella.stdout.lev == 2
+              stats = c.execute uc
+            }
+            Benelux.remove_thread_tags :rep
+            
+            Thread.current[:real_uctime].tick
+            time_elapsed = (Time.now - time_started).to_i
+            
+            if (Time.now - prev_ptime).to_i >= ROTATE_TIMELINE
+              prev_ptime, ruct = Time.now, Thread.current[:real_uctime]
+              if Stella.stdout.lev >= 2 && Thread.current == @threads.first 
+                args = [time_elapsed.to_i, ruct.n, ruct.mean, ruct.sd]
+                Stella.stdout.info2 $/, "REAL UC TIME: %ds (reps: %d): %.4fs %.4f(SD)" % args
+              end
+              
+              Thread.current.rotate_timeline
+            end
+            
+            # If a duration was given, we make sure 
+            # to run for only that amount of time.
+            if duration > 0
+              break if (time_elapsed+Thread.current[:real_uctime].mean) >= duration
+              redo if (time_elapsed+Thread.current[:real_uctime].mean) <= duration
+            end
+          }
+          
+          Benelux.remove_thread_tags :usecase
+          
+          pqueue << package  # return the package to the queue
+        end
+        
+        unless arrival.nil?
+          # Create 1 second / users per second 
+          args = [1/arrival, @threads.size, packages.size]
+          Stella.stdout.info2 $/, "======== ARRIVAL (%s): %s of %s" % args
+          sleep 1/arrival
+        end
+      }
+      
+      repscalc = Benelux::Stats::Calculator.new
+      @threads.each { |t| t.join } # wait
+      @threads.each { |t| repscalc.sample(t[:real_reps]) }
+      @real_reps = repscalc.mean.to_i
+      
+      #Stella.stdout.info "*** REPETITION #{@real_reps} of #{reps} ***"
+      
+      Stella.stdout.info2 $/, $/
+    end
+    
+    Benelux.add_timer Stella::Engine::LoadEventMachine, :execute_test_plan
+    
+  end
+end

data/lib/stella/engine.rb

@@ -86,6 +86,7 @@ module Stella::Engine
   autoload :LoadPackage, 'stella/engine/load_package'
   autoload :LoadCreate, 'stella/engine/load_create'
   autoload :LoadQueue, 'stella/engine/load_queue'
+  autoload :LoadEventMachine, 'stella/engine/load_em'
   
   # These timers are interesting from a reporting perspective.
   Benelux.add_counter    Stella::Client, :execute_response_handler

data/lib/stella.rb

@@ -21,7 +21,7 @@ module Stella
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 5.freeze
+      TINY  = 6.freeze
       PATCH = '001'.freeze 
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end

data/stella.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.5.001"
+  s.version = "0.7.6.001"
   s.summary = "Blame Stella for breaking your web applications."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -48,6 +48,7 @@
   lib/stella/engine.rb
   lib/stella/engine/functional.rb
   lib/stella/engine/load_create.rb
+  lib/stella/engine/load_em.rb
   lib/stella/engine/load_package.rb
   lib/stella/engine/load_queue.rb
   lib/stella/engine/loadbase.rb

data/vendor/httpclient-2.1.5.2/httpclient/auth.rb

@@ -113,7 +113,7 @@ class HTTPClient
       command = nil
       if res.status == HTTP::Status::UNAUTHORIZED
         if challenge = parse_authentication_header(res, 'www-authenticate')
-          uri = req.header.request_uri
+          uri = req.header.create_request_uri
           challenge.each do |scheme, param_str|
             @authenticator.each do |auth|
               if scheme.downcase == auth.scheme.downcase
@@ -240,7 +240,7 @@ class HTTPClient
     # * child page of challengeable(got *Authenticate before) uri and,
     # * child page of defined credential
     def get(req)
-      target_uri = req.header.request_uri
+      target_uri = req.header.create_request_uri
       return nil unless @challengeable.find { |uri, ok|
         Util.uri_part_of(target_uri, uri) and ok
       }
@@ -292,7 +292,7 @@ class HTTPClient
     # * child page of challengeable(got *Authenticate before) uri and,
     # * child page of defined credential
     def get(req)
-      target_uri = req.header.request_uri
+      target_uri = req.header.create_request_uri
       param = Util.hash_find_value(@challenge) { |uri, v|
         Util.uri_part_of(target_uri, uri)
       }
@@ -301,8 +301,8 @@ class HTTPClient
         Util.uri_part_of(target_uri, uri)
       }
       return nil unless user
-      uri = req.header.request_uri
-      calc_cred(req.header.request_method, uri, user, passwd, param)
+      path = req.header.create_request_path
+      calc_cred(req.header.request_method, path, user, passwd, param)
     end
 
     # Challenge handler: remember URL and challenge token for response.
@@ -317,9 +317,9 @@ class HTTPClient
     # http://tools.assembla.com/breakout/wiki/DigestForSoap
     # Thanks!
     # supported algorithm: MD5 only for now
-    def calc_cred(method, uri, user, passwd, param)
+    def calc_cred(method, path, user, passwd, param)
       a_1 = "#{user}:#{param['realm']}:#{passwd}"
-      a_2 = "#{method}:#{uri.path}"
+      a_2 = "#{method}:#{path}"
       nonce = param['nonce']
       cnonce = generate_cnonce()
       @nonce_count += 1
@@ -334,7 +334,7 @@ class HTTPClient
       header << "username=\"#{user}\""
       header << "realm=\"#{param['realm']}\""
       header << "nonce=\"#{nonce}\""
-      header << "uri=\"#{uri.path}\""
+      header << "uri=\"#{path}\""
       header << "cnonce=\"#{cnonce}\""
       header << "nc=#{'%08x' % @nonce_count}"
       header << "qop=\"#{param['qop']}\""
@@ -407,7 +407,7 @@ class HTTPClient
     # See ruby/ntlm for negotiation state transition.
     def get(req)
       return nil unless NTLMEnabled
-      target_uri = req.header.request_uri
+      target_uri = req.header.create_request_uri
       domain_uri, param = @challenge.find { |uri, v|
         Util.uri_part_of(target_uri, uri)
       }
@@ -482,7 +482,7 @@ class HTTPClient
     # See win32/sspi for negotiation state transition.
     def get(req)
       return nil unless SSPIEnabled
-      target_uri = req.header.request_uri
+      target_uri = req.header.create_request_uri
       domain_uri, param = @challenge.find { |uri, v|
         Util.uri_part_of(target_uri, uri)
       }

data/vendor/httpclient-2.1.5.2/httpclient/http.rb

@@ -287,7 +287,17 @@ module HTTP
       def [](key)
         get(key).collect { |item| item[1] }
       end
-
+      
+      def create_request_uri
+        path = create_request_path
+        r = "#{ @request_uri.scheme }://#{ @request_uri.host }:#{ @request_uri.port }#{ path }"
+        URI.parse r
+      end
+      
+      def create_request_path
+        create_query_uri(@request_uri, @request_query)
+      end
+      
     private
 
       def request_line
@@ -379,7 +389,7 @@ module HTTP
             query_str = Message.create_query_part_str(query)
           end
         end
-        if query_str
+        if !query_str.nil? && !query_str.empty?
           path += "?#{query_str}"
         end
         path

data/vendor/httpclient-2.1.5.2/httpclient/session.rb

@@ -123,7 +123,7 @@ class HTTPClient
       @send_timeout = 120
       @receive_timeout = 60       # For each read_block_size bytes
       @read_block_size = 1024 * 16 # follows net/http change in 1.8.7
-      @protocol_retry_count = 5
+      @protocol_retry_count = 2
 
       @ssl_config = nil
       @test_loopback_http_response = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.5.001
+  version: 0.7.6.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/stella/engine.rb
 - lib/stella/engine/functional.rb
 - lib/stella/engine/load_create.rb
+- lib/stella/engine/load_em.rb
 - lib/stella/engine/load_package.rb
 - lib/stella/engine/load_queue.rb
 - lib/stella/engine/loadbase.rb