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

Do not die if we cannot get a project identifier.

Browse Source
This commit is contained in:
Adirelle 2012-04-04 17:07:11 +02:00
parent 42c493b6d4
commit b2389b2fc9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Redmine.pm
View File

@ -319,7 +319,7 @@ sub authen_handler {
# Used cached credentials if possible # Used cached credentials if possible
my $cache_key = get_cache_key($r, $password); my $cache_key = get_cache_key($r, $password);
if(cache_get($r, $cache_key)) { if(defined $cache_key && cache_get($r, $cache_key)) {
$r->log->debug("reusing cached credentials for user '", $r->user, "'"); $r->log->debug("reusing cached credentials for user '", $r->user, "'");
$r->set_handlers(PerlAuthzHandler => undef); $r->set_handlers(PerlAuthzHandler => undef);
@ -332,7 +332,7 @@ sub authen_handler {
$dbh->disconnect(); $dbh->disconnect();
# Store the cache key for latter use # Store the cache key for latter use
$r->pnotes("RedmineCacheKey" => $cache_key) if $res == OK; $r->pnotes("RedmineCacheKey" => $cache_key) if $res == OK && defined $cache_key;
} }
} elsif($res == AUTH_REQUIRED) { } elsif($res == AUTH_REQUIRED) {
@ -576,7 +576,9 @@ sub is_true {
# build credential cache key # build credential cache key
sub get_cache_key { sub get_cache_key {
my ($r, $password) = @_; my ($r, $password) = @_;
return Digest::SHA::sha1_hex(join(':', get_project_identifier($r), $r->user, $password, is_read_request($r) ? 'read' : 'write')); my $project = get_project_identifier($r)
or return;
return Digest::SHA::sha1_hex(join(':', $project, $r->user, $password, is_read_request($r) ? 'read' : 'write'));
} }
# check if credentials exist in cache # check if credentials exist in cache