From 97ab4e2426bca59bfacd597784545a4d57a9b28d Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 22 Jul 2010 18:35:02 +0200 Subject: [PATCH] bugfix in simple_permissions and modified test --- src/authm_mad/simple_permissions.rb | 4 +--- src/authm_mad/spec/simple_permissions_spec.rb | 14 +++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/authm_mad/simple_permissions.rb b/src/authm_mad/simple_permissions.rb index c6ff92205a..b12fa0e2be 100644 --- a/src/authm_mad/simple_permissions.rb +++ b/src/authm_mad/simple_permissions.rb @@ -33,8 +33,6 @@ class SimplePermissions end def auth(uid, tokens) - STDERR.puts [uid, tokens].inspect - result=true tokens.each do |token| @@ -60,7 +58,7 @@ class SimplePermissions when 'USE' if %w{VM NET IMAGE}.include? object - auth_result = ((owner == uid) || pub) + auth_result = ((owner == uid) | pub) elsif object == 'HOST' auth_result=true end diff --git a/src/authm_mad/spec/simple_permissions_spec.rb b/src/authm_mad/spec/simple_permissions_spec.rb index 67f6401c05..68c49621e2 100644 --- a/src/authm_mad/spec/simple_permissions_spec.rb +++ b/src/authm_mad/spec/simple_permissions_spec.rb @@ -19,6 +19,16 @@ require 'spec_common' require 'client_mock' require 'simple_permissions' +CONF=<