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

Improve code

This commit is contained in:
Christophe Maudoux 2022-05-19 23:21:30 +02:00
parent 82c10e3ecd
commit d40459b9b7
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Run.pm
View File

@ -1,7 +1,7 @@
# Main running methods file # Main running methods file
package Lemonldap::NG::Handler::Main::Run; package Lemonldap::NG::Handler::Main::Run;
our $VERSION = '2.0.14'; our $VERSION = '2.0.15';
package Lemonldap::NG::Handler::Main; package Lemonldap::NG::Handler::Main;
@ -227,6 +227,7 @@ sub run {
$class->cleanHeaders($req); $class->cleanHeaders($req);
return $class->OK; return $class->OK;
} }
elsif ( $protection == $class->MAYSKIP elsif ( $protection == $class->MAYSKIP
and $class->grant( $req, $session, $uri, $cond ) eq '999_SKIP' ) and $class->grant( $req, $session, $uri, $cond ) eq '999_SKIP' )
{ {
@ -327,8 +328,7 @@ sub getLevel {
} }
} }
if ($level) { if ($level) {
$class->logger->debug( $class->logger->debug("Found AuthnLevel=$level for \"$vhost$uri\"");
'Found AuthnLevel=' . $level . ' for "' . "$vhost$uri" . '"' );
return $level; return $level;
} }
else { else {
@ -345,7 +345,7 @@ sub getLevel {
sub grant { sub grant {
my ( $class, $req, $session, $uri, $cond, $vhost ) = @_; my ( $class, $req, $session, $uri, $cond, $vhost ) = @_;
return $cond->( $req, $session ) if ($cond); return $cond->( $req, $session ) if $cond;
$vhost ||= $class->resolveAlias($req); $vhost ||= $class->resolveAlias($req);
my $level = $class->getLevel( $req, $uri ); my $level = $class->getLevel( $req, $uri );
@ -646,14 +646,10 @@ sub _getPort {
return $class->tsv->{port}->{$vhost}; return $class->tsv->{port}->{$vhost};
} }
else { else {
if ( defined $class->tsv->{port}->{_} return ( defined $class->tsv->{port}->{_}
and ( $class->tsv->{port}->{_} > 0 ) ) and ( $class->tsv->{port}->{_} > 0 ) )
{ ? $class->tsv->{port}->{_}
return $class->tsv->{port}->{_}; : $req->port;
}
else {
return $req->port;
}
} }
} }
@ -670,14 +666,10 @@ sub _isHttps {
return $class->tsv->{https}->{$vhost}; return $class->tsv->{https}->{$vhost};
} }
else { else {
if ( defined $class->tsv->{https}->{_} return ( defined $class->tsv->{https}->{_}
and ( $class->tsv->{https}->{_} > -1 ) ) and ( $class->tsv->{https}->{_} > -1 ) )
{ ? $class->tsv->{https}->{_}
return $class->tsv->{https}->{_}; : $req->secure;
}
else {
return $req->secure;
}
} }
} }
@ -715,9 +707,8 @@ sub isUnprotected {
$i++ $i++
) )
{ {
if ( $uri =~ $class->tsv->{locationRegexp}->{$vhost}->[$i] ) { return $class->tsv->{locationProtection}->{$vhost}->[$i]
return $class->tsv->{locationProtection}->{$vhost}->[$i]; if ( $uri =~ $class->tsv->{locationRegexp}->{$vhost}->[$i] );
}
} }
return $class->tsv->{defaultProtection}->{$vhost}; return $class->tsv->{defaultProtection}->{$vhost};
} }
@ -785,8 +776,8 @@ sub resolveAlias {
$vhost =~ s/:\d+//; $vhost =~ s/:\d+//;
return $class->tsv->{vhostAlias}->{$vhost} return $class->tsv->{vhostAlias}->{$vhost}
if ( $class->tsv->{vhostAlias}->{$vhost} ); if $class->tsv->{vhostAlias}->{$vhost};
return $vhost if ( $class->tsv->{defaultCondition}->{$vhost} ); return $vhost if $class->tsv->{defaultCondition}->{$vhost};
foreach ( @{ $class->tsv->{vhostReg} } ) { foreach ( @{ $class->tsv->{vhostReg} } ) {
return $_->[1] if $vhost =~ $_->[0]; return $_->[1] if $vhost =~ $_->[0];
} }