Role prefix tests pass

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2472 4979c152-3d1c-0410-bac9-87ea11338e46

LedgerSMB.pm

@@ -609,7 +609,7 @@ sub is_allowed_role {
     my ($self, $args) = @_;
     my @roles = @{$args->{allowed_roles}};
     for my $role (@roles){
-        my @roleset = grep m/^$role$/, @{$self->{_roles}};
+        my @roleset = grep m/^$self->{_role_prefix}$role$/, @{$self->{_roles}};
         if (scalar @roleset){
             return 1;
         }
@@ -742,6 +742,11 @@ sub _db_init {
              WHERE setting_key = 'version'");
     $sth->execute;
     my ($dbversion) = $sth->fetchrow_array;
+    $sth = $dbh->prepare("
+            SELECT value FROM defaults 
+             WHERE setting_key = 'role_prefix'");
+    $sth->execute;
+    ($self->{_role_prefix}) = $sth->fetchrow_array;
     if ($dbversion ne $self->{dbversion}){
         $self->error("Database is not the expected version.  Was $dbversion, expected $self->{dbversion}");
     }

t/11-ledgersmb.t

@@ -5,7 +5,7 @@ use warnings;
 
 $ENV{TMPDIR} = 't/var';
 
-use Test::More 'no_plan';
+use Test::More tests => 92;
 use Test::Exception;
 use Test::Trap qw(trap $trap);
 use Math::BigFloat;
@@ -246,7 +246,7 @@ is($lsmb->{pear_1}, 2, 'merge: Index 1, added pear as pear_1');
 is($lsmb->{peach_1}, 3, 'merge: Index 1, added peach as peach_1');
 like($lsmb->{path}, qr#bin/(lynx|mozilla)#, 'merge: Index 1, left existing key');
 
-# $lsmb->is_allowed_role checks
+# $lsmb->is_allowed_role checks, no prefix
 $lsmb = LedgerSMB->new();
 $lsmb->{_roles} = ['apple', 'pear'];
 is($lsmb->is_allowed_role({allowed_roles => ['pear']}), 1, 
@@ -260,3 +260,11 @@ is($lsmb->is_allowed_role({'allowed_roles' => []}), 0,
 delete $lsmb->{_roles};
 is($lsmb->is_allowed_role({'allowed_roles' => ['apple']}), 0, 
 		'is_allowed_role: no roles for user');
+
+# $lsmb->is_allowed_role checks, prefix
+$lsmb = LedgerSMB->new();
+$lsmb->{_role_prefix} = 'test__';
+
+$lsmb->{_roles} = ['test__apple', 'test__pear'];
+is($lsmb->is_allowed_role({allowed_roles => ['pear']}), 1, 
+	'is_allowed_role: allowed role with prefix');