vmware_web_service 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e757beb9f6117a4dabb6aa234cbf5ecf8aa0de66
-  data.tar.gz: 82a1cd97db7da5eed6c13e02aacead62272d476a
+  metadata.gz: 8992addbdeb936c4c9278c4ae6282a60896839a1
+  data.tar.gz: 9a165c8c1b71949c0ebb2519f3b21ae641e5c801
 SHA512:
-  metadata.gz: 1434b93b8e9244f3b32f0f97b42e0af7d8f030be2fba53bdd7594d57a6dc9c7b6f25c5b8121b94ebcf488c3a6c3daaeee0bc691288bcd55ef556efdf3c667aa7
-  data.tar.gz: 895a0cd2436ba2cd15ae53d495d4475c89733bf6ff3f8bc5386387aedbb5fca8622dafe211d2aa908d384cc367350f3d6f911a20be34201d5951ec364d993dad
+  metadata.gz: 54adfa77e4119530017d443ab3d51882498f2309ec06e2329be4ad411f0e593e7027593e8cfcfdc7c49fdd8550899a593f1e2484d4b9ad5903a2ef9b3c59dcb0
+  data.tar.gz: d82d1c6ee976f6410ca75c3865632e4e355860c5c7ba08dfbde866e3ab3b4a66e16984e56f9b15d042050bab50ee06d814a610984eb06d3e39137dde068f9f0f

data/lib/VMwareWebService/DMiqVimSync.rb

@@ -20,7 +20,6 @@ module DMiqVimSync
 end # module DMiqVimSync
 
 class DRb::DRbMessage
-  EXPECTED_MARSHAL_VERSION = [Marshal::MAJOR_VERSION, Marshal::MINOR_VERSION].freeze
   alias_method :dump_original, :dump
 
   #
@@ -33,33 +32,9 @@ class DRb::DRbMessage
     #
     obj.holdBrokerObj if obj.respond_to?(:holdBrokerObj)
 
-    obj_to_dump = obj.kind_of?(MiqDrbReturn) ? obj.obj : obj
-
-    result = dump_original(obj_to_dump, error)
-
-    valid = true
-    size = result[0..3].unpack("N")[0]
-    if @load_limit < size
-      $vim_log.error("DRb packet size too large: #{size}")
-      valid = false
-    end
-
-    marshal_version = result[4, 2].unpack("C2")
-    if marshal_version != EXPECTED_MARSHAL_VERSION
-      $vim_log.error("Marshal version mismatch: expected: #{EXPECTED_MARSHAL_VERSION} got: #{marshal_version}")
-      valid = false
-    end
-
-    unless valid
-      $vim_log.error("object: #{obj.inspect}")
-      $vim_log.error("buffer:\n#{result[0, 1024].hex_dump}")
-      $vim_log.error("caller:\n#{caller.join("\n")}")
-    end
-
-    return result unless obj.kind_of?(MiqDrbReturn)
-
+    return(dump_original(obj, error)) unless obj.kind_of?(MiqDrbReturn)
     begin
-      return result
+      return(dump_original(obj.obj, error))
     ensure
       if obj.lock && obj.lock.sync_locked?
         $vim_log.debug "DRb::DRbMessage.dump: UNLOCKING [#{Thread.current.object_id}] <#{obj.obj.object_id}>" if $vim_log.debug?

data/lib/VMwareWebService/MiqVimBroker.rb

@@ -38,8 +38,6 @@ class MiqVimBroker
       require 'httpclient'  # needed for exception classes
       require 'VMwareWebService/MiqVimDump'
       require 'VMwareWebService/MiqVimVdlMod'
-      require 'VMwareWebService/MiqVimDrbDebug'
-
       #
       # Modify the meta-class of DRb::DRbObject
       # so we can alias class methods

data/lib/VMwareWebService/miq_fault_tolerant_vim.rb

@@ -9,7 +9,7 @@ class MiqFaultTolerantVim
 
     @erec     = options[:ems]
     auth_type = options[:auth_type] || :ws
-    ip        = options[:ip] || @erec.address
+    ip        = options[:ip] || @erec.hostname
     user      = options[:user] || @erec.authentication_userid(auth_type)
     pass      = options[:pass] || @erec.authentication_password(auth_type)
     @ems      = [ip, user, pass]

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.2.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -225,7 +225,6 @@ files:
 - lib/VMwareWebService/MiqVimCoreUpdater.rb
 - lib/VMwareWebService/MiqVimCustomizationSpecManager.rb
 - lib/VMwareWebService/MiqVimDataStore.rb
-- lib/VMwareWebService/MiqVimDrbDebug.rb
 - lib/VMwareWebService/MiqVimDump.rb
 - lib/VMwareWebService/MiqVimEventHistoryCollector.rb
 - lib/VMwareWebService/MiqVimEventMonitor.rb

data/lib/VMwareWebService/MiqVimDrbDebug.rb

@@ -1,38 +0,0 @@
-module DRb
-  class DRbMessage
-    def load(soc)  # :nodoc:
-      begin
-        sz = soc.read(4)        # sizeof (N)
-      rescue
-        raise(DRbConnError, $!.message, $!.backtrace)
-      end
-      raise(DRbConnError, 'connection closed') if sz.nil?
-      raise(DRbConnError, 'premature header') if sz.size < 4
-      sz = sz.unpack('N')[0]
-      raise(DRbConnError, "too large packet #{sz}") if @load_limit < sz
-      begin
-        str = soc.read(sz)
-      rescue
-        raise(DRbConnError, $!.message, $!.backtrace)
-      end
-      raise(DRbConnError, 'connection closed') if str.nil?
-      raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
-      DRb.mutex.synchronize do
-        begin
-          save = Thread.current[:drb_untaint]
-          Thread.current[:drb_untaint] = []
-          Marshal::load(str)
-        rescue NameError, ArgumentError
-          DRbUnknown.new($!, str)
-        rescue TypeError => err
-          raise TypeError, "#{err}\n#{str.hex_dump}"
-        ensure
-          Thread.current[:drb_untaint].each do |x|
-            x.untaint
-          end
-          Thread.current[:drb_untaint] = save
-        end
-      end
-    end
-  end
-end