puppet 3.3.1.rc1 → 3.3.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2479879d8532a3fb936537d8abaf317c563a49
-  data.tar.gz: 42bfd1c583faee771a10dfdd3f697bb91a30b734
+  metadata.gz: 6d2fd11250a51541a228242c70e648a625e8fc08
+  data.tar.gz: c0f9bc3f60a9306296d01e6b4f40520399230d6e
 SHA512:
-  metadata.gz: 78443b0f2e01f6fc4fb71b6e58df58bef370054815519fa468b7af5c5511cebf2ec69d7794425a4de7713d4734292c752cb8db875cd899330047dec4213b4362
-  data.tar.gz: 8026eecbf7556115c83c2bb3ec04c8755ca8766312b22fdb4a7da51aaca63ef5488a88e590b3b028e7c6e6788f9209228b8900d69a3d8a2e6c422025a920e3fb
+  metadata.gz: 3aac39e3ed1d2eeb992fa912576ae3a26749ee3e0b26c642616000080c961f471448b2ecc1f2ac920b1aaad04d2d3eb9c1fae2e252d49bd72985f6b5d50ef2f3
+  data.tar.gz: dd42835bc9e0049cc3d1b3145e9395efd3a0700a894a24bc34756e2cfcf9a3ba080a1e445900f57c5846b5d9fdefe7f4ac5731b554ca3502fb6945d612d60eeb

data/lib/puppet/network/http/rack/rest.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'cgi'
 require 'puppet/network/http/handler'
 require 'puppet/network/http/rack/httphandler'
 require 'puppet/util/ssl'
@@ -73,7 +74,15 @@ class Puppet::Network::HTTP::RackREST < Puppet::Network::HTTP::RackHttpHandler
 
   # Return the query params for this request.
   def params(request)
-    result = decode_params(request.params)
+    if request.post?
+      params = request.params
+    else
+      # rack doesn't support multi-valued query parameters,
+      # e.g. ignore, so parse them ourselves
+      params = CGI.parse(request.query_string)
+      convert_singular_arrays_to_value(params)
+    end
+    result = decode_params(params)
     result.merge(extract_client_info(request))
   end
 
@@ -125,4 +134,11 @@ class Puppet::Network::HTTP::RackREST < Puppet::Network::HTTP::RackHttpHandler
     result
   end
 
+  def convert_singular_arrays_to_value(hash)
+    hash.each do |key, value|
+      if value.size == 1
+        hash[key] = value.first
+      end
+    end
+  end
 end

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.3.1-rc1'
+  PUPPETVERSION = '3.3.1-rc2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/lib/puppet_spec/matchers.rb

@@ -103,3 +103,13 @@ RSpec::Matchers.define :equal_attributes_of do |expected|
     end
   end
 end
+
+RSpec::Matchers.define :be_one_of do |*expected|
+  match do |actual|
+    expected.include? actual
+  end
+
+  failure_message_for_should do |actual|
+    "expected #{actual.inspect} to be one of #{expected.map(&:inspect).join(' or ')}"
+  end
+end

data/spec/unit/network/http/rack/rest_spec.rb

@@ -148,6 +148,25 @@ describe "Puppet::Network::HTTP::RackREST", :if => Puppet.features.rack? do
         result[:bar].should == "xyzzy"
       end
 
+      it "should return multi-values params as an array of the values" do
+        req = mk_req('/?foo=baz&foo=xyzzy')
+        result = @handler.params(req)
+        result[:foo].should == ["baz", "xyzzy"]
+      end
+
+      it "should return parameters from the POST body" do
+        req = mk_req("/", :method => 'POST', :input => 'foo=baz&bar=xyzzy')
+        result = @handler.params(req)
+        result[:foo].should == "baz"
+        result[:bar].should == "xyzzy"
+      end
+
+      it "should not return multi-valued params in a POST body as an array of values" do
+        req = mk_req("/", :method => 'POST', :input => 'foo=baz&foo=xyzzy')
+        result = @handler.params(req)
+        result[:foo].should be_one_of("baz", "xyzzy")
+      end
+
       it "should CGI-decode the HTTP parameters" do
         encoding = CGI.escape("foo bar")
         req = mk_req("/?foo=#{encoding}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.1.rc1
+  version: 3.3.1.rc2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter