loncom/auth/lonauth.pm - diff

Return to lonauth.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.121.2.10 and 1.121.2.13

version 1.121.2.10, 2014/04/06 13:52:36	version 1.121.2.13, 2015/01/26 22:25:41
Line 103 sub success {	Line 103 sub success {
if ($destsymb =~ /___/) {	if ($destsymb =~ /___/) {
# FIXME Need to deal with encrypted symbs and urls as needed.	# FIXME Need to deal with encrypted symbs and urls as needed.
my ($map,$resid,$desturl)=split(/___/,$destsymb);	my ($map,$resid,$desturl)=split(/___/,$destsymb);
unless ($desturl=~/^(adm\|editupload\|public)/) {	$desturl = &Apache::lonnet::clutter($desturl);
$desturl = &Apache::lonnet::clutter($desturl);
}
$desturl = &HTML::Entities::encode($desturl,'"<>&');	$desturl = &HTML::Entities::encode($desturl,'"<>&');
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');	$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
$destination .= 'destinationurl='.$desturl.	$destination .= 'destinationurl='.$desturl.
Line 165 $maincall	Line 163 $maincall
$continuelink	$continuelink
$end_page	$end_page
ENDSUCCESS	ENDSUCCESS
	return;
}	}

# --------------------------------------------------------------- Failed login!	# --------------------------------------------------------------- Failed login!
Line 318 sub handler {	Line 317 sub handler {
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},	my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
$form{'serverid'});	$form{'serverid'});

my %sessiondata;
if ($form{'iptoken'}) {
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
}

if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|	if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|
($tmpinfo eq 'no_such_host')) {	($tmpinfo eq 'no_such_host')) {
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);	&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
Line 343 sub handler {	Line 336 sub handler {
return OK;	return OK;
}	}

my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo);	my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo);
if ($rolestr) {	if ($rolestr) {
$rolestr = &unescape($rolestr);	$rolestr = &unescape($rolestr);
}	}
if ($symbstr) {	if ($symbstr) {
$symbstr= &unescape($symbstr);	$symbstr= &unescape($symbstr);
}	}
	if ($iptokenstr) {
	$iptokenstr = &unescape($iptokenstr);
	}
if ($rolestr =~ /^role=/) {	if ($rolestr =~ /^role=/) {
(undef,$form{'role'}) = split('=',$rolestr);	(undef,$form{'role'}) = split('=',$rolestr);
}	}
if ($symbstr =~ /^symb=/) {	if ($symbstr =~ /^symb=/) {
(undef,$form{'symb'}) = split('=',$symbstr);	(undef,$form{'symb'}) = split('=',$symbstr);
}	}
	if ($iptokenstr =~ /^iptoken=/) {
	(undef,$form{'iptoken'}) = split('=',$iptokenstr);
	}

my $keybin=pack("H16",$key);	my $keybin=pack("H16",$key);

Line 440 sub handler {	Line 439 sub handler {

my $hosthere;	my $hosthere;
if ($form{'iptoken'}) {	if ($form{'iptoken'}) {
	my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
	my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
if (($sessiondata{'domain'} eq $form{'udom'}) &&	if (($sessiondata{'domain'} eq $form{'udom'}) &&
($sessiondata{'username'} eq $form{'uname'})) {	($sessiondata{'username'} eq $form{'uname'})) {
$hosthere = 1;	$hosthere = 1;

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

Removed from v.1.121.2.10
changed lines
	Added in v.1.121.2.13