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.25 and 1.30

version 1.25, 2010/03/22 20:11:08	version 1.30, 2010/09/06 15:44:05
Line 34 use Apache::lonnet;	Line 34 use Apache::lonnet;
use Apache::lonmenu;	use Apache::lonmenu;
use CGI::Cookie();	use CGI::Cookie();
use Apache::lonlocal;	use Apache::lonlocal;
	use LONCAPA qw(:DEFAULT :match);

sub init_env {	sub init_env {
my ($r) = @_;	my ($r) = @_;
Line 61 sub do_redirect {	Line 62 sub do_redirect {
'only_body' => $only_body,});	'only_body' => $only_body,});
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();
$r->print($start_page.$extra_text.$end_page);	$r->print($start_page.$extra_text.$end_page);
	unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {
	$r->register_cleanup(\&flush_course_logs);
	}
return OK;	return OK;
	}

	sub flush_course_logs {
	&Apache::lonnet::flushcourselogs();
	return OK;
}	}

sub handler {	sub handler {
Line 83 sub handler {	Line 91 sub handler {
$env{'form.otherserver'} =	$env{'form.otherserver'} =
&Apache::lonnet::spareserver(30000,undef,1);	&Apache::lonnet::spareserver(30000,undef,1);
}	}

$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
}	}

Line 95 sub handler {	Line 102 sub handler {
return &do_redirect($r,$url,1)	return &do_redirect($r,$url,1)
}	}

if ($env{'form.role'} &&	my $skip_canhost_check = '';
!exists($env{'user.role.'.$env{'form.role'}})) { return FORBIDDEN; }	if ($env{'form.role'}) {
	if (!exists($env{'user.role.'.$env{'form.role'}})) {
	return FORBIDDEN;
	} else {
	my $now = time;
	my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.role'}});
	if (($start && $start > $now) \|\| ($end && $end < $now)) {
	return FORBIDDEN;
	} elsif ($env{'form.role'} eq 'au./'.$env{'user.domain'}.'/') {
	if (&Apache::lonnet::homeserver($env{'user.name'},$env{'user.domain'}) eq $env{'form.otherserver'}) {
	$skip_canhost_check = 1;
	}
	} elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)/$}) {
	if (&Apache::lonnet::homeserver($2,$1) eq $env{'form.otherserver'}) {
	$skip_canhost_check = 1;
	}
	}
	}
	}

	unless ($skip_canhost_check) {
	my $canhost = 1;
	my $uprimary_id = &Apache::lonnet::domain($env{'user.domain'},'primary');
	my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
	my @intdoms;
	my $internet_names = &Apache::lonnet::get_internet_names($env{'form.otherserver'});
	if (ref($internet_names) eq 'ARRAY') {
	@intdoms = @{$internet_names};
	}
	unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
	my $serverhomeID = &Apache::lonnet::get_server_homeID($switch_to);
	my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
	my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
	my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
	my $remoterev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'form.otherserver'});
	$canhost =
	&Apache::lonnet::can_host_session($env{'user.domain'},
	$env{'form.otherserver'},
	$remoterev,
	$udomdefaults{'remotesessions'},
	$defdomdefaults{'hostedsessions'});
	}
	unless ($canhost) { return FORBIDDEN; }
	}

#remove session env, and log event	#remove session env, and log event
unlink($handle);	unlink($handle);
Line 146 sub handler {	Line 196 sub handler {
'&username='.$env{'user.name'}.	'&username='.$env{'user.name'}.
'&token='.$token;	'&token='.$token;
# --------------------------------------------------------------- Screen Output	# --------------------------------------------------------------- Screen Output
&Apache::lonnet::flushcourselogs();
return &do_redirect($r, $url, 0);	return &do_redirect($r, $url, 0);
}	}

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

Removed from v.1.25
changed lines
	Added in v.1.30