- simplification of jail_reval call (references #630)
This commit is contained in:
parent
b3d05721a8
commit
262fdaef2c
|
@ -278,7 +278,7 @@ sub forgeHeadersInit {
|
||||||
);
|
);
|
||||||
$self->safe( $jail->build_safe() );
|
$self->safe( $jail->build_safe() );
|
||||||
$forgeHeaders->{$alias} =
|
$forgeHeaders->{$alias} =
|
||||||
$jail->jail_reval( "sub{$sub}", "sub{return($sub)}" );
|
$jail->jail_reval( $sub );
|
||||||
|
|
||||||
Lemonldap::NG::Handler::Main::Logger->lmLog(
|
Lemonldap::NG::Handler::Main::Logger->lmLog(
|
||||||
"$self: Unable to forge headers: $@: sub {$sub}", 'error' )
|
"$self: Unable to forge headers: $@: sub {$sub}", 'error' )
|
||||||
|
@ -476,7 +476,7 @@ sub conditionSub {
|
||||||
'customFunctions' => $self->customFunctions
|
'customFunctions' => $self->customFunctions
|
||||||
);
|
);
|
||||||
$self->safe( $jail->build_safe() );
|
$self->safe( $jail->build_safe() );
|
||||||
my $sub = $jail->jail_reval( "sub{return($cond)}", "sub{return($cond)}" );
|
my $sub = $jail->jail_reval( $cond );
|
||||||
|
|
||||||
# Return sub and protected flag
|
# Return sub and protected flag
|
||||||
return ( $sub, 0 );
|
return ( $sub, 0 );
|
||||||
|
|
|
@ -117,12 +117,12 @@ sub share_from {
|
||||||
# Build and return restricted eval command with SAFEWRAP, if activated
|
# Build and return restricted eval command with SAFEWRAP, if activated
|
||||||
# @return evaluation of $reval or $reval2
|
# @return evaluation of $reval or $reval2
|
||||||
sub jail_reval {
|
sub jail_reval {
|
||||||
my ( $self, $reval, $reval2 ) = splice @_;
|
my ( $self, $reval ) = splice @_;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
SAFEWRAP
|
SAFEWRAP
|
||||||
? $self->safe->wrap_code_ref( $self->safe->reval($reval) )
|
? $self->safe->wrap_code_ref( $self->safe->reval("sub{$reval}") )
|
||||||
: $self->safe->reval($reval2)
|
: $self->safe->reval("sub{return($reval)}")
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user