diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101125/01989e65/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101125/01989e65/attachment-0001.html | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101125/01989e65/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101125/01989e65/attachment-0001.html new file mode 100644 index 000000000..37426d03a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101125/01989e65/attachment-0001.html @@ -0,0 +1,133 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[139] Dont hardcode filters, but use user's store configuration</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>139</dd> +<dt>Author</dt> <dd>buchan</dd> +<dt>Date</dt> <dd>2010-11-25 12:34:51 +0100 (Thu, 25 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Dont hardcode filters, but use user's store configuration +This allows configuration of which user attribute to login with, by +only changing authentication configuration (e.g. in catdap_local.yml)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunklibCatDapControlleruserpm">identity/CatDap/trunk/lib/CatDap/Controller/user.pm</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunklibCatDapControlleruserpm">Modified: identity/CatDap/trunk/lib/CatDap/Controller/user.pm</a> +=================================================================== +--- identity/CatDap/trunk/lib/CatDap/Controller/user.pm 2010-11-25 09:26:28 UTC (rev 138) ++++ identity/CatDap/trunk/lib/CatDap/Controller/user.pm 2010-11-25 11:34:51 UTC (rev 139) +@@ -126,6 +126,7 @@ + my $password; + my $mesg; + my $dn; ++ my $userfilter; + + if (not defined $c->user ) { + $c->stash(template => 'index.tt'); +@@ -140,8 +141,10 @@ + + my $user = $c->user->username; + my $entry; +- $c->log->debug("Searching for user $user"); +- $mesg = $c->model('User')->search("(&(objectclass=inetOrgPerson)(uid=$user))"); ++ $userfilter = $c->user->store->user_filter; ++ $userfilter =~ s/\%s/$user/g, ++ $c->log->debug("Searching for user $user with filter $userfilter"); ++ $mesg = $c->model('User')->search($userfilter); + $entry = $mesg->entry; + my %mods; + my %params = %{$c->req->parameters}; +@@ -165,7 +168,7 @@ + } + } + +- $mesg = $c->model('User')->search("(&(objectclass=inetOrgPerson)(uid=$user))"); ++ $mesg = $c->model('User')->search($userfilter); + $c->log->debug($mesg->error) if $mesg->code; + $entry = $mesg->entry; + $c->log->debug($mesg->error) if $mesg->code; +@@ -222,12 +225,14 @@ + + sub add : Local { + my ( $self, $c) = @_; +- my ($mesg,$entry,$user,$attr,$value); ++ my ($mesg,$entry,$user,$attr,$value,$userfilter); + $attr = $c->req->param('attribute'); + $value = $c->req->param('value'); + $user = $c->user->username; +- $c->log->debug("Searching for user $user"); +- $mesg = $c->model('User')->search("(&(objectclass=inetOrgPerson)(uid=$user))"); ++ $userfilter = $c->user->store->user_filter; ++ $userfilter = s/%s/$c->user->username/g; ++ $c->log->debug("Searching for user $user with $userfilter"); ++ $mesg = $c->model('User')->search($userfilter); + $entry = $mesg->entry; + $entry->add( $attr => $value); + $c->log->info("Adding $attr = $value to user $user"); +@@ -239,10 +244,12 @@ + + sub delete : Local : Args(2) { + my ( $self, $c, $attrname,$attrvalue) = @_; +- my ($mesg,$entry,$user); ++ my ($mesg,$entry,$user,$userfilter); + $user = $c->user->username; ++ $userfilter = $c->user->store->user_filter; ++ $userfilter =~ s/%s/$c->user->username/g; + $c->log->debug("Searching for user $user"); +- $mesg = $c->model('User')->search("(&(objectclass=inetOrgPerson)(uid=$user))"); ++ $mesg = $c->model('User')->search($userfilter); + $entry = $mesg->entry; + $c->log->info("Deleting $attrname = $attrvalue from user $user"); + $entry->delete($attrname => $attrvalue); + +</pre></div> + +</body> +</html>
\ No newline at end of file |