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

Use unparsed_uri() instead of concatenating uri and args

Browse Source 
Use unescaped uri in goToPortal to avoid encoding problems
This commit is contained in:
Xavier Guimard 2013-07-17 06:21:01 +00:00
parent 8bfd7925ce
commit 30a7d00641
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,9 +426,9 @@ sub safe {
}
next if ( $class->can($_) );
eval "sub $_ {
return $sub(\$apacheRequest->uri
. ( \$apacheRequest->args ? '?' . \$apacheRequest->args : '' )
, \@_)
my \$uri = \$apacheRequest->unparsed_uri();
Apache2::URI::unescape_url(\$uri);
return $sub(\$uri, \@_)
}";
$class->lmLog( $@, 'error' ) if ($@);
}
@ -979,7 +979,8 @@ sub run ($$) {
);
return REDIRECT;
}
my $uri = $apacheRequest->uri . ( $args ? "?$args" : "" );
my $uri = $apacheRequest->unparsed_uri();
my $uri_orig = $uri;
Apache2::URI::unescape_url($uri);
my $protection = $class->isUnprotected($uri);
@ -1053,7 +1054,7 @@ sub run ($$) {
# if the cookie was fetched, a log is sent by retrieveSession()
$class->updateStatus( $apacheRequest->connection->remote_ip,
$apacheRequest->uri, $id ? 'EXPIRED' : 'REDIRECT' );
return $class->goToPortal($uri);
return $class->goToPortal($uri_orig);
}
}
@ -1320,7 +1321,7 @@ sub abort {
# If abort is called without a valid request, fall to die
eval {
my $args = $apacheRequest->args;
my $uri = $apacheRequest->uri . ( $args ? "?$args" : "" );
my $uri = $apacheRequest->unparsed_uri();
# Set error 500 in logs even if "useRedirectOnError" is set
$apacheRequest->push_handlers(