summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/indirector/indirection.rb2
-rw-r--r--lib/puppet/indirector/request.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 05464f8c9..4841ec532 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -267,7 +267,7 @@ class Puppet::Indirector::Indirection
def check_authorization(request, terminus)
# At this point, we're assuming authorization makes no sense without
# client information.
- return unless request.options[:node]
+ return unless request.node
# This is only to authorize via a terminus-specific authorization hook.
return unless terminus.respond_to?(:authorized?)
diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb
index 45c06670b..98fa38885 100644
--- a/lib/puppet/indirector/request.rb
+++ b/lib/puppet/indirector/request.rb
@@ -24,6 +24,7 @@ class Puppet::Indirector::Request
else
result[param] = value
end
+ result
end
if key.is_a?(String) or key.is_a?(Symbol)