ukamnya
/
Redmine-mod-perl-auth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More error handling and removed useless subs.

1.x
Adirelle 2011-11-14 11:49:59 +01:00
parent e45b0d7226
commit 9bd17313c7
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Redmine.pm
View File

@ -426,20 +426,21 @@ sub authz_handler {
return FORBIDDEN; return FORBIDDEN;
} }
my $dbh = connect_database($r); my $identifier = get_project_identifier($r)
or return DECLINED;
my $dbh = connect_database($r)
or return SERVER_ERROR;
my $cfg = get_config($r); my $cfg = get_config($r);
my ($identifier, $project_id, $is_public, $status) = get_project_data($r, $dbh); my ($project_id, $is_public, $status) = $dbh->selectrow_array("SELECT id, is_public, status FROM projects WHERE identifier = ?", undef, $identifier)
or return DECLINED;
$is_public = is_true($is_public); $is_public = is_true($is_public);
my($res, $reason) = FORBIDDEN; my($res, $reason) = FORBIDDEN;
unless(defined($project_id)) { if($status != 1 && !is_read_request($r)) {
# Unknown project
$res = DECLINED;
$reason = "not a redmine project";
} elsif($status != 1 && !is_read_request($r)) {
# Write operation on archived project is forbidden # Write operation on archived project is forbidden
$reason = "write operations on inactive project '$identifier' are forbidden"; $reason = "write operations on inactive project '$identifier' are forbidden";
@ -508,13 +509,12 @@ sub authz_handler {
# get the project identifier # get the project identifier
sub get_project_identifier { sub get_project_identifier {
my ($r, $dbh) = @_; my ($r) = @_;
my $cfg = get_config($r); my $cfg = get_config($r);
my $identifier = $cfg->{Project}; my $identifier = $cfg->{Project};
unless($identifier) { unless($identifier) {
my $location = $r->location; ($identifier) = $r->uri =~ m{^\Q$r->location\E/*([^/]+)};
($identifier) = $r->uri =~ m{^\Q$location\E/*([^/]+)};
} }
return $identifier; return $identifier;
@ -549,15 +549,6 @@ sub check_permissions {
return 0; return 0;
} }
# get information about the project
sub get_project_data {
my $r = shift;
my $dbh = shift;
my $identifier = get_project_identifier($r);
return $identifier, $dbh->selectrow_array("SELECT id, is_public, status FROM projects WHERE identifier = ?", undef, $identifier);
}
# return module configuration for current directory # return module configuration for current directory
sub get_config { sub get_config {
my $r = shift; my $r = shift;