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

Rename pm (#1151)

Browse Source
This commit is contained in:
Xavier Guimard 2017-02-05 08:26:38 +00:00
parent 7a675d14ca
commit 00ee360511
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-common/MANIFEST
View File

@ -11,7 +11,7 @@ lib/Lemonldap/NG/Common/Apache/Session/Store.pm
lib/Lemonldap/NG/Common/Captcha.pm
lib/Lemonldap/NG/Common/CGI.pm
lib/Lemonldap/NG/Common/Cli.pm
lib/Lemonldap/NG/Common/CombinationParser.pm
lib/Lemonldap/NG/Common/Combination/Parser.pm
lib/Lemonldap/NG/Common/Conf.pm
lib/Lemonldap/NG/Common/Conf/AccessLib.pm
lib/Lemonldap/NG/Common/Conf/Backends/_DBI.pm

43
lemonldap-ng-common/lib/Lemonldap/NG/Common/CombinationParser.pm → lemonldap-ng-common/lib/Lemonldap/NG/Common/Combination/Parser.pm
View File

@ -1,12 +1,13 @@
package Lemonldap::NG::Common::CombinationParser;
package Lemonldap::NG::Common::Combination::Parser;
use strict;
use Mouse;
use Safe;
use constant PE_OK => 0;
# Handle "if then else" (used during init)
# return a sub that can be called with ($req) to get a [array] of combination
#
#
# During auth, these combinations represents "or" (like Multi)
# Each combination is a [authSub,userSub] called like this:
# $authSub->('authenticate',$req)
@ -22,41 +23,31 @@ sub parse {
my ( $cond, $then, $else );
( $cond, $rest ) = $self->findB( $rest, ')' );
unless ($cond) {
$self->lmLog( 'Bad combination: unmatched bracket', 'error' );
return undef;
die('Bad combination: unmatched bracket');
}
unless ( $rest =~ s/\s*then\s*\{// ) {
$self->lmLog( 'Bad combination: missing "then"', 'error' );
return undef;
die('Bad combination: missing "then"');
}
( $then, $rest ) = $self->findB( $rest, '}' );
unless ($then) {
$self->lmLog( 'Bad combination: missing "then" content', 'error' );
return undef;
die('Bad combination: missing "then" content');
}
unless ( $rest =~ s/\s*else\s*\{// ) {
$self->lmLog( 'Bad combination: missing "else"', 'error' );
return undef;
die('Bad combination: missing "else"');
}
( $else, $rest ) = $self->findB( $rest, '}' );
unless ($else) {
$self->lmLog( 'Bad combination: missing "else" content', 'error' );
return undef;
die('Bad combination: missing "else" content');
}
if ( $rest !~ /^\s*$/ ) {
$self->lmLog( 'Bad combination: trailing characters after else{}',
'error' );
return undef;
die('Bad combination: trailing characters after else{}');
}
#TODO:
#$cond = HANDLER->buildSub($cond);
$cond = sub { 1 };
$cond = buildSub($cond);
$then = $self->parse( $moduleList, $then );
$else = $self->parse( $moduleList, $else );
unless ( $then and $else ) {
$self->lmLog('Bad combination: bad then or else');
return undef;
die('Bad combination: bad then or else');
}
return sub {
my ( $sub, $req ) = @_;
@ -177,8 +168,7 @@ sub findB {
my ( $m, $rest ) =
$self->findB( join( '', @chars ), $wanted );
unless ($m) {
$self->lmLog( "Bad combination: unmatched $c", 'error' );
return undef;
die("Bad combination: unmatched $c");
}
$res .= "$c$m$wanted";
@chars = split //, $rest;
@ -189,4 +179,13 @@ sub findB {
return undef;
}
# Compiles condition into sub
sub buildSub {
my ( $self, $cond ) = @_;
my $safe = Safe->new;
my $res = $safe->reval("sub{my(\$req)=@\_;return ($cond)}");
die "Bad condition $cond: $@" if ($@);
return $res;
}
1;