boris 1.0.1 → 1.0.2

data/lib/boris/errors.rb

@@ -1,17 +1,21 @@
 module Boris
-  class MissingCredentials < Exception; end
 
   class ConnectionFailed < StandardError; end
 
   class ConnectionAlreadyActive < StandardError; end
 
+  class InvalidCredentials < ConnectionFailed; end
+
+  class InvalidOption < StandardError; end
+
+  class InvalidTargetName < StandardError; end
+
+  class MissingCredentials < Exception; end
+
   class NoActiveConnection < StandardError; end
 
   class NoProfilerDetected < StandardError; end
 
-  class InvalidOption < StandardError; end
-
-  class InvalidCredentials < ConnectionFailed; end
+  class PasswordExpired < StandardError; end
 
-  class InvalidTargetName < StandardError; end
 end

data/lib/boris/helpers.rb

@@ -0,0 +1,7 @@
+require 'boris/helpers/array'
+require 'boris/helpers/constants'
+require 'boris/helpers/hash'
+require 'boris/helpers/network'
+require 'boris/helpers/scrubber'
+require 'boris/helpers/string'
+require 'boris/helpers/time'

data/lib/boris/helpers/array.rb

@@ -1,9 +1,9 @@
 class Array
-  def strip_string_values_in_array
+  def clean_string_values_in_array
     self.map! do |val|
-      val.strip_string_values_in_array if val.is_a?(Array)
-      val.strip_string_values_in_hash if val.is_a?(Hash)
-      val.is_a?(String) ? val.strip : val
+      val.clean_string_values_in_array if val.is_a?(Array)
+      val.clean_string_values_in_hash if val.is_a?(Hash)
+      val.is_a?(String) ? val.strip.clean_string : val
     end
   end
   

data/lib/boris/helpers/constants.rb

@@ -18,6 +18,15 @@ module Boris
   VENDOR_SUSE       = 'SUSE Linux GmbH'
   VENDOR_VMWARE     = 'VMware, Inc.'
 
-  PORT_DEFAULTS = {:ssh=>22, :wmi=>135}
-  VALID_CONNECTION_TYPES = [:snmp, :ssh, :wmi]
+  PORT_DEFAULTS           = {:ssh=>22, :wmi=>135}
+  VALID_CONNECTION_TYPES  = [:snmp, :ssh, :wmi]
+
+  CONN_FAILURE_AUTH_FAILED        = 'authentication failed'
+  CONN_FAILURE_HOST_KEY_MISMATCH  = 'connection failed (ssh: host key mismatch)'
+  CONN_FAILURE_NO_HOST            = 'connection failed (no such host)'
+  CONN_FAILURE_RPC_FILTERED       = 'connection failed (wmi: rpc calls canceled by remote message filter)'
+  CONN_FAILURE_RPC_UNAVAILABLE    = 'connection failed (wmi: rpc server unavailable)'
+  CONN_FAILURE_LOCAL_CREDENTIALS  = 'connection failed (wmi: credentials used locally, will try again)'
+  CONN_FAILURE_PASSWORD_EXPIRED   = 'connection failed (password expired, requires changing)'
+
 end

data/lib/boris/helpers/hash.rb

@@ -1,8 +1,8 @@
 class Hash
-  def strip_string_values_in_hash
+  def clean_string_values_in_hash
     self.each_pair do |key, val|
-      val.strip_string_values_in_array if val.is_a?(Array)
-      self[key] = val.strip if val.is_a?(String)
+      val.clean_string_values_in_array if val.is_a?(Array)
+      self[key] = val.strip.clean_string if val.is_a?(String)
     end
   end
 end

data/lib/boris/helpers/scrubber.rb

@@ -10,24 +10,26 @@ module Boris
         @installed_services,
         @local_user_groups,
         @network_interfaces
-      ].each {|arr| arr.strip_string_values_in_array}
+      ].collect {|arr| arr.clean_string_values_in_array if arr}
       debug 'string values from within data arrays cleaned up'
 
