mu 5.7.15 → 5.7.16

data/lib/mu/command/cmd_musl.rb

@@ -62,10 +62,10 @@ class Mu
                     # Get har object and hosts
                     har_file     = @options.har_files[0]
                     @har         = Har.new har_file, @options, @ignores
-                    msl_file     = File.open(@options.scenario,'w')
-                    created_musl = @har.generate msl_file
-                    msl_file.write created_musl
-                    msl_file.close
+                    File.open(@options.scenario,'w') do |file|
+                        created_musl = @har.generate file
+                        file.write created_musl
+                    end
                     puts "You have successfully generated a scenario: #{@options.scenario}"
                 else
                     # Handle failure logic here

data/lib/mu/har.rb

@@ -109,11 +109,15 @@ class Har
                 m['url']['pathname'] = m['url_object'].path || '/'
                 m["url"]["search"]   = m["url_object"].query    || ''
                 m["url"]["hash"]     = m["url_object"].fragment || ''
+                require 'pp'
+                #pp entry if entry['request']['headers'].length < 1
+                #raise "die" if entry['request']['headers'].length < 1
 
                 # Create the host entry hash with underscores instead of dots for the host value
                 entry['request']['headers'].each do |header|
                     if (!host && header['name'].downcase === 'host')
                         host = header['value']
+
                         # Set the hosts_seen value to host_count and increment the host_count unless we have already seen the host
                         hosts_seen[host] += host_count && host_count += 1 unless hosts_seen.has_key?(host)
                         
@@ -124,10 +128,10 @@ class Har
                         if entry['musl'][host].match /^[0-9]/
                             entry['musl'][host] = 'host_' + entry['musl'][host]
                         end
-
                     end
                 end
-
+                # request-headers are empty
+                next if host.nil? && entry['musl'][host].nil?
                 @hosts[host] = entry['musl'][host]
                 entry['musl']['host'] = entry['musl'][host]
 
@@ -263,7 +267,7 @@ class Har
             m      = entry['musl']
             req    = entry['request']
             res    = entry['response']
-            next if m.nil?
+            next if m.nil? || m['host'].nil?
 
             xopts  = { 'src' => '&host_0', 'dst' => '&' + "#{m['host']}" }
             xklass = m['url_object'].scheme === 'http' ? 'tcp' : 'ssl'
@@ -330,9 +334,16 @@ class Har
 
                 if (res['cookies'] && res['cookies'].length > 0)
                     cr.variables do |vs|
+                        seen = {}
                         res['cookies'].each do |cookie|
+                            # Check to make sure we are not repeating a variable name
+                            repeated = '@' + cookie['name'].gsub(/[^a-zA-Z0-9_]/, '_') + ' = ' + '/' + cookie['name'] + '=([^;]*)' + '/:1'
+                            next if seen.has_key?(repeated)
+                            seen[repeated] = cookie
+                            # Build the variable
                             vs.create('@' + cookie['name'].gsub(/[^a-zA-Z0-9_]/, '_') + ' = ' + '/' + cookie['name'] + '=([^;]*)' + '/:1')
                         end
+                        
                     end
                 end
             end
@@ -417,6 +428,7 @@ class Har
             end
             cs_send.literal_no_format("\"");
         else
+            payload.gsub!(/#\{|##\{/, "\\x23{")
             cs_send.literal_no_format("\"" + self.escape(payload) + "\"")
         end
 

data/version.rb

@@ -1 +1 @@
-VERSION='5.7.15'
+VERSION='5.7.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mu
 version: !ruby/object:Gem::Version
-  version: 5.7.15
+  version: 5.7.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-19 00:00:00.000000000 -07:00
+date: 2011-04-21 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21338260 !ruby/object:Gem::Requirement
+  requirement: &12873620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *21338260
+  version_requirements: *12873620
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &21337780 !ruby/object:Gem::Requirement
+  requirement: &12873160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *21337780
+  version_requirements: *12873160
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &21337320 !ruby/object:Gem::Requirement
+  requirement: &12872700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *21337320
+  version_requirements: *12872700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21336920 !ruby/object:Gem::Requirement
+  requirement: &12872320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21336920
+  version_requirements: *12872320
 - !ruby/object:Gem::Dependency
   name: hexy
-  requirement: &21336340 !ruby/object:Gem::Requirement
+  requirement: &12871780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21336340
+  version_requirements: *12871780
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &21335800 !ruby/object:Gem::Requirement
+  requirement: &12871280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *21335800
+  version_requirements: *12871280
 description: ! "The Mu gem allows users to include mu libraries within scripts\n    that
   interact with mu appliance software. The gem also supplies command line interfaces\n
   \   to many of these same libraries"