summaryrefslogtreecommitdiffstats
path: root/spec/integration/network
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2011-05-31 20:01:36 +0200
committerJacob Helwig <jacob@puppetlabs.com>2011-07-26 14:04:28 -0700
commit7e6fc0d80ccd29f206c3b56960ee1eef3afc33a3 (patch)
treeaae7597cf9e6730a27506877774cf76eaf268837 /spec/integration/network
parent6401dfe5602fd39cc59ec1f1b3822110e4ad864a (diff)
downloadpuppet-7e6fc0d80ccd29f206c3b56960ee1eef3afc33a3.tar.gz
puppet-7e6fc0d80ccd29f206c3b56960ee1eef3afc33a3.tar.xz
puppet-7e6fc0d80ccd29f206c3b56960ee1eef3afc33a3.zip
Deprecate RestAuthConfig#allowed? in favor of #check_authorization
#allowed? was a poorly named method since it isn't actually a predicate method. Instead of returning a boolean, this methods throws an exception when the access is denied (in order to keep the full context of what ACE triggered the deny). Given that #allowed? was overriding the behavior from AuthConfig, we leave a version of #allowed? in place that will issue a deprecation warning before delegating to #check_authorization. Once support for XML-RPC agents is removed from the master, we will be able to remove this delegation, since there should no longer be a reason for a distinction between AuthConfig and RestAuthConfig. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com> Signed-off-by: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'spec/integration/network')
-rw-r--r--spec/integration/network/rest_authconfig_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/network/rest_authconfig_spec.rb b/spec/integration/network/rest_authconfig_spec.rb
index 0e5278860..d2f539cd4 100644
--- a/spec/integration/network/rest_authconfig_spec.rb
+++ b/spec/integration/network/rest_authconfig_spec.rb
@@ -6,7 +6,7 @@ RSpec::Matchers.define :allow do |params|
match do |auth|
begin
- auth.allowed?(params[0], params[1], params[2], params[3])
+ auth.check_authorization(params[0], params[1], params[2], params[3])
true
rescue Puppet::Network::AuthorizationError
false