From 93c4151edfedb28a0cafa60011c57eb6d76ca6be Mon Sep 17 00:00:00 2001
From: Ryan McKern <ryan.mckern@puppetlabs.com>
Date: Thu, 15 May 2014 15:01:14 -0700
Subject: [PATCH 1/2] (MODULES-905) Narrow the confinement in bool2str

Previously, bool2str() accepted a broad array of boolean values and
bare strings, without any attempt to validate that the strings in any
way resembled "true" or "false" (or any of the other values bool2num()
accepts). This commit narrows the input confinement to TrueClass and
FalseClass, which means that bool2str() will only interpolate
strict boolean values now.
---
 lib/puppet/parser/functions/bool2str.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/puppet/parser/functions/bool2str.rb b/lib/puppet/parser/functions/bool2str.rb
index a97d356ab..fcd379178 100644
--- a/lib/puppet/parser/functions/bool2str.rb
+++ b/lib/puppet/parser/functions/bool2str.rb
@@ -5,7 +5,7 @@
 module Puppet::Parser::Functions
   newfunction(:bool2str, :type => :rvalue, :doc => <<-EOS
     Converts a boolean to a string.
-    Requires a single boolean or string as an input.
+    Requires a single boolean as an input.
     EOS
   ) do |arguments|
 
@@ -15,15 +15,12 @@ module Puppet::Parser::Functions
     value = arguments[0]
     klass = value.class
 
-    # We can have either true or false, or string which resembles boolean ...
-    unless [FalseClass, TrueClass, String].include?(klass)
-      raise(Puppet::ParseError, 'bool2str(): Requires either ' +
-        'boolean or string to work with')
+    # We can have either true or false, and nothing else
+    unless [FalseClass, TrueClass].include?(klass)
+      raise(Puppet::ParseError, 'bool2str(): Requires a boolean to work with')
     end
 
-    result = value.is_a?(String) ? value : value.to_s
-
-    return result
+    return value.to_s
   end
 end
 

From 557d38bdc63b9b7d418f4bf0ce736406e71380b7 Mon Sep 17 00:00:00 2001
From: Ryan McKern <ryan.mckern@puppetlabs.com>
Date: Thu, 15 May 2014 16:45:02 -0700
Subject: [PATCH 2/2] (MODULES-905) Extend spec tests for bool2str

The extended spec tests validate that the common types of values
that could be passed to bool2str() are rejected.
---
 spec/unit/puppet/parser/functions/bool2str_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/unit/puppet/parser/functions/bool2str_spec.rb b/spec/unit/puppet/parser/functions/bool2str_spec.rb
index c73f7df11..bed7e68a0 100755
--- a/spec/unit/puppet/parser/functions/bool2str_spec.rb
+++ b/spec/unit/puppet/parser/functions/bool2str_spec.rb
@@ -31,4 +31,16 @@
     result = scope.function_bool2str([false])
     result.class.should(eq(String))
   end
+
+  it "should not accept a string" do
+    lambda { scope.function_bool2str(["false"]) }.should( raise_error(Puppet::ParseError))
+  end
+
+  it "should not accept a nil value" do
+    lambda { scope.function_bool2str([nil]) }.should( raise_error(Puppet::ParseError))
+  end
+
+  it "should not accept an undef" do
+    lambda { scope.function_bool2str([:undef]) }.should( raise_error(Puppet::ParseError))
+  end
 end