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

Fix SSL/Kerberos Auth with Choice (#1636)

Browse Source
This commit is contained in:
Christophe Maudoux 2019-02-03 00:17:53 +01:00
parent a084ba3c84
commit 3021e998a7
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Choice.pm
View File

@ -2,7 +2,7 @@ package Lemonldap::NG::Portal::Auth::Choice;
use strict; use strict;
use Mouse; use Mouse;
use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_FIRSTACCESS); use Lemonldap::NG::Portal::Main::Constants qw(PE_OK PE_FIRSTACCESS PE_ERROR);
our $VERSION = '2.0.2'; our $VERSION = '2.0.2';
@ -25,17 +25,21 @@ sub _authCancel {
sub extractFormInfo { sub extractFormInfo {
my ( $self, $req ) = @_; my ( $self, $req ) = @_;
unless ( $self->checkChoice($req) ) { unless ( $self->checkChoice($req) ) {
$self->logger->debug("Searching for Auth module AJAX init/script..."); $self->logger->debug("Initializing Auth modules...");
foreach my $mod ( values %{ $self->modules } ) { foreach my $mod ( values %{ $self->modules } ) {
if ( $mod->{AjaxInitScript} and $mod->{Name} ) { if ( $mod->{AjaxInitScript} ) {
$self->logger->debug( $self->logger->debug(
'Append ' . $mod->Name . ' init/script' ); 'Append ' . $mod->{Name} . ' init/script' ) if $mod->{Name};
$req->data->{customScript} .= $mod->AjaxInitScript; $req->data->{customScript} .= $mod->AjaxInitScript;
} }
if ( $mod->{InitCmd} ) { if ( $mod->{InitCmd} ) {
eval( $mod->{InitCmd} ); $self->logger->debug(
die 'Unable to launch init commmand ' . $mod->{InitCmd} 'Launch ' . $mod->{Name} . ' init command' ) if $mod->{Name};
if ($@); my $res = eval( $mod->{InitCmd} );
if ($@) {
$self->logger("Auth error: $@");
return PE_ERROR;
}
} }
} }
foreach my $mod ( values %{ $self->modules } ) { foreach my $mod ( values %{ $self->modules } ) {

1
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -460,6 +460,7 @@ sub buildHiddenForm {
if $self->checkXSSAttack( $_, $req->{portalHiddenFormValues}->{$_} ); if $self->checkXSSAttack( $_, $req->{portalHiddenFormValues}->{$_} );
# Build hidden input HTML code # Build hidden input HTML code
#$val .= qq{<input type="hidden" name="$_" id="$_" value="}
$val .= qq{<input type="hidden" name="$_" id="$_" value="} $val .= qq{<input type="hidden" name="$_" id="$_" value="}
. $req->{portalHiddenFormValues}->{$_} . '" />'; . $req->{portalHiddenFormValues}->{$_} . '" />';
} }

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -607,7 +607,7 @@ sub autoPost {
# Add element into $self->{portalHiddenFormValues}, those values could be # Add element into $self->{portalHiddenFormValues}, those values could be
# used to hide values into HTML form. # used to hide values into HTML form.
# @param fieldname The field name which will contain the correponding value # @param fieldname The field name which will contain the corresponding value
# @param value The associated value # @param value The associated value
# @param prefix Prefix of the field key # @param prefix Prefix of the field key
# @param base64 Encode value in base64 # @param base64 Encode value in base64