diff options
author | Luke Kanies <luke@madstop.com> | 2009-02-14 17:35:34 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2009-02-18 22:38:43 -0600 |
commit | 7bc41cefa0115067a2e9aab3dbd1924667c46dfe (patch) | |
tree | fb2ae6dad4610ae6d6d633c1aedde514e5568afb /lib/puppet/indirector | |
parent | 992231a58daf8f0b489022f0af8ddcfb615bb0e1 (diff) | |
download | puppet-7bc41cefa0115067a2e9aab3dbd1924667c46dfe.tar.gz puppet-7bc41cefa0115067a2e9aab3dbd1924667c46dfe.tar.xz puppet-7bc41cefa0115067a2e9aab3dbd1924667c46dfe.zip |
Adding clarity to query string handling in REST calls
We previously only handled simple strings as values,
but we know handle true and false as booleans, we URI-escape
all strings, and we can yaml-encode and then escape arrays of
strings.
This could get abused a bit, in that we're just yaml-dumping anything
that's an array, but it should be pretty safe. Mmmm, should.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/indirector')
-rw-r--r-- | lib/puppet/indirector/rest.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb index 5ac25f02d..2d0799286 100644 --- a/lib/puppet/indirector/rest.rb +++ b/lib/puppet/indirector/rest.rb @@ -87,11 +87,21 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus deserialize network(request).put("/#{indirection.name}/", request.instance.render, headers) end - private - # Create the query string, if options are present. def query_string(request) return "" unless request.options and ! request.options.empty? - "?" + request.options.collect { |key, value| "%s=%s" % [key, value] }.join("&") + "?" + request.options.collect do |key, value| + case value + when nil; next + when true, false; value = value.to_s + when String; value = URI.escape(value) + when Symbol; value = URI.escape(value.to_s) + when Array; value = URI.escape(YAML.dump(value)) + else + raise ArgumentError, "HTTP REST queries cannot handle values of type '%s'" % value.class + end + + "%s=%s" % [key, value] + end.join("&") end end |