From 262937ff6e505bbf86d15500279ff23398f9e1c8 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 19 Feb 2009 16:09:58 -0600 Subject: Correctly handling URI escaping throughout the REST process This means, at the least, that we can now serve files via REST when they have spaces and other weird characters in their names. This involves a small change to many files. Signed-off-by: Luke Kanies --- lib/puppet/network/http/handler.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/puppet/network') diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 9bc94a037..cce679864 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -75,6 +75,7 @@ module Puppet::Network::HTTP::Handler # Execute our find. def do_find(request, response) key = request_key(request) || raise(ArgumentError, "Could not locate lookup key in request path [#{path(request)}]") + key = URI.unescape(key) args = params(request) unless result = model.find(key, args) return do_exception(response, "Could not find %s %s" % [model.name, key], 404) @@ -93,6 +94,7 @@ module Puppet::Network::HTTP::Handler def do_search(request, response) args = params(request) if key = request_key(request) + key = URI.unescape(key) result = model.search(key, args) else result = model.search(args) @@ -110,6 +112,7 @@ module Puppet::Network::HTTP::Handler # Execute our destroy. def do_destroy(request, response) key = request_key(request) || raise(ArgumentError, "Could not locate lookup key in request path [#{path(request)}]") + key = URI.unescape(key) args = params(request) result = model.destroy(key, args) -- cgit