mcollective-client 2.10.3 → 2.10.4

data/lib/mcollective.rb

@@ -59,7 +59,7 @@ module MCollective
 
   MCollective::Vendor.load_vendored
 
-  VERSION="2.10.3"
+  VERSION="2.10.4"
 
   def self.version
     VERSION

data/lib/mcollective/security/aes_security.rb

@@ -225,7 +225,11 @@ module MCollective
 
         case serializer
         when "yaml"
-          return YAML.load(msg)
+          if YAML.respond_to? :safe_load
+            return YAML.safe_load(msg, [Symbol])
+          else
+            raise "YAML.safe_load not supported by Ruby #{RUBY_VERSION}. Please update to Ruby 2.1+."
+          end
         else
           return Marshal.load(msg)
         end

data/lib/mcollective/security/ssl.rb

@@ -223,7 +223,11 @@ module MCollective
 
         case serializer
         when "yaml"
-          return YAML.load(msg)
+          if YAML.respond_to? :safe_load
+            return YAML.safe_load(msg, [Symbol])
+          else
+            raise "YAML.safe_load not supported by Ruby #{RUBY_VERSION}. Please update to Ruby 2.1+."
+          end
         else
           return Marshal.load(msg)
         end

data/spec/unit/mcollective/security/aes_security_spec.rb

@@ -38,6 +38,52 @@ module MCollective
         MCollective::Log.stubs(:warn)
       end
 
+      describe "#deserialize" do
+        let(:safe_payload) {
+          {:payload => "words", :ttl => 15}
+        }
+
+        class Sock
+          attr_reader :size
+          def initialize size
+            @size = size
+          end
+
+          def ==(another_sock)
+            self.size == another_sock.size
+          end
+        end
+
+        let(:unsafe_payload) {
+          {:payload => Sock.new(10)}
+        }
+
+        it "should accept marshal by default" do
+          expect(plugin.deserialize(Marshal.dump(unsafe_payload))).to eq(unsafe_payload)
+          expect(plugin.deserialize(Marshal.dump(safe_payload))).to eq(safe_payload)
+        end
+
+        context "yaml" do
+          before do
+            pluginconf['aes.serializer'] = 'yaml'
+          end
+
+          if YAML.respond_to? :safe_load
+            it "should round-trip yaml with symbols" do
+              expect(plugin.deserialize(YAML.dump(safe_payload))).to eq(safe_payload)
+            end
+
+            it "should reject yaml with other objects" do
+              expect{ plugin.deserialize(YAML.dump(unsafe_payload)) }.to raise_error(Psych::DisallowedClass)
+            end
+          else
+            it "should raise on older Ruby" do
+              expect{ plugin.deserialize(YAML.dump(safe_payload)) }.to raise_error("YAML.safe_load not supported by Ruby #{RUBY_VERSION}. Please update to Ruby 2.1+.")
+            end
+          end
+        end
+      end
+
       describe "#decodemsg" do
         let(:body) do
         {:sslpubkey => "ssl_public_key",

data/spec/unit/mcollective/security/ssl_spec.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+require 'mcollective/security/ssl'
+
+module MCollective
+  module Security
+    # Clear the PluginManager so that security plugin tests do not conflict
+    PluginManager.clear
+    describe Ssl do
+      let(:pluginconf) do
+        {"ssl_server_public" => "server-public.pem",
+         "ssl_client_private" => "client-private.pem",
+         "ssl_client_public" => "client_public.pem"}
+      end
+
+      let(:config) do
+        conf = mock
+        conf.stubs(:identity).returns("test")
+        conf.stubs(:configured).returns(true)
+        conf.stubs(:pluginconf).returns(pluginconf)
+        conf
+      end
+
+      let(:plugin) do
+        Ssl.new
+      end
+
+      let(:msg) do
+        m = mock
+        m.stubs(:payload)
+        m
+      end
+
+      before :each do
+        stats = mock("stats")
+        MCollective::PluginManager << {:type => "global_stats", :class => stats}
+        MCollective::Config.stubs("instance").returns(config)
+        MCollective::Log.stubs(:debug)
+        MCollective::Log.stubs(:warn)
+      end
+
+      describe "#deserialize" do
+        let(:safe_payload) {
+          {:payload => "words", :ttl => 15}
+        }
+
+        class Sock
+          attr_reader :size
+          def initialize size
+            @size = size
+          end
+
+          def ==(another_sock)
+            self.size == another_sock.size
+          end
+        end
+
+        let(:unsafe_payload) {
+          {:payload => Sock.new(10)}
+        }
+
+        it "should accept marshal by default" do
+          expect(plugin.send(:deserialize, Marshal.dump(unsafe_payload))).to eq(unsafe_payload)
+          expect(plugin.send(:deserialize, Marshal.dump(safe_payload))).to eq(safe_payload)
+        end
+
+        context "yaml" do
+          before do
+            pluginconf['ssl_serializer'] = 'yaml'
+          end
+
+          if YAML.respond_to? :safe_load
+            it "should round-trip yaml with symbols" do
+              expect(plugin.send(:deserialize, YAML.dump(safe_payload))).to eq(safe_payload)
+            end
+
+            it "should reject yaml with other objects" do
+              expect{ plugin.send(:deserialize, YAML.dump(unsafe_payload)) }.to raise_error(Psych::DisallowedClass)
+            end
+          else
+            it "should raise on older Ruby" do
+              expect{ plugin.send(:deserialize, YAML.dump(safe_payload)) }.to raise_error("YAML.safe_load not supported by Ruby #{RUBY_VERSION}. Please update to Ruby 2.1+.")
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -309,6 +309,7 @@ files:
 - spec/unit/mcollective/security/aes_security_spec.rb
 - spec/unit/mcollective/security/base_spec.rb
 - spec/unit/mcollective/security/psk_spec.rb
+- spec/unit/mcollective/security/ssl_spec.rb
 - spec/unit/mcollective/shell_spec.rb
 - spec/unit/mcollective/ssl_spec.rb
 - spec/unit/mcollective/string_spec.rb
@@ -459,6 +460,7 @@ test_files:
 - spec/unit/mcollective/security/aes_security_spec.rb
 - spec/unit/mcollective/security/base_spec.rb
 - spec/unit/mcollective/security/psk_spec.rb
+- spec/unit/mcollective/security/ssl_spec.rb
 - spec/unit/mcollective/shell_spec.rb
 - spec/unit/mcollective/ssl_spec.rb
 - spec/unit/mcollective/string_spec.rb