loncom/auth/switchserver.pm - diff

Return to switchserver.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/switchserver.pm between versions 1.54 and 1.57

version 1.54, 2021/05/03 15:27:43	version 1.57, 2021/08/10 15:28:13
Line 29	Line 29
package Apache::switchserver;	package Apache::switchserver;

use strict;	use strict;
use Apache::Constants qw(:common);	use Apache::Constants qw(:common :remotehost);
use Apache::lonnet;	use Apache::lonnet;
use Digest::MD5 qw(md5_hex);	use Digest::MD5 qw(md5_hex);
use CGI::Cookie();	use CGI::Cookie();
Line 57 sub do_redirect {	Line 57 sub do_redirect {
my ($r,$url,$only_body,$extra_text) = @_;	my ($r,$url,$only_body,$extra_text) = @_;
$r->send_http_header;	$r->send_http_header;
my $delay = 0.5;	my $delay = 0.5;
if ($only_body) {	if ($only_body && !$extra_text) {
$delay = 0;	$delay = 0;
}	}
my $start_page =	my $start_page =
Line 111 sub handler {	Line 111 sub handler {
$env{'user.name'});	$env{'user.name'});
if (! $env{'form.otherserver'}) {	if (! $env{'form.otherserver'}) {
$env{'form.otherserver'} =	$env{'form.otherserver'} =
&Apache::lonnet::spareserver(30000,undef,1);	&Apache::lonnet::spareserver($r,30000,undef,1);
}	}
$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
}	}
Line 215 sub handler {	Line 215 sub handler {
} else {	} else {
$logmsg .= " (no role)";	$logmsg .= " (no role)";
}	}
my $ip = &Apache::lonnet::get_requestor_ip();	my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
$logmsg .= ' '.$ip;	$logmsg .= ' '.$ip;
&Apache::lonnet::log($env{'user.domain'},$env{'user.name'},	&Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
$env{'user.home'},$logmsg);	$env{'user.home'},$logmsg);
Line 291 sub handler {	Line 291 sub handler {
if ($env{'form.symb'}) {	if ($env{'form.symb'}) {
$info{'symb'} = $env{'form.symb'};	$info{'symb'} = $env{'form.symb'};
}	}
	my $ssologoutscript = '';
if ($env{'request.sso.login'}) {	if ($env{'request.sso.login'}) {
$info{'sso.login'} = $env{'request.sso.login'};	$info{'sso.login'} = $env{'request.sso.login'};
	my $dom = $env{'user.domain'};
	if (defined($r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
	if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
	$ssologoutscript .= join('',<$fh>);
	close($fh);
	}
	}
	if ($env{'request.sso.login'}
	&& defined($r->dir_config('lonSSOUserLogoutScriptFile'))) {
	if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutScriptFile'))) {
	$ssologoutscript .= join('',<$fh>);
	close($fh);
	}
	}
}	}
if ($env{'request.sso.reloginserver'}) {	if ($env{'request.sso.reloginserver'}) {
$info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};	$info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
}	}
if ($env{'request.linkprot'}) {	if ($env{'request.linkprot'}) {
$info{'linkprot'} = $env{'request.linkprot'};	$info{'linkprot'} = $env{'request.linkprot'};
	} elsif ($env{'request.linkkey'}) {
	$info{'linkkey'} = $env{'request.linkkey'};
}	}
if ($env{'request.deeplink.login'}) {	if ($env{'request.deeplink.login'}) {
$info{'deeplink.login'} = $env{'request.deeplink.login'};	$info{'deeplink.login'} = $env{'request.deeplink.login'};
if ($env{'request.linkkey'}) {
$info{'linkkey'} = $env{'request.linkkey'};
}
}	}
if ($env{'request.lti.login'}) {	if ($env{'request.lti.login'}) {
$info{'lti.login'} = $env{'request.lti.login'};	$info{'lti.login'} = $env{'request.lti.login'};
Line 345 sub handler {	Line 359 sub handler {
'&username='.$env{'user.name'}.	'&username='.$env{'user.name'}.
'&token='.$token;	'&token='.$token;
# --------------------------------------------------------------- Screen Output	# --------------------------------------------------------------- Screen Output
return &do_redirect($r, $url, $only_body);	return &do_redirect($r, $url, $only_body, $ssologoutscript);
}	}

1;	1;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.54
changed lines
	Added in v.1.57