mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-17 06:28:13 +00:00
Cache Credentials added (login:proj -> "sha1_hex(pass))
git-svn-id: http://redmine.rubyforge.org/svn/branches/swistak@1419 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
b84cffd62e
commit
35f601e769
@ -61,6 +61,8 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
|
|||||||
## Optional where clause (fulltext search would be slow and
|
## Optional where clause (fulltext search would be slow and
|
||||||
## database dependant).
|
## database dependant).
|
||||||
# RedmineDbWhereClause "and members.role_id IN (1,2)"
|
# RedmineDbWhereClause "and members.role_id IN (1,2)"
|
||||||
|
## Optional credentials cache size
|
||||||
|
# RedmineCacheCredsMax 50
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
To be able to browse repository inside redmine, you must add something
|
To be able to browse repository inside redmine, you must add something
|
||||||
@ -108,6 +110,8 @@ use Apache2::ServerRec qw();
|
|||||||
use Apache2::RequestRec qw();
|
use Apache2::RequestRec qw();
|
||||||
use Apache2::RequestUtil qw();
|
use Apache2::RequestUtil qw();
|
||||||
use Apache2::Const qw(:common :override :cmd_how);
|
use Apache2::Const qw(:common :override :cmd_how);
|
||||||
|
use APR::Pool ();
|
||||||
|
use APR::Table ();
|
||||||
|
|
||||||
# use Apache2::Directive qw();
|
# use Apache2::Directive qw();
|
||||||
|
|
||||||
@ -133,6 +137,11 @@ my @directives = (
|
|||||||
req_override => OR_AUTHCFG,
|
req_override => OR_AUTHCFG,
|
||||||
args_how => TAKE1,
|
args_how => TAKE1,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name => 'RedmineCacheCredsMax',
|
||||||
|
req_override => OR_AUTHCFG,
|
||||||
|
args_how => TAKE1,
|
||||||
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
sub RedmineDSN { set_val('RedmineDSN', @_); }
|
sub RedmineDSN { set_val('RedmineDSN', @_); }
|
||||||
@ -152,6 +161,16 @@ sub RedmineDbWhereClause {
|
|||||||
$self->{RedmineQuery} = trim($query.($arg ? $arg : "").";");
|
$self->{RedmineQuery} = trim($query.($arg ? $arg : "").";");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub RedmineCacheCredsMax {
|
||||||
|
my ($self, $parms, $arg) = @_;
|
||||||
|
if ($arg) {
|
||||||
|
$self->{RedmineCachePool} = APR::Pool->new;
|
||||||
|
$self->{RedmineCacheCreds} = APR::Table::make($self->{RedmineCachePool}, $arg);
|
||||||
|
$self->{RedmineCacheCredsCount} = 0;
|
||||||
|
$self->{RedmineCacheCredsMax} = $arg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sub trim {
|
sub trim {
|
||||||
my $string = shift;
|
my $string = shift;
|
||||||
$string =~ s/\s{2,}/ /g;
|
$string =~ s/\s{2,}/ /g;
|
||||||
@ -243,6 +262,11 @@ sub is_member {
|
|||||||
my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
|
my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
|
||||||
|
|
||||||
my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
|
my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
|
||||||
|
my $usrprojpass;
|
||||||
|
if ($cfg->{RedmineCacheCredsMax}) {
|
||||||
|
$usrprojpass = $cfg->{RedmineCacheCreds}->get($redmine_user.":".$project_id);
|
||||||
|
return 1 if (defined $usrprojpass and ($usrprojpass eq $pass_digest));
|
||||||
|
}
|
||||||
my $query = $cfg->{RedmineQuery};
|
my $query = $cfg->{RedmineQuery};
|
||||||
my $sth = $dbh->prepare($query);
|
my $sth = $dbh->prepare($query);
|
||||||
$sth->execute($redmine_user, $project_id);
|
$sth->execute($redmine_user, $project_id);
|
||||||
@ -276,6 +300,20 @@ sub is_member {
|
|||||||
$sth->finish();
|
$sth->finish();
|
||||||
$dbh->disconnect();
|
$dbh->disconnect();
|
||||||
|
|
||||||
|
if ($cfg->{RedmineCacheCredsMax} and $ret) {
|
||||||
|
if (defined $usrprojpass) {
|
||||||
|
$cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
|
||||||
|
} else {
|
||||||
|
if ($cfg->{RedmineCacheCredsCount} < $cfg->{RedmineCacheCredsMax}) {
|
||||||
|
$cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
|
||||||
|
$cfg->{RedmineCacheCredsCount}++;
|
||||||
|
} else {
|
||||||
|
$cfg->{RedmineCacheCreds}->clear();
|
||||||
|
$cfg->{RedmineCacheCredsCount} = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$ret;
|
$ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user