-      [@hardware, @network_id, @operating_system].each {|h| h.strip_string_values_in_hash}
+      [@hardware, @network_id, @operating_system].collect {|h| h.clean_string_values_in_hash if h}
       debug 'string values from within data hashes cleaned up'
 
-      @installed_applications.each do |app|
+      @installed_applications.collect do |app|
         app[:license_key].upcase! unless !app[:license_key]
-        app[:name].string_clean
+        app[:name].clean_string
         app[:vendor].format_vendor unless !app[:vendor]
-      end
+      end if @installed_applications
       debug 'installed application data cleaned up'
 
-      @network_id[:hostname].upcase!
-      @network_id[:domain].downcase! unless !@network_id[:domain]
+      if @network_id
+        @network_id[:hostname].upcase! unless !@network_id[:hostname]
+        @network_id[:domain].downcase! unless !@network_id[:domain]
+      end
       debug 'network id data cleaned up'
 
-      @network_interfaces.each do |interface|
+      @network_interfaces.collect do |interface|
         interface[:fabric_name].downcase! unless !interface[:fabric_name]
         interface[:mac_address].upcase! unless !interface[:mac_address]
         interface[:model] = interface[:model].format_model unless !interface[:model]
@@ -35,16 +37,21 @@ module Boris
         interface[:port_wwn].downcase! unless !interface[:port_wwn]
         interface[:remote_mac_address].upcase! unless !interface[:remote_mac_address]
         interface[:vendor] = interface[:vendor].format_vendor unless !interface[:vendor]
-      end
+      end if @network_interfaces
       debug 'network interface data cleaned up'
 
-      @hardware[:cpu_vendor] = @hardware[:cpu_vendor].string_clean.format_vendor unless !@hardware[:cpu_vendor]
-      @hardware[:model] = @hardware[:model].format_model unless !@hardware[:model]
-      @hardware[:serial] = @hardware[:serial].format_serial unless !@hardware[:serial]
-      @hardware[:vendor] = @hardware[:vendor].string_clean.format_vendor unless !@hardware[:vendor]
+      if @hardware
+        @hardware[:cpu_model] = @hardware[:cpu_model].clean_string unless !@hardware[:cpu_model]
+        @hardware[:cpu_vendor] = @hardware[:cpu_vendor].clean_string.format_vendor unless !@hardware[:cpu_vendor]
+        @hardware[:model] = @hardware[:model].format_model unless !@hardware[:model]
+        @hardware[:serial] = @hardware[:serial].format_serial unless !@hardware[:serial]
+        @hardware[:vendor] = @hardware[:vendor].clean_string.format_vendor unless !@hardware[:vendor]
+      end
       debug 'hardware data cleaned up'
 
-      @operating_system[:license_key].upcase! unless !@operating_system[:license_key]
+      if @operating_system
+        @operating_system[:license_key].upcase! unless !@operating_system[:license_key]
+      end
       debug 'operating system data cleaned up'
 
       debug 'data scrubbing complete'

data/lib/boris/helpers/string.rb

@@ -148,7 +148,7 @@ class String
   def format_serial
     return nil if self =~ /(^$|\(*none\)*)/i
 
-    self.string_clean.upcase
+    self.clean_string.upcase
   end
 
   # Attempts to grab the hardware vendor name from self and formats it for
@@ -186,30 +186,6 @@ class String
     vendor.strip
   end
 
