Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WWSympa: Redirect without Status field may bring to empty page #164

Merged
merged 2 commits into from
Jan 24, 2018
Merged

WWSympa: Redirect without Status field may bring to empty page #164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4976412
[bug] After successful login, user may show the empty page instead of…
ikedas Jan 15, 2018
00ea0ff
Fixing more (need further refactoring).
ikedas Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 47 additions & 42 deletions src/cgi/wwsympa.fcgi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ while ($query = CGI::Fast->new) {
$cas_server->getServerLoginGatewayURL($return_url);

if ($redirect_url =~ /http(s)+\:\//i) {
$in{'action'} = 'redirect';
$in{'action'} = 'redirect'; #FIXME
$param->{'redirect_to'} = $redirect_url;

last;
Expand Down Expand Up @@ -1507,7 +1507,8 @@ while ($query = CGI::Fast->new) {
# - A lot of other methods where used in the past (before session was
# introduced in Sympa). We must clean all.
# N.B.: Location to where redirect should respect local authority.
unless ($temporary_actions{$action} or $ENV{'REQUEST_METHOD'} ne 'GET') {
if (not $temporary_actions{$action}
and $ENV{'REQUEST_METHOD'} eq 'GET') {
my $redirect_url =
Sympa::Tools::WWW::get_my_url($robot, authority => 'local');
$redirect_url =~ s/[?].*\z//;
Expand Down Expand Up @@ -1562,7 +1563,7 @@ while ($query = CGI::Fast->new) {

unless ($comm{$action}) {
if (my $list = Sympa::List->new($action, $robot)) {
do_redirect(
_redirect(
Sympa::get_url(
$list, 'info',
nomenu => $param->{'nomenu'},
Expand Down Expand Up @@ -1927,7 +1928,7 @@ while ($query = CGI::Fast->new) {
# close FILE;
} elsif ($param->{'redirect_to'}) {
$log->syslog('notice', 'Redirecting to %s', $param->{'redirect_to'});
print "Location: $param->{'redirect_to'}\n\n";
_redirect($param->{'redirect_to'});
} else {
prepare_report_user();
send_html('main.tt2');
Expand Down Expand Up @@ -3434,9 +3435,14 @@ sub do_login {

web_db_stat_log();

do_redirect($session->{'redirect_url'});
return;

_redirect(
$session->{'redirect_url'} || Sympa::get_url(
$robot, undef,
nomenu => $param->{'nomenu'},
authority => 'local'
)
);
return 1;
}

## Login WWSympa
Expand Down Expand Up @@ -3494,12 +3500,9 @@ sub do_sso_login {
my $redirect_url = $cas_server->getServerLoginURL($service);
wwslog('info', '(%s)', $redirect_url);
if ($redirect_url =~ /http(s)+\:\//i) {
$in{'action'} = 'redirect';
$in{'action'} = 'redirect'; #FIXME
$param->{'redirect_to'} = $redirect_url;
$param->{'bypass'} = 'extreme';
$session->set_cookie($param->{'cookie_domain'}, 'session');
#$session->set_cookie('localhost','session');
print "Location: $param->{'redirect_to'}\n\n";
_redirect($redirect_url);
}

} elsif (
Expand Down Expand Up @@ -3539,11 +3542,9 @@ sub do_sso_login {
);

wwslog('info', 'Redirect user to %s', $service);
$in{'action'} = 'redirect';
$in{'action'} = 'redirect'; #FIXME
$param->{'redirect_to'} = $service;
$param->{'bypass'} = 'extreme';
print "Location: $param->{'redirect_to'}\n\n";

_redirect($service);
return 1;
}

Expand Down Expand Up @@ -3877,8 +3878,14 @@ sub do_sso_login {
## Required to provide logout feature if available
$session->{'sso_id'} = $in{'auth_service_name'};

do_redirect($session->{'redirect_url'});
return;
_redirect(
$session->{'redirect_url'} || Sympa::get_url(
$robot, undef,
nomenu => $param->{'nomenu'},
authority => 'local'
)
);
return 1;
} else {
## Unknown SSO service
Sympa::Report::reject_report_web(
Expand Down Expand Up @@ -3938,8 +3945,14 @@ sub do_sso_login_succeeded {
$param->{'back_to_mom'} = 1;
return 1;
} else {
do_redirect($session->{'redirect_url'});
return;
_redirect(
$session->{'redirect_url'} || Sympa::get_url(
$robot, undef,
nomenu => $param->{'nomenu'},
authority => 'local'
)
);
return 1;
}
}

Expand Down Expand Up @@ -4051,24 +4064,19 @@ sub do_help {
return 1;
}

# update session cookie and redirect the client to redirect_to parameter or
# glob var;
#FIXME: Would be obsoleted. Used internally only.
sub do_redirect {
_redirect($param->{'redirect_to'});
return 1;
}

# update session cookie and redirect the client to redirect_to parameter or
# glob var;
sub _redirect {
my $redirect_to = shift;
wwslog('info', '(%s)', $redirect_to);

$redirect_to ||= $param->{'redirect_to'};
# Because of some bug Sympa did redirection to an empty URL. Lines below
# should prevent it.
$redirect_to ||= Sympa::get_url(
$robot, undef,
nomenu => $param->{'nomenu'},
authority => 'local'
);

#$session->set_cookie('localhost','session');
$session->set_cookie($param->{'cookie_domain'}, 'session');
print "Status: 302 Moved\n";
print "Location: $redirect_to\n\n";
$param->{'bypass'} = 'extreme';
return 1;
Expand All @@ -4095,15 +4103,14 @@ sub do_logout {
my $cas_server =
$Conf::Conf{'auth_services'}{$robot}[$session->{'cas_server'}]
{'cas_server'};
delete $session->{'cas_server'};

$in{'action'} = 'redirect';
my $return_url = Sympa::Tools::WWW::get_my_url($robot);
$return_url =~ s{/logout\b}{};

$param->{'redirect_to'} =
my $redirect_url =
$cas_server->getServerLogoutURL($return_url);

delete $session->{'cas_server'};
$in{'action'} = 'redirect'; #FIXME
$param->{'redirect_to'} = $redirect_url;
return 'redirect';
} elsif (defined $session->{'sso_id'}) {
# this user was logged using a generic_sso
Expand All @@ -4125,11 +4132,9 @@ sub do_logout {
## Remove sso_id
delete $session->{'sso_id'};

if ($sso->{'logout_url'}) {

$in{'action'} = 'redirect';
if ($sso->{logout_url}) {
$in{'action'} = 'redirect'; #FIXME
$param->{'redirect_to'} = $sso->{'logout_url'};

return 'redirect';
}
}
Expand Down