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.9 and 1.121.2.15

version 1.121.2.9, 2014/02/26 20:46:45	version 1.121.2.15, 2017/01/21 21:25:26
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 239 sub reroute {	Line 238 sub reroute {
sub handler {	sub handler {
my $r = shift;	my $r = shift;
my $londocroot = $r->dir_config('lonDocRoot');	my $londocroot = $r->dir_config('lonDocRoot');
my $form;
# Are we re-routing?	# Are we re-routing?
if (-e "$londocroot/lon-status/reroute.txt") {	if (-e "$londocroot/lon-status/reroute.txt") {
&reroute($r);	&reroute($r);
Line 318 sub handler {	Line 316 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{'token'});
}

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 335 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=/) {
my $keybin=pack("H16",$key);	(undef,$form{'iptoken'}) = split('=',$iptokenstr);

my $cipher;
if ($Crypt::DES::VERSION>=2.03) {
$cipher=new Crypt::DES $keybin;
}	}
else {
$cipher=new DES $keybin;
}
my $upass='';
for (my $i=0;$i<=2;$i++) {
my $chunk=
$cipher->decrypt(unpack("a8",pack("H16",substr($form{'upass'.$i},0,16))));

$chunk.=	my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'});
$cipher->decrypt(unpack("a8",pack("H16",substr($form{'upass'.$i},16,16))));

$chunk=substr($chunk,1,ord(substr($chunk,0,1)));
$upass.=$chunk;
}

# ---------------------------------------------------------------- Authenticate	# ---------------------------------------------------------------- Authenticate

Line 440 sub handler {	Line 419 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;
Line 473 sub handler {	Line 454 sub handler {

unless ($hosthere) {	unless ($hosthere) {
($is_balancer,$otherserver) =	($is_balancer,$otherserver) =
&Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'});	&Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'},'login');
	if ($is_balancer) {
	if ($otherserver eq '') {
	my $lowest_load;
	($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($form{'udom'});
	if ($lowest_load > 100) {
	$otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$form{'udom'});
	}
	}
	if ($otherserver ne '') {
	my @hosts = &Apache::lonnet::current_machine_ids();
	if (grep(/^\Q$otherserver\E$/,@hosts)) {
	$hosthere = $otherserver;
	}
	}
	}
}	}

if ($is_balancer) {	if (($is_balancer) && (!$hosthere)) {
if (!$otherserver) {
($otherserver) = &Apache::lonnet::choose_server($form{'udom'});
}
if ($otherserver) {	if ($otherserver) {
&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,	&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
\%form);	\%form);
Line 547 sub handler {	Line 540 sub handler {
return OK;	return OK;
}	}
}	}
	if (($is_balancer) && ($hosthere)) {
	$form{'noloadbalance'} = $hosthere;
	}
&success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef,	&success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef,
\%form);	\%form);
return OK;	return OK;

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

Removed from v.1.121.2.9
changed lines
	Added in v.1.121.2.15