-  # Allows you to specify your own delimiter to grab the string value found
-  # after the last delimiter.  It's mainly used internally with the
-  # #after_ helper methods.
-  #
-  #   'A&B&C'.value_after_character('&')  #=> "C"
-  #
-  # @return [Nil, String] returns the found value, else returns nil
-  def value_after_character(delimiter)
-    x = self.scan(/^.*[#{delimiter}](.*)$/)
-    x.empty? ? nil : x.join.strip
-  end
-
-  # Allows you to specify your own delimiter to grab the string value found
-  # before the first delimiter.  It's mainly used internally with the
-  # #after_ helper methods.
-  #
-  #   'A&B&C'.value_before_character('&')  #=> "A"
-  #
-  # @return [Nil, String] returns the found value, else returns nil
-  def value_before_character(delimiter)
-    x = self.scan(/^(.*?)[#{delimiter}]/)
-    x.empty? ? nil : x.join.strip
-  end
-
   # Returns the IP address value derived from self in hex format.
   #
   #  'ffffff00'.hex_to_ip_address  #=> "255.255.255.0"
@@ -239,14 +215,39 @@ class String
   # characters that are sometimes reported by devices.  Also removes registered
   # (R) characters.
   #
-  #  'Microsoft(R) Windows(R)'.string_clean             #=> "Microsoft Windows"
-  #  "string with\u00A0 weird characters".string_clean  #=> "string with weird characters"
+  #  'Microsoft(R) Windows(R)'.clean_string             #=> "Microsoft Windows"
+  #  "string with\u00A0 weird characters".clean_string  #=> "string with weird characters"
   #
   # @return [String] the cleaned up string
-  def string_clean
-    # remove registered "(R)" mark
-    string = self.gsub(/\(r\)/i, '')
+  def clean_string
+    # remove registered "(R)" and trademark "(tm)" marks
+    string = self.gsub(/\(r\)|\(tm\)/i, '')
+    string.gsub!(/\s+/, ' ')
 
     string.encode(Encoding.find('ASCII'), :undef=>:replace, :replace=>'').strip
   end
+
+  # Allows you to specify your own delimiter to grab the string value found
+  # after the last delimiter.  It's mainly used internally with the
+  # #after_ helper methods.
+  #
+  #   'A&B&C'.value_after_character('&')  #=> "C"
+  #
+  # @return [Nil, String] returns the found value, else returns nil
+  def value_after_character(delimiter)
+    x = self.scan(/^.*[#{delimiter}](.*)$/)
+    x.empty? ? nil : x.join.strip
+  end
+
+  # Allows you to specify your own delimiter to grab the string value found
+  # before the first delimiter.  It's mainly used internally with the
+  # #after_ helper methods.
+  #
+  #   'A&B&C'.value_before_character('&')  #=> "A"
+  #
+  # @return [Nil, String] returns the found value, else returns nil
+  def value_before_character(delimiter)
+    x = self.scan(/^(.*?)[#{delimiter}]/)
+    x.empty? ? nil : x.join.strip
+  end
 end

data/lib/boris/helpers/time.rb

@@ -0,0 +1,5 @@
+class Time
+  def self.filetime_to_time(filetime)
+    Time.at((filetime - 116444556000000000) / 10000000)
+  end
+end

data/lib/boris/lumberjack.rb

@@ -1,6 +1,6 @@
 class BorisLogger < Logger
-  def initialize(output)
-    super(output)
+  def initialize(log_device)
+    super(log_device)
 
     self.datetime_format = '%m-%d-%Y %H:%M:%S'
 

data/lib/boris/options.rb

@@ -83,7 +83,7 @@ module Boris
     # @raise ArgumentError when invalid credentials or connection_types are supplied
     def add_credential(cred)
       raise ArgumentError, 'invalid credential supplied (must be Hash)' if !cred.kind_of?(Hash)
-      raise ArgumentError, 'username required' if !cred[:user]
+      raise ArgumentError, 'user required' if !cred[:user]
 
       cred[:connection_types] ||= VALID_CONNECTION_TYPES
 

data/lib/boris/profiler.rb

@@ -1,19 +1,18 @@
 require 'boris/structure'
-
-require 'boris/helpers/array'
-require 'boris/helpers/hash'
-require 'boris/helpers/string'
-require 'boris/helpers/scrubber'
+require 'boris/helpers'
 
 module Boris; module Profilers
   class Profiler
     include Lumberjack
     include Structure
 
+    attr_reader :cache
+
     def initialize(connector)
       @host = connector.host
       @logger = Boris.logger
       @connector = connector
+      @cache = {:users=>[]}
     end
   end
 end; end

data/lib/boris/profilers/linux_core.rb

@@ -17,7 +17,7 @@ module Boris; module Profilers
       file_system_command = %q{df -P -T | grep "^/" | awk '{print $1 "|" $3 / 1024 "|" $5 / 1024 "|" $7}'}
       @connector.values_at(file_system_command).each do |file_system|
         h = file_system_template
-        file_system = file_system.split("|")
+        file_system = file_system.split('|')
 
         h[:capacity_mb] = file_system[1].to_i
         h[:file_system] = file_system[0]
@@ -80,7 +80,7 @@ module Boris; module Profilers
 
       user_data.each do |x|
         h = {}
-        x = x.split(":")
+        x = x.split(':')
         h[:status] = nil
         h[:primary_group_id] = x[3]
         h[:username] = x[0]
@@ -88,7 +88,7 @@ module Boris; module Profilers
       end
 
       group_data.each do |group|
-        group = group.split(":")
+        group = group.split(':')
         h = {:members=>[], :name=>group[0]}
 
         h[:members] = users.select{|user| (user[:primary_group_id] == group[2])}.collect{|user| user[:username]}

data/lib/boris/profilers/unix/solaris.rb

@@ -11,6 +11,8 @@ module Boris; module Profilers
       return true if connector.value_at('uname') =~ /sunos/i
     end
 
+    def get_file_systems; super; end
+
     def get_hardware
       super
 
@@ -134,6 +136,7 @@ module Boris; module Profilers
     end
 
     def get_local_user_groups; super; end
+    def get_network_id; super; end
 
     def get_network_interfaces
       super
@@ -167,8 +170,14 @@ module Boris; module Profilers
 
         # if this host is in a child zone, drop any interfaces that are not found in the ifconfig
         # command output (since these would likely be picked up when scanning the zone host)
+        hardware_details = nil
+
         if @zone == :child
           found_ethernet_interfaces.delete_if{|fi| interface_configs.select{|config| config =~ /^#{fi[:driver]}#{fi[:instance]}/}.count == 0}
+        else
+          prtpicl_command = %q{/usr/sbin/prtpicl -c network -v | egrep ':model|:driver-name|:instance|:local-mac-address|:vendor-id|:device-id|\(network' | nawk '{if ($0 ~ /\(network/) print ""; else {first=$1; $1=""; print first "|" $0}}'}
+          prtpicl_command.gsub!(/network/, 'obp-device') if @platform == :x86
+          hardware_details = @connector.values_at(prtpicl_command).join("\n").split(/\n\n/)
         end
 
         # now loop through each unique ethernet interface found on this host
@@ -208,12 +217,6 @@ module Boris; module Profilers
             h[:model] = 'Virtual Ethernet Adapter'
             h[:vendor] = VENDOR_ORACLE
           else
-            prtpicl_command = %q{/usr/sbin/prtpicl -c network -v | egrep ':model|:driver-name|:instance|:local-mac-address|:vendor-id|:device-id|\(network' | nawk '{if ($0 ~ /\(network/) print ""; else {first=$1; $1=""; print first "|" $0}}'}
-
-            prtpicl_command.gsub!(/network/, 'obp-device') if @platform == :x86
-
-            hardware_details = @connector.values_at(prtpicl_command).join("\n").split(/\n\n/)
-
             hardware = hardware_details.grep(/driver-name\|.*#{fi[:driver]}/).grep(/instance\|.*#{fi[:instance]}/)[0].split(/\n/)
 
             h[:vendor_id] = hardware.grep(/vendor-id\|/)[0].after_pipe unless hardware.grep(/vendor-id\|/).empty?
@@ -291,13 +294,14 @@ module Boris; module Profilers
     def get_operating_system
       super
 
-      install_log_date = @connector.value_at("ls -l /var/sadm/system/logs/install_log | nawk '{print $6" "$7" "$8'}")
+      install_log_date = @connector.value_at(%q{ls -l /var/sadm/system/logs/install_log | nawk '{print $6" "$7" "$8'}})
+      
       @operating_system[:date_installed] = DateTime.parse(install_log_date)
 
       os_data = @connector.value_at('uname -rv').split
       @operating_system[:kernel] = os_data[1]
       @operating_system[:name] = 'Oracle Solaris'
-      @operating_system[:version] = os_data[0]
+      @operating_system[:version] = os_data[0].after_period
 
       @operating_system
     end

data/lib/boris/profilers/windows_core.rb

@@ -42,8 +42,8 @@ module Boris; module Profilers
       disk_space.each do |ds|
         h = file_system_template
         h[:mount_point] = ds[:name]
-        h[:capacity_mb] = ds[:size].to_i / 1024
-        h[:used_space_mb] = h[:capacity_mb] - (ds[:freespace].to_i / 1024)
+        h[:capacity_mb] = (ds[:size].to_i / 1024) / 1024
+        h[:used_space_mb] = h[:capacity_mb] - ((ds[:freespace].to_i / 1024) / 1024)
 
         ld = logical_disks.select{|ld| ld[:dependent].include?(h[:mount_point])}[0]
         h[:file_system] = ld[:antecedent].split(/\"/)[1]
@@ -65,6 +65,8 @@ module Boris; module Profilers
 
       serial_data = @connector.value_at('SELECT SerialNumber, SMBIOSBIOSVersion FROM Win32_BIOS')
       @hardware[:serial] = serial_data[:serialnumber]
+      @hardware[:serial] = nil if @hardware[:serial] !~ /^\w*$/
+
       @hardware[:firmware_version] = serial_data[:smbiosbiosversion]
 
       system_data = @connector.value_at('SELECT Manufacturer, Model, TotalPhysicalMemory FROM Win32_ComputerSystem')
@@ -113,8 +115,10 @@ module Boris; module Profilers
 
           app_values = @connector.registry_values_at(app_key)
 
-          if app_values[:installdate].kind_of?(String) && app_values[:installdate] !~ /0000/
-            h[:date_installed] = DateTime.parse(app_values[:installdate])
+          begin
+            h[:date_installed] = DateTime.parse(app_values[:installdate]) unless app_values[:installdate] =~ /0000/
+          rescue
+            debug "invalid install date provided (#{app_values[:installdate]})" if app_values[:installdate]
           end
 
           if app_values.has_key?(:displayname) && !(app_values[:displayname] =~ /^kb|\(kb\d+/i)
@@ -169,7 +173,13 @@ module Boris; module Profilers
           h[:installed_by] = patch[:installedby] unless patch[:installedby].empty?
           h[:installed_by] = get_username(patch[:installedby]) if patch[:installedby][0, 4] == 'S-1-'
 
-          h[:date_installed] = DateTime.strptime(patch[:installedon], '%m/%d/%Y') unless patch[:installedon].empty?
+          h[:date_installed] = if patch[:installedon].length == 16
+            Time.filetime_to_time(patch[:installedon].hex)
+          elsif patch[:installedon] =~ /\d+\/\d+\/\d{4}/
+            DateTime.strptime(patch[:installedon], '%m/%d/%Y')
+          elsif patch[:installedon] =~ /\d{4}\/\d+\/\d+/
+            DateTime.strptime(patch[:installedon], '%Y/%m/%d')
+          end unless patch[:installedon].empty?
 
           @installed_patches << h
         end
@@ -240,7 +250,7 @@ module Boris; module Profilers
         system_roles = @operating_system[:roles]
       end
 
-      if system_roles.select{|role| role =~ /domaincontroller/i}.empty?
+      if system_roles.select{|role| role =~ /domain_controller/i}.empty?
         # not a domain controller, so move on with retrieving users
         groups = []
 
@@ -290,7 +300,7 @@ module Boris; module Profilers
         when 1, 2; 'up'
         else; 'down'
         end
-        h[:type] = 'ethernet'
+        h[:type] = h[:model] =~ /converged/i ? 'converged' : 'ethernet'
         h[:vendor] = interface_profile[:manufacturer]
 
         # retrieve config for this interface
@@ -299,7 +309,7 @@ module Boris; module Profilers
         guid = interface_config[:settingid]
         h[:dns_servers] = interface_config[:dnsserversearchorder]
 
-        subnet = interface_config[:ipsubnet]
+        subnet = interface_config[:ipsubnet].is_a?(Array) ? interface_config[:ipsubnet][0] : interface_config[:ipsubnet]
 
         interface_config[:ipaddress].each do |ip_address|
           h[:ip_addresses] << {:ip_address=>ip_address, :subnet=>subnet}
@@ -347,11 +357,14 @@ module Boris; module Profilers
         device_guid = @connector.registry_values_at(cfg_keypath + '\\Linkage')[:export][0].gsub(/\\/, '\\\\\\')
 
         adapter_name_data = @connector.value_at("SELECT InstanceName FROM MSNdis_EnumerateAdapter WHERE DeviceName = '#{device_guid}'", :root_wmi)
-        internal_adapter_name = adapter_name_data[:instancename]
 
-        # now with the internal adapter name, we can grab the connection speed.
-        speed_data = @connector.value_at("SELECT NdisLinkSpeed FROM MSNdis_LinkSpeed WHERE InstanceName = '#{internal_adapter_name}'", :root_wmi)
-        h[:current_speed_mbps] = speed_data[:ndislinkspeed] / 10000
+        if adapter_name_data
+          internal_adapter_name = adapter_name_data[:instancename]
+
+          # now with the internal adapter name, we can grab the connection speed.
+          speed_data = @connector.value_at("SELECT NdisLinkSpeed FROM MSNdis_LinkSpeed WHERE InstanceName = '#{internal_adapter_name}'", :root_wmi)
+          h[:current_speed_mbps] = speed_data[:ndislinkspeed] / 10000
+        end
 
         @network_interfaces << h
       end
@@ -368,6 +381,9 @@ module Boris; module Profilers
         h = network_interface_template
 
         index = fibre_interface_profiles.index{|profile| profile[:instancename] == fibre_interface[:instancename]}
+
+        next if index.nil?
+
         profile = fibre_interface_profiles[index]
 
         h[:fabric_name] = profile[:fabricname].to_wwn
@@ -413,6 +429,7 @@ module Boris; module Profilers
       @operating_system[:date_installed] = DateTime.parse(os_data[:installdate])
       @operating_system[:kernel] = os_data[:version]
       @operating_system[:license_key] = get_product_key('microsoft windows')
+      @operating_system[:license_key] = nil if @operating_system[:license_key] =~ /bbbbb/i
       @operating_system[:name] = 'Microsoft Windows'
       @operating_system[:service_pack] = os_data[:csdversion]
 
@@ -517,17 +534,25 @@ module Boris; module Profilers
           debug 'product key could not be retrieved'
         end
       end
-
+      
       product_key
     end
 
     def get_username(guid)
+      found_user = @cache[:users].select{|user| user[:guid] == guid}.first
+
       username = guid
-      
-      user = @connector.value_at("SELECT Caption, SID FROM Win32_UserAccount WHERE SID = '#{guid}'")
-      username = user[:caption] if user[:sid] == guid
 
-      return username
+      if found_user
+        debug "guid found in cache (#{guid})"
+        username = found_user[:username]
+      else
+        user = @connector.value_at("SELECT Caption, SID FROM Win32_UserAccount WHERE SID = '#{guid}'")
+        username = user[:caption] if user
+        @cache[:users] << {:guid=>guid, :username=>username}
+      end
+      
+      username
     end
 
     private