vmware_web_service 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006b481c986e6cad728640d1394bfbb13bd7a6ab
-  data.tar.gz: 4c33d39aefbedeec84d41631f49083153af2940b
+  metadata.gz: a59adcda017843f528b047f04b2b5516e4595d1f
+  data.tar.gz: c0e782973a2062df25ce5c126c43534bdb0bfd6b
 SHA512:
-  metadata.gz: 90f4d0600f05f832bf7269f03a06d445a5791a7307f6189be587d56234b8b939b30e58469a4bc20f9ff415794cdd637e8f9de83a39a6831478f70f94da236ab1
-  data.tar.gz: eb246f1531c6fc7dfd6dfaec639dfd4dc2d21c02b615de061de7b481d382862d0f1e8c3f17d63f19c5ccf735fac751aeb7ab35822a0a45577b748b8582c8a323
+  metadata.gz: 9a937b71aa93ea6dcf1f5acf154f5a777c4b1cdc4a824f1b6f4e709e291bf6f442e7779323072e0792570dde49b3d8beb2346a3ae171e865cd40729b3794a135
+  data.tar.gz: db7a5f239a77935e0ff1578113d4e125823a0ccda927d8a3f7086555ea1621e48870dda3bf4827a2e09b99ec73f5860531bac585a47aec974800f88e70037f07

data/lib/VMwareWebService/DMiqVimSync.rb

@@ -20,6 +20,7 @@ module DMiqVimSync
 end # module DMiqVimSync
 
 class DRb::DRbMessage
+  EXPECTED_MARSHAL_VERSION = [Marshal::MAJOR_VERSION, Marshal::MINOR_VERSION].freeze
   alias_method :dump_original, :dump
 
   #
@@ -32,9 +33,33 @@ class DRb::DRbMessage
     #
     obj.holdBrokerObj if obj.respond_to?(:holdBrokerObj)
 
-    return(dump_original(obj, error)) unless obj.kind_of?(MiqDrbReturn)
+    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)
+
     begin
-      return(dump_original(obj.obj, error))
+      return result
     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/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport