jro_apps/redmine Commit - r1630:f7ede727fd0e

Initial support for caching credentials in Memcached (debug is enabled)....

Liwiusz Ociepa -

r1630:f7ede727fd0e

parent child

Context file:

r1630:f7ede727fd0e

Collapse all files

extra/svn/Redmine.pm +58 -24

                  ## Optional where clause (fulltext search would be slow and
                  ## database dependant).
                  # RedmineDbWhereClause "and members.role_id IN (1,2)"
-                 ## Optional credentials cache size
+                 ## Configuration for memcached
-                 # RedmineCacheCredsMax 50
+                 # RedmineMemcacheServers "127.0.0.1:112211"
+                 # RedmineMemcacheExpirySec "12"
+                 # # Defaults to "RedminePM:"
+                 # RedmineMemcacheNamespace "RedmineCreds:"
               </Location>
             To be able to browse repository inside redmine, you must add something
             use Digest::SHA1;
             # optional module for LDAP authentication
             my $CanUseLDAPAuth = eval("use Authen::Simple::LDAP; 1");
+            my $CanUseMemcached = eval("use Cache::Memcached; 1");
             use Apache2::Module;
             use Apache2::Access;
             use Apache2::RequestRec qw();
             use Apache2::RequestUtil qw();
             use Apache2::Const qw(:common :override :cmd_how);
-            use APR::Pool ();
-            use APR::Table ();
             # use Apache2::Directive qw();
                 args_how => TAKE1,
               },
               {
-                name => 'RedmineCacheCredsMax',
+                name => 'RedmineMemcacheServers',
+                req_override => OR_AUTHCFG,
+                args_how => TAKE1,
+              },
+              {
+                name => 'RedmineMemcacheExpirySec',
+                req_override => OR_AUTHCFG,
+                args_how => TAKE1,
+              },
+              {
+                name => 'RedmineMemcacheNamespace',
                 req_override => OR_AUTHCFG,
                 args_how => TAKE1,
-                errmsg => 'RedmineCacheCredsMax must be decimal number',
               },
             );
               $self->{RedmineQuery} = trim($self->{RedmineQuery}.($arg ? $arg : "")." ");
             }
-            sub RedmineCacheCredsMax {
+            sub RedmineMemcacheServers {
               my ($self, $parms, $arg) = @_;
-              if ($arg) {
+              if ($arg && $CanUseMemcached) {
-                $self->{RedmineCachePool} = APR::Pool->new;
+                $self->{RedmineMemcached} = new Cache::Memcached {
-                $self->{RedmineCacheCreds} = APR::Table::make($self->{RedmineCachePool}, $arg);
+                  'servers' => [ $arg, ],
-                $self->{RedmineCacheCredsCount} = 0;
+                  'debug' => 1,
-                $self->{RedmineCacheCredsMax} = $arg;
+                };
+                $self->{RedmineMemcache} = 1;
+                # Undocumented feature of Cache::Memcached, please don't kill me
+                if (0 == length $self->{RedmineMemcached}->{namespace}) {
+                  $self->{RedmineMemcached}->{namespace} = "RedminePM:";
+                  $self->{RedmineMemcached}->{namespace_len} = length $self->{RedmineMemcached}->{namespace};
+                }
+              }
+            }
+            sub RedmineMemcacheExpirySec { set_val('RedmineMemcacheExpirySec', @_); }
+            sub RedmineMemcacheNamespace {
+              my ($self, $parms, $arg) = @_;
+              if ($CanUseMemcached) {
+                # Undocumented feature of Cache::Memcached, please don't kill me
+                $self->{RedmineMemcached}->{namespace} = $arg;
+                $self->{RedmineMemcached}->{namespace_len} = length $self->{RedmineMemcached}->{namespace};
               }
             }
                 my $project_id = shift;
                 my $r = shift;
+                my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
+                if ($cfg->{RedmineMemcache}) {
+                  return 1 if ($cfg->{RedmineMemcached}->get($project_id));
+                }
                 my $dbh = connect_database($r);
                 my $sth = $dbh->prepare(
                     "SELECT * FROM projects WHERE projects.identifier=? and projects.is_public=true;"
                 my $ret = $sth->fetchrow_array ? 1 : 0;
                 $sth->finish();
                 $dbh->disconnect();
+                if ($cfg->{RedmineMemcache}) {
+                  if ($cfg->{RedmineMemcacheExpirySec}) {
+                    $cfg->{RedmineMemcached}->set($project_id, $ret, $cfg->{RedmineMemcacheExpirySec});
+                  } else {
+                    $cfg->{RedmineMemcached}->set($project_id, $ret);
+                  }
+                }
                 $ret;
             }
               my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
               my $usrprojpass;
-              if ($cfg->{RedmineCacheCredsMax}) {
+              if ($cfg->{RedmineMemcache}) {
-                $usrprojpass = $cfg->{RedmineCacheCreds}->get($redmine_user.":".$project_id);
+                $usrprojpass = $cfg->{RedmineMemcached}->get($redmine_user.":".$project_id);
                 return 1 if (defined $usrprojpass and ($usrprojpass eq $pass_digest));
               }
               my $query = $cfg->{RedmineQuery};
               $sth->finish();
               $dbh->disconnect();
-              if ($cfg->{RedmineCacheCredsMax} and $ret) {
+              if ($cfg->{RedmineMemcache} and $ret) {
-                if (defined $usrprojpass) {
+                if ($cfg->{RedmineMemcacheExpirySec}) {
-                  $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
+                  $cfg->{RedmineMemcached}->set($redmine_user.":".$project_id, $pass_digest, $cfg->{RedmineMemcacheExpirySec});
                 } else {
-                  if ($cfg->{RedmineCacheCredsCount} < $cfg->{RedmineCacheCredsMax}) {
+                  $cfg->{RedmineMemcached}->set($redmine_user.":".$project_id, $pass_digest);
-                    $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
-                    $cfg->{RedmineCacheCredsCount}++;
-                  } else {
-                    $cfg->{RedmineCacheCreds}->clear();
-                    $cfg->{RedmineCacheCredsCount} = 0;
                 }
               }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages