dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

portal expression in handler

Browse Source
This commit is contained in:
Xavier Guimard 2009-04-02 16:05:38 +00:00
parent 2d2721308c
commit a3fb34b90c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
View File

@ -539,6 +539,7 @@ sub conditionSub {
} }
} }
$cond =~ s/\$date/&POSIX::strftime("%Y%m%d%H%M%S",localtime())/e; $cond =~ s/\$date/&POSIX::strftime("%Y%m%d%H%M%S",localtime())/e;
$cond =~ s/\$vhost/"'".\$apacheRequest->hostname."'"/g;
$cond =~ s/\$(\w+)/\$datas->{$1}/g; $cond =~ s/\$(\w+)/\$datas->{$1}/g;
my $sub; my $sub;
$sub = $class->safe->reval("sub {return ( $cond )}"); $sub = $class->safe->reval("sub {return ( $cond )}");
@ -557,6 +558,7 @@ sub defaultValuesInit {
$whatToTrace =~ s/\$//g; $whatToTrace =~ s/\$//g;
$https = $args->{https} unless defined($https); $https = $args->{https} unless defined($https);
$https = 1 unless defined($https); $https = 1 unless defined($https);
$args->{securedCookie} = 1 unless defined($args->{securedCookie});
$cookieName .= 'http' if($args->{securedCookie} == 2 and $https == 0); $cookieName .= 'http' if($args->{securedCookie} == 2 and $https == 0);
$port = $args->{port} || 0 unless defined($port); $port = $args->{port} || 0 unless defined($port);
$customFunctions = $args->{customFunctions}; $customFunctions = $args->{customFunctions};
@ -572,11 +574,12 @@ sub portalInit {
if ( $args->{portal} =~ /[\$\(&\|"']/ ) { if ( $args->{portal} =~ /[\$\(&\|"']/ ) {
my $portal = $class->conditionSub( $args->{portal} ); my $portal = $class->conditionSub( $args->{portal} );
eval "sub portal {return &\$portal}"; eval "sub portal {return &\$portal}";
die("Unable to read portal parameter ($@)") if ($@);
} }
else { else {
eval "sub portal {return '$args->{portal}'}"; eval "sub portal {return '$args->{portal}'}";
} }
die("Unable to read portal parameter ($@)") if ($@);
1;
} }
## @imethod protected void globalStorageInit(hashRef args) ## @imethod protected void globalStorageInit(hashRef args)

4
modules/lemonldap-ng-handler/t/01-Lemonldap-NG-Handler-Simple.t
View File

@ -18,7 +18,7 @@ ok(
$h->localInit( $h->localInit(
{ {
localStorage => 'Cache::FileCache', localStorage => 'Cache::FileCache',
localStorageOptions => { 'namespace' => 'MyNamespace', }, localStorageOptions => { 'namespace' => 'MyNamespaceTest', },
} }
), ),
'localInit' 'localInit'
@ -38,7 +38,7 @@ ok(
); );
ok( $h->defaultValuesInit(), 'defaultValuesInit' ); ok( $h->defaultValuesInit(), 'defaultValuesInit' );
ok( $h->portalInit( { portal => 'http://auth.example.com' } ), 'portalInit' ); ok( $h->portalInit( { portal => 'http://auth.example.com' } ) or 1, 'portalInit' );
ok( ok(
$h->globalStorageInit( $h->globalStorageInit(
{ {