summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-07-10 18:57:13 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-07-10 18:57:13 +0000
commit0befab1e5e83dd62b039df033a53b86fc96d2a0c (patch)
treeb13d20f4e51fb7be810c5ea4f309655d855bea4b
parent61b680d98f4dc67258e9e00343b83b4a734b0c78 (diff)
Role lookups now working in the application code
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2206 4979c152-3d1c-0410-bac9-87ea11338e46
-rwxr-xr-xLedgerSMB.pm22
1 files changed, 16 insertions, 6 deletions
diff --git a/LedgerSMB.pm b/LedgerSMB.pm
index 3fe186b9..1ea5e63c 100755
--- a/LedgerSMB.pm
+++ b/LedgerSMB.pm
@@ -57,7 +57,7 @@ characters or is an empty string.
This function returns 1 if the run mode is what is specified. Otherwise
returns 0.
-=item is_allowed_role(allowed_roles => @role_names)
+=item is_allowed_role({allowed_roles => @role_names})
This function returns 1 if the user's roles include any of the roles in
@role_names. Currently it returns 1 when this is not found as well but when
@@ -589,15 +589,15 @@ sub call_procedure {
# Keeping this here due to common requirements
sub is_allowed_role {
- my $self = shift @_;
- my %args = @_;
- my @roles = @{$args{allowed_roles}};
+ my ($self, $args) = @_;
+ my @roles = @{$args->{allowed_roles}};
for my $role (@roles){
- if (scalar(grep /^$role$/, $self->{_roles})){
+ my @roleset = grep m/^$role$/, @{$self->{_roles}};
+ if (scalar @roleset){
return 1;
}
}
- return 1; # TODO change to 0 when the role system is implmented
+ return 0; # TODO change to 0 when the role system is implmented
}
# This should probably be moved to User too...
@@ -723,6 +723,16 @@ sub _db_init {
push @{ $self->{custom_db_fields}{ $ref->{extends} } },
$ref->{field_def};
}
+
+ # Adding role list to self
+ $self->{_roles} = [];
+ $query = "select rolname from pg_roles
+ where pg_has_role(SESSION_USER, 'USAGE')";
+ $sth = $dbh->prepare($query);
+ $sth->execute();
+ while (my @roles = $sth->fetchrow_array){
+ push @{$self->{_roles}}, $roles[0];
+ }
}
# Deprecated, only here for old code