diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/indirection.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/indirector/request.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index 5d8cfe9b5..7ac214cd0 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -265,7 +265,7 @@ class Puppet::Indirector::Indirection return unless terminus.respond_to?(:authorized?) unless terminus.authorized?(request) - msg = "Not authorized to call %s on %s" % [request.method, request.key] + msg = "Not authorized to call %s on %s" % [request.method, request.to_s] unless request.options.empty? msg += " with %s" % request.options.inspect end diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb index 8227db174..c6f268ab2 100644 --- a/lib/puppet/indirector/request.rb +++ b/lib/puppet/indirector/request.rb @@ -78,6 +78,11 @@ class Puppet::Indirector::Request method == :search end + def to_s + return uri if uri + return "/%s/%s" % [indirection_name, key] + end + private # Parse the key as a URI, setting attributes appropriately. |