version 1.327, 2003/02/13 21:35:50
|
version 1.522, 2004/07/16 17:56:01
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30, |
|
# 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19, |
|
# 11/8,11/16,11/18,11/22,11/23,12/22, |
|
# 01/06,01/13,02/24,02/28,02/29, |
|
# 03/01,03/02,03/06,03/07,03/13, |
|
# 04/05,05/29,05/31,06/01, |
|
# 06/05,06/26 Gerd Kortemeyer |
|
# 06/26 Ben Tyszka |
|
# 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer |
|
# 08/14 Ben Tyszka |
|
# 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer |
|
# 10/04 Gerd Kortemeyer |
|
# 10/04 Guy Albertelli |
|
# 10/06,10/09,10/10,10/11,10/14,10/20,10/23,10/25,10/26,10/27,10/28,10/29, |
|
# 10/30,10/31, |
|
# 11/2,11/14,11/15,11/16,11/20,11/21,11/22,11/25,11/27, |
|
# 12/02,12/12,12/13,12/14,12/28,12/29 Gerd Kortemeyer |
|
# 05/01/01 Guy Albertelli |
|
# 05/01,06/01,09/01 Gerd Kortemeyer |
|
# 09/01 Guy Albertelli |
|
# 09/01,10/01,11/01 Gerd Kortemeyer |
|
# YEAR=2001 |
|
# 3/2 Gerd Kortemeyer |
|
# 3/19,3/20 Gerd Kortemeyer |
|
# 5/26,5/28 Gerd Kortemeyer |
|
# 5/30 H. K. Ng |
|
# 6/1 Gerd Kortemeyer |
|
# July Guy Albertelli |
|
# 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26, |
|
# 10/2 Gerd Kortemeyer |
|
# 11/17,11/20,11/22,11/29 Gerd Kortemeyer |
|
# 12/5 Matthew Hall |
|
# 12/5 Guy Albertelli |
|
# 12/6,12/7,12/12 Gerd Kortemeyer |
|
# 12/21,12/22,12/27,12/28 Gerd Kortemeyer |
|
# YEAR=2002 |
|
# 1/4,2/4,2/7 Gerd Kortemeyer |
|
# |
|
### |
### |
|
|
package Apache::lonnet; |
package Apache::lonnet; |
|
|
use strict; |
use strict; |
use Apache::File; |
|
use LWP::UserAgent(); |
use LWP::UserAgent(); |
use HTTP::Headers; |
use HTTP::Headers; |
|
use HTTP::Date; |
|
# use Date::Parse; |
use vars |
use vars |
qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom |
qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom |
%libserv %pr %prp %metacache %packagetab %titlecache |
%libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache |
%courselogs %accesshash $processmarker $dumpcount |
%courselogs %accesshash %userrolehash $processmarker $dumpcount |
%coursedombuf %coursehombuf %courseresdatacache |
%coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache |
%domaindescription %domain_auth_def %domain_auth_arg_def); |
%userresdatacache %usectioncache %domaindescription %domain_auth_def %domain_auth_arg_def |
|
%domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir); |
|
|
use IO::Socket; |
use IO::Socket; |
use GDBM_File; |
use GDBM_File; |
use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
use HTML::LCParser; |
use HTML::LCParser; |
use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
use Apache::loncoursedata; |
use Apache::loncoursedata; |
|
use Apache::lonlocal; |
|
use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw); |
|
use Time::HiRes(); |
my $readit; |
my $readit; |
|
|
|
=pod |
|
|
|
=head1 Package Variables |
|
|
|
These are largely undocumented, so if you decipher one please note it here. |
|
|
|
=over 4 |
|
|
|
=item $processmarker |
|
|
|
Contains the time this process was started and this servers host id. |
|
|
|
=item $dumpcount |
|
|
|
Counts the number of times a message log flush has been attempted (regardless |
|
of success) by this process. Used as part of the filename when messages are |
|
delayed. |
|
|
|
=back |
|
|
|
=cut |
|
|
|
|
# --------------------------------------------------------------------- Logging |
# --------------------------------------------------------------------- Logging |
|
|
sub logtouch { |
sub logtouch { |
my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
unless (-e "$execdir/logs/lonnet.log") { |
unless (-e "$execdir/logs/lonnet.log") { |
my $fh=Apache::File->new(">>$execdir/logs/lonnet.log"); |
open(my $fh,">>$execdir/logs/lonnet.log"); |
close $fh; |
close $fh; |
} |
} |
my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
Line 103 sub logthis {
|
Line 93 sub logthis {
|
my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
my $now=time; |
my $now=time; |
my $local=localtime($now); |
my $local=localtime($now); |
my $fh=Apache::File->new(">>$execdir/logs/lonnet.log"); |
if (open(my $fh,">>$execdir/logs/lonnet.log")) { |
print $fh "$local ($$): $message\n"; |
print $fh "$local ($$): $message\n"; |
|
close($fh); |
|
} |
return 1; |
return 1; |
} |
} |
|
|
Line 113 sub logperm {
|
Line 105 sub logperm {
|
my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
my $now=time; |
my $now=time; |
my $local=localtime($now); |
my $local=localtime($now); |
my $fh=Apache::File->new(">>$execdir/logs/lonnet.perm.log"); |
if (open(my $fh,">>$execdir/logs/lonnet.perm.log")) { |
print $fh "$now:$message:$local\n"; |
print $fh "$now:$message:$local\n"; |
|
close($fh); |
|
} |
return 1; |
return 1; |
} |
} |
|
|
Line 166 sub reconlonc {
|
Line 160 sub reconlonc {
|
my $peerfile=shift; |
my $peerfile=shift; |
&logthis("Trying to reconnect for $peerfile"); |
&logthis("Trying to reconnect for $peerfile"); |
my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
if (my $fh=Apache::File->new("$loncfile")) { |
if (open(my $fh,"<$loncfile")) { |
my $loncpid=<$fh>; |
my $loncpid=<$fh>; |
chomp($loncpid); |
chomp($loncpid); |
if (kill 0 => $loncpid) { |
if (kill 0 => $loncpid) { |
Line 214 sub critical {
|
Line 208 sub critical {
|
"$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server"; |
"$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server"; |
$dumpcount++; |
$dumpcount++; |
{ |
{ |
my $dfh; |
my $dfh; |
if ($dfh=Apache::File->new(">$dfilename")) { |
if (open($dfh,">$dfilename")) { |
print $dfh "$cmd\n"; |
print $dfh "$cmd\n"; |
} |
close($dfh); |
|
} |
} |
} |
sleep 2; |
sleep 2; |
my $wcmd=''; |
my $wcmd=''; |
{ |
{ |
my $dfh; |
my $dfh; |
if ($dfh=Apache::File->new("$dfilename")) { |
if (open($dfh,"<$dfilename")) { |
$wcmd=<$dfh>; |
$wcmd=<$dfh>; |
} |
close($dfh); |
|
} |
} |
} |
chomp($wcmd); |
chomp($wcmd); |
if ($wcmd eq $cmd) { |
if ($wcmd eq $cmd) { |
Line 244 sub critical {
|
Line 240 sub critical {
|
return $answer; |
return $answer; |
} |
} |
|
|
|
# |
|
# -------------- Remove all key from the env that start witha lowercase letter |
|
# (Which is always a lon-capa value) |
|
|
|
sub cleanenv { |
|
# unless (defined(&Apache::exists_config_define("MODPERL2"))) { return; } |
|
# unless (&Apache::exists_config_define("MODPERL2")) { return; } |
|
foreach my $key (keys(%ENV)) { |
|
if ($key =~ /^[a-z]/) { |
|
delete($ENV{$key}); |
|
} |
|
} |
|
} |
|
|
|
# ------------------------------------------- Transfer profile into environment |
|
|
|
sub transfer_profile_to_env { |
|
my ($lonidsdir,$handle)=@_; |
|
my @profile; |
|
{ |
|
open(my $idf,"$lonidsdir/$handle.id"); |
|
flock($idf,LOCK_SH); |
|
@profile=<$idf>; |
|
close($idf); |
|
} |
|
my $envi; |
|
my %Remove; |
|
for ($envi=0;$envi<=$#profile;$envi++) { |
|
chomp($profile[$envi]); |
|
my ($envname,$envvalue)=split(/=/,$profile[$envi]); |
|
$ENV{$envname} = $envvalue; |
|
if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) { |
|
if ($time < time-300) { |
|
$Remove{$key}++; |
|
} |
|
} |
|
} |
|
$ENV{'user.environment'} = "$lonidsdir/$handle.id"; |
|
foreach my $expired_key (keys(%Remove)) { |
|
&delenv($expired_key); |
|
} |
|
} |
|
|
# ---------------------------------------------------------- Append Environment |
# ---------------------------------------------------------- Append Environment |
|
|
sub appenv { |
sub appenv { |
Line 260 sub appenv {
|
Line 299 sub appenv {
|
} |
} |
|
|
my $lockfh; |
my $lockfh; |
unless ($lockfh=Apache::File->new("$ENV{'user.environment'}")) { |
unless (open($lockfh,"$ENV{'user.environment'}")) { |
return 'error: '.$!; |
return 'error: '.$!; |
} |
} |
unless (flock($lockfh,LOCK_EX)) { |
unless (flock($lockfh,LOCK_EX)) { |
&logthis("<font color=blue>WARNING: ". |
&logthis("<font color=blue>WARNING: ". |
'Could not obtain exclusive lock in appenv: '.$!); |
'Could not obtain exclusive lock in appenv: '.$!); |
$lockfh->close(); |
close($lockfh); |
return 'error: '.$!; |
return 'error: '.$!; |
} |
} |
|
|
my @oldenv; |
my @oldenv; |
{ |
{ |
my $fh; |
my $fh; |
unless ($fh=Apache::File->new("$ENV{'user.environment'}")) { |
unless (open($fh,"$ENV{'user.environment'}")) { |
return 'error: '.$!; |
return 'error: '.$!; |
} |
} |
@oldenv=<$fh>; |
@oldenv=<$fh>; |
$fh->close(); |
close($fh); |
} |
} |
for (my $i=0; $i<=$#oldenv; $i++) { |
for (my $i=0; $i<=$#oldenv; $i++) { |
chomp($oldenv[$i]); |
chomp($oldenv[$i]); |
if ($oldenv[$i] ne '') { |
if ($oldenv[$i] ne '') { |
my ($name,$value)=split(/=/,$oldenv[$i]); |
my ($name,$value)=split(/=/,$oldenv[$i]); |
unless (defined($newenv{$name})) { |
unless (defined($newenv{$name})) { |
$newenv{$name}=$value; |
$newenv{$name}=$value; |
} |
} |
} |
} |
} |
} |
{ |
{ |
my $fh; |
my $fh; |
unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) { |
unless (open($fh,">$ENV{'user.environment'}")) { |
return 'error'; |
return 'error'; |
} |
} |
my $newname; |
my $newname; |
foreach $newname (keys %newenv) { |
foreach $newname (keys %newenv) { |
print $fh "$newname=$newenv{$newname}\n"; |
print $fh "$newname=$newenv{$newname}\n"; |
} |
} |
$fh->close(); |
close($fh); |
} |
} |
|
|
$lockfh->close(); |
close($lockfh); |
return 'ok'; |
return 'ok'; |
} |
} |
# ----------------------------------------------------- Delete from Environment |
# ----------------------------------------------------- Delete from Environment |
Line 315 sub delenv {
|
Line 354 sub delenv {
|
} |
} |
my @oldenv; |
my @oldenv; |
{ |
{ |
my $fh; |
my $fh; |
unless ($fh=Apache::File->new("$ENV{'user.environment'}")) { |
unless (open($fh,"$ENV{'user.environment'}")) { |
return 'error'; |
return 'error'; |
} |
} |
unless (flock($fh,LOCK_SH)) { |
unless (flock($fh,LOCK_SH)) { |
&logthis("<font color=blue>WARNING: ". |
&logthis("<font color=blue>WARNING: ". |
'Could not obtain shared lock in delenv: '.$!); |
'Could not obtain shared lock in delenv: '.$!); |
$fh->close(); |
close($fh); |
return 'error: '.$!; |
return 'error: '.$!; |
} |
} |
@oldenv=<$fh>; |
@oldenv=<$fh>; |
$fh->close(); |
close($fh); |
} |
} |
{ |
{ |
my $fh; |
my $fh; |
unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) { |
unless (open($fh,">$ENV{'user.environment'}")) { |
return 'error'; |
return 'error'; |
} |
} |
unless (flock($fh,LOCK_EX)) { |
unless (flock($fh,LOCK_EX)) { |
&logthis("<font color=blue>WARNING: ". |
&logthis("<font color=blue>WARNING: ". |
'Could not obtain exclusive lock in delenv: '.$!); |
'Could not obtain exclusive lock in delenv: '.$!); |
$fh->close(); |
close($fh); |
return 'error: '.$!; |
return 'error: '.$!; |
} |
} |
foreach (@oldenv) { |
foreach (@oldenv) { |
unless ($_=~/^$delthis/) { print $fh $_; } |
if ($_=~/^$delthis/) { |
} |
my ($key,undef) = split('=',$_); |
$fh->close(); |
delete($ENV{$key}); |
|
} else { |
|
print $fh $_; |
|
} |
|
} |
|
close($fh); |
} |
} |
return 'ok'; |
return 'ok'; |
} |
} |
|
|
|
# ------------------------------------------ Find out current server userload |
|
# there is a copy in lond |
|
sub userload { |
|
my $numusers=0; |
|
{ |
|
opendir(LONIDS,$perlvar{'lonIDsDir'}); |
|
my $filename; |
|
my $curtime=time; |
|
while ($filename=readdir(LONIDS)) { |
|
if ($filename eq '.' || $filename eq '..') {next;} |
|
my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9]; |
|
if ($curtime-$mtime < 1800) { $numusers++; } |
|
} |
|
closedir(LONIDS); |
|
} |
|
my $userloadpercent=0; |
|
my $maxuserload=$perlvar{'lonUserLoadLim'}; |
|
if ($maxuserload) { |
|
$userloadpercent=100*$numusers/$maxuserload; |
|
} |
|
$userloadpercent=sprintf("%.2f",$userloadpercent); |
|
return $userloadpercent; |
|
} |
|
|
# ------------------------------------------ Fight off request when overloaded |
# ------------------------------------------ Fight off request when overloaded |
|
|
sub overloaderror { |
sub overloaderror { |
Line 354 sub overloaderror {
|
Line 422 sub overloaderror {
|
unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; } |
unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; } |
my $loadavg; |
my $loadavg; |
if ($checkserver eq $perlvar{'lonHostID'}) { |
if ($checkserver eq $perlvar{'lonHostID'}) { |
my $loadfile=Apache::File->new('/proc/loadavg'); |
open(my $loadfile,'/proc/loadavg'); |
$loadavg=<$loadfile>; |
$loadavg=<$loadfile>; |
$loadavg =~ s/\s.*//g; |
$loadavg =~ s/\s.*//g; |
$loadavg = 100*$loadavg/$perlvar{'lonLoadLim'}; |
$loadavg = 100*$loadavg/$perlvar{'lonLoadLim'}; |
|
close($loadfile); |
} else { |
} else { |
$loadavg=&reply('load',$checkserver); |
$loadavg=&reply('load',$checkserver); |
} |
} |
Line 365 sub overloaderror {
|
Line 434 sub overloaderror {
|
if ($overload>0) { |
if ($overload>0) { |
$r->err_headers_out->{'Retry-After'}=$overload; |
$r->err_headers_out->{'Retry-After'}=$overload; |
$r->log_error('Overload of '.$overload.' on '.$checkserver); |
$r->log_error('Overload of '.$overload.' on '.$checkserver); |
return 413; |
return 409; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 373 sub overloaderror {
|
Line 442 sub overloaderror {
|
# ------------------------------ Find server with least workload from spare.tab |
# ------------------------------ Find server with least workload from spare.tab |
|
|
sub spareserver { |
sub spareserver { |
my $loadpercent = shift; |
my ($loadpercent,$userloadpercent) = @_; |
my $tryserver; |
my $tryserver; |
my $spareserver=''; |
my $spareserver=''; |
my $lowestserver=$loadpercent; |
if ($userloadpercent !~ /\d/) { $userloadpercent=0; } |
|
my $lowestserver=$loadpercent > $userloadpercent? |
|
$loadpercent : $userloadpercent; |
foreach $tryserver (keys %spareid) { |
foreach $tryserver (keys %spareid) { |
my $answer=reply('load',$tryserver); |
my $loadans=reply('load',$tryserver); |
if (($answer =~ /\d/) && ($answer<$lowestserver)) { |
my $userloadans=reply('userload',$tryserver); |
$spareserver="http://$hostname{$tryserver}"; |
if ($loadans !~ /\d/ && $userloadans !~ /\d/) { |
$lowestserver=$answer; |
next; #didn't get a number from the server |
} |
} |
} |
my $answer; |
|
if ($loadans =~ /\d/) { |
|
if ($userloadans =~ /\d/) { |
|
#both are numbers, pick the bigger one |
|
$answer=$loadans > $userloadans? |
|
$loadans : $userloadans; |
|
} else { |
|
$answer = $loadans; |
|
} |
|
} else { |
|
$answer = $userloadans; |
|
} |
|
if (($answer =~ /\d/) && ($answer<$lowestserver)) { |
|
$spareserver="http://$hostname{$tryserver}"; |
|
$lowestserver=$answer; |
|
} |
|
} |
return $spareserver; |
return $spareserver; |
} |
} |
|
|
Line 426 sub changepass {
|
Line 513 sub changepass {
|
|
|
sub queryauthenticate { |
sub queryauthenticate { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
if (($perlvar{'lonRole'} eq 'library') && |
my $uhome=&homeserver($uname,$udom); |
($udom eq $perlvar{'lonDefDomain'})) { |
if (!$uhome) { |
my $answer=reply("encrypt:currentauth:$udom:$uname", |
&logthis("User $uname at $udom is unknown when looking for authentication mechanism"); |
$perlvar{'lonHostID'}); |
return 'no_host'; |
unless ($answer eq 'unknown_user' or $answer eq 'refused') { |
} |
if (length($answer)) { |
my $answer=reply("encrypt:currentauth:$udom:$uname",$uhome); |
return $answer; |
if ($answer =~ /^(unknown_user|refused|con_lost)/) { |
} |
&logthis("User $uname at $udom threw error $answer when checking authentication mechanism"); |
else { |
|
&logthis("User $uname at $udom lacks an authentication mechanism"); |
|
return 'no_host'; |
|
} |
|
} |
|
} |
|
|
|
my $tryserver; |
|
foreach $tryserver (keys %libserv) { |
|
if ($hostdom{$tryserver} eq $udom) { |
|
my $answer=reply("encrypt:currentauth:$udom:$uname",$tryserver); |
|
unless ($answer eq 'unknown_user' or $answer eq 'refused') { |
|
if (length($answer)) { |
|
return $answer; |
|
} |
|
else { |
|
&logthis("User $uname at $udom lacks an authentication mechanism"); |
|
return 'no_host'; |
|
} |
|
} |
|
} |
|
} |
} |
&logthis("User $uname at $udom lacks an authentication mechanism"); |
return $answer; |
return 'no_host'; |
|
} |
} |
|
|
# --------- Try to authenticate user from domain's lib servers (first this one) |
# --------- Try to authenticate user from domain's lib servers (first this one) |
Line 466 sub authenticate {
|
Line 531 sub authenticate {
|
my ($uname,$upass,$udom)=@_; |
my ($uname,$upass,$udom)=@_; |
$upass=escape($upass); |
$upass=escape($upass); |
$uname=~s/\W//g; |
$uname=~s/\W//g; |
if (($perlvar{'lonRole'} eq 'library') && |
my $uhome=&homeserver($uname,$udom); |
($udom eq $perlvar{'lonDefDomain'})) { |
if (!$uhome) { |
my $answer=reply("encrypt:auth:$udom:$uname:$upass",$perlvar{'lonHostID'}); |
&logthis("User $uname at $udom is unknown in authenticate"); |
if ($answer =~ /authorized/) { |
return 'no_host'; |
if ($answer eq 'authorized') { |
} |
&logthis("User $uname at $udom authorized by local server"); |
my $answer=reply("encrypt:auth:$udom:$uname:$upass",$uhome); |
return $perlvar{'lonHostID'}; |
if ($answer eq 'authorized') { |
} |
&logthis("User $uname at $udom authorized by $uhome"); |
if ($answer eq 'non_authorized') { |
return $uhome; |
&logthis("User $uname at $udom rejected by local server"); |
} |
return 'no_host'; |
if ($answer eq 'non_authorized') { |
} |
&logthis("User $uname at $udom rejected by $uhome"); |
} |
return 'no_host'; |
} |
|
|
|
my $tryserver; |
|
foreach $tryserver (keys %libserv) { |
|
if ($hostdom{$tryserver} eq $udom) { |
|
my $answer=reply("encrypt:auth:$udom:$uname:$upass",$tryserver); |
|
if ($answer =~ /authorized/) { |
|
if ($answer eq 'authorized') { |
|
&logthis("User $uname at $udom authorized by $tryserver"); |
|
return $tryserver; |
|
} |
|
if ($answer eq 'non_authorized') { |
|
&logthis("User $uname at $udom rejected by $tryserver"); |
|
return 'no_host'; |
|
} |
|
} |
|
} |
|
} |
} |
&logthis("User $uname at $udom could not be authenticated"); |
&logthis("User $uname at $udom threw error $answer when checking authentication mechanism"); |
return 'no_host'; |
return 'no_host'; |
} |
} |
|
|
Line 506 sub authenticate {
|
Line 554 sub authenticate {
|
sub homeserver { |
sub homeserver { |
my ($uname,$udom,$ignoreBadCache)=@_; |
my ($uname,$udom,$ignoreBadCache)=@_; |
my $index="$uname:$udom"; |
my $index="$uname:$udom"; |
if ($homecache{$index}) { |
|
return "$homecache{$index}"; |
my ($result,$cached)=&is_cached(\%homecache,$index,'home',86400); |
} |
if (defined($cached)) { return $result; } |
my $tryserver; |
my $tryserver; |
foreach $tryserver (keys %libserv) { |
foreach $tryserver (keys %libserv) { |
next if ($ignoreBadCache ne 'true' && |
next if ($ignoreBadCache ne 'true' && |
Line 516 sub homeserver {
|
Line 564 sub homeserver {
|
if ($hostdom{$tryserver} eq $udom) { |
if ($hostdom{$tryserver} eq $udom) { |
my $answer=reply("home:$udom:$uname",$tryserver); |
my $answer=reply("home:$udom:$uname",$tryserver); |
if ($answer eq 'found') { |
if ($answer eq 'found') { |
$homecache{$index}=$tryserver; |
return &do_cache(\%homecache,$index,$tryserver,'home'); |
return $tryserver; |
|
} elsif ($answer eq 'no_host') { |
} elsif ($answer eq 'no_host') { |
$badServerCache{$tryserver}=1; |
$badServerCache{$tryserver}=1; |
} |
} |
Line 570 sub idput {
|
Line 617 sub idput {
|
my ($udom,%ids)=@_; |
my ($udom,%ids)=@_; |
my %servers=(); |
my %servers=(); |
foreach (keys %ids) { |
foreach (keys %ids) { |
|
&cput('environment',{'id'=>$ids{$_}},$udom,$_); |
my $uhom=&homeserver($_,$udom); |
my $uhom=&homeserver($_,$udom); |
if ($uhom ne 'no_host') { |
if ($uhom ne 'no_host') { |
my $id=&escape($ids{$_}); |
my $id=&escape($ids{$_}); |
Line 580 sub idput {
|
Line 628 sub idput {
|
} else { |
} else { |
$servers{$uhom}=$id.'='.$unam; |
$servers{$uhom}=$id.'='.$unam; |
} |
} |
&critical('put:'.$udom.':'.$unam.':environment:id='.$id,$uhom); |
|
} |
} |
} |
} |
foreach (keys %servers) { |
foreach (keys %servers) { |
Line 588 sub idput {
|
Line 635 sub idput {
|
} |
} |
} |
} |
|
|
|
# --------------------------------------------------- Assign a key to a student |
|
|
|
sub assign_access_key { |
|
# |
|
# a valid key looks like uname:udom#comments |
|
# comments are being appended |
|
# |
|
my ($ckey,$kdom,$knum,$cdom,$cnum,$udom,$uname,$logentry)=@_; |
|
$kdom= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($kdom)); |
|
$knum= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($knum)); |
|
$cdom= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom)); |
|
$cnum= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum)); |
|
$udom=$ENV{'user.name'} unless (defined($udom)); |
|
$uname=$ENV{'user.domain'} unless (defined($uname)); |
|
my %existing=&get('accesskeys',[$ckey],$kdom,$knum); |
|
if (($existing{$ckey}=~/^\#(.*)$/) || # - new key |
|
($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#(.*)$/)) { |
|
# assigned to this person |
|
# - this should not happen, |
|
# unless something went wrong |
|
# the first time around |
|
# ready to assign |
|
$logentry=$1.'; '.$logentry; |
|
if (&put('accesskeys',{$ckey=>$uname.':'.$udom.'#'.$logentry}, |
|
$kdom,$knum) eq 'ok') { |
|
# key now belongs to user |
|
my $envkey='key.'.$cdom.'_'.$cnum; |
|
if (&put('environment',{$envkey => $ckey}) eq 'ok') { |
|
&appenv('environment.'.$envkey => $ckey); |
|
return 'ok'; |
|
} else { |
|
return |
|
'error: Count not permanently assign key, will need to be re-entered later.'; |
|
} |
|
} else { |
|
return 'error: Could not assign key, try again later.'; |
|
} |
|
} elsif (!$existing{$ckey}) { |
|
# the key does not exist |
|
return 'error: The key does not exist'; |
|
} else { |
|
# the key is somebody else's |
|
return 'error: The key is already in use'; |
|
} |
|
} |
|
|
|
# ------------------------------------------ put an additional comment on a key |
|
|
|
sub comment_access_key { |
|
# |
|
# a valid key looks like uname:udom#comments |
|
# comments are being appended |
|
# |
|
my ($ckey,$cdom,$cnum,$logentry)=@_; |
|
$cdom= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom)); |
|
$cnum= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum)); |
|
my %existing=&get('accesskeys',[$ckey],$cdom,$cnum); |
|
if ($existing{$ckey}) { |
|
$existing{$ckey}.='; '.$logentry; |
|
# ready to assign |
|
if (&put('accesskeys',{$ckey=>$existing{$ckey}}, |
|
$cdom,$cnum) eq 'ok') { |
|
return 'ok'; |
|
} else { |
|
return 'error: Count not store comment.'; |
|
} |
|
} else { |
|
# the key does not exist |
|
return 'error: The key does not exist'; |
|
} |
|
} |
|
|
|
# ------------------------------------------------------ Generate a set of keys |
|
|
|
sub generate_access_keys { |
|
my ($number,$cdom,$cnum,$logentry)=@_; |
|
$cdom= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom)); |
|
$cnum= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum)); |
|
unless (&allowed('mky',$cdom)) { return 0; } |
|
unless (($cdom) && ($cnum)) { return 0; } |
|
if ($number>10000) { return 0; } |
|
sleep(2); # make sure don't get same seed twice |
|
srand(time()^($$+($$<<15))); # from "Programming Perl" |
|
my $total=0; |
|
for (my $i=1;$i<=$number;$i++) { |
|
my $newkey=sprintf("%lx",int(100000*rand)).'-'. |
|
sprintf("%lx",int(100000*rand)).'-'. |
|
sprintf("%lx",int(100000*rand)); |
|
$newkey=~s/1/g/g; # folks mix up 1 and l |
|
$newkey=~s/0/h/g; # and also 0 and O |
|
my %existing=&get('accesskeys',[$newkey],$cdom,$cnum); |
|
if ($existing{$newkey}) { |
|
$i--; |
|
} else { |
|
if (&put('accesskeys', |
|
{ $newkey => '# generated '.localtime(). |
|
' by '.$ENV{'user.name'}.'@'.$ENV{'user.domain'}. |
|
'; '.$logentry }, |
|
$cdom,$cnum) eq 'ok') { |
|
$total++; |
|
} |
|
} |
|
} |
|
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.home'}, |
|
'Generated '.$total.' keys for '.$cnum.' at '.$cdom); |
|
return $total; |
|
} |
|
|
|
# ------------------------------------------------------- Validate an accesskey |
|
|
|
sub validate_access_key { |
|
my ($ckey,$cdom,$cnum,$udom,$uname)=@_; |
|
$cdom= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom)); |
|
$cnum= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum)); |
|
$udom=$ENV{'user.domain'} unless (defined($udom)); |
|
$uname=$ENV{'user.name'} unless (defined($uname)); |
|
my %existing=&get('accesskeys',[$ckey],$cdom,$cnum); |
|
return ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#/); |
|
} |
|
|
# ------------------------------------- Find the section of student in a course |
# ------------------------------------- Find the section of student in a course |
|
|
sub getsection { |
sub getsection { |
Line 613 sub getsection {
|
Line 790 sub getsection {
|
&homeserver($unam,$udom)))) { |
&homeserver($unam,$udom)))) { |
my ($key,$value)=split(/\=/,$_); |
my ($key,$value)=split(/\=/,$_); |
$key=&unescape($key); |
$key=&unescape($key); |
next if ($key !~/^$courseid(?:\/)*(\w+)*\_st$/); |
next if ($key !~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/); |
my $section=$1; |
my $section=$1; |
if ($key eq $courseid.'_st') { $section=''; } |
if ($key eq $courseid.'_st') { $section=''; } |
my ($dummy,$end,$start)=split(/\_/,&unescape($value)); |
my ($dummy,$end,$start)=split(/\_/,&unescape($value)); |
Line 643 sub getsection {
|
Line 820 sub getsection {
|
return '-1'; |
return '-1'; |
} |
} |
|
|
|
|
|
my $disk_caching_disabled=1; |
|
|
|
sub devalidate_cache { |
|
my ($cache,$id,$name) = @_; |
|
delete $$cache{$id.'.time'}; |
|
delete $$cache{$id}; |
|
if ($disk_caching_disabled) { return; } |
|
my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db"; |
|
open(DB,"$filename.lock"); |
|
flock(DB,LOCK_EX); |
|
my %hash; |
|
if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) { |
|
eval <<'EVALBLOCK'; |
|
delete($hash{$id}); |
|
delete($hash{$id.'.time'}); |
|
EVALBLOCK |
|
if ($@) { |
|
&logthis("<font color='red'>devalidate_cache blew up :$@:$name</font>"); |
|
unlink($filename); |
|
} |
|
} else { |
|
if (-e $filename) { |
|
&logthis("Unable to tie hash (devalidate cache): $name"); |
|
unlink($filename); |
|
} |
|
} |
|
untie(%hash); |
|
flock(DB,LOCK_UN); |
|
close(DB); |
|
} |
|
|
|
sub is_cached { |
|
my ($cache,$id,$name,$time) = @_; |
|
if (!$time) { $time=300; } |
|
if (!exists($$cache{$id.'.time'})) { |
|
&load_cache_item($cache,$name,$id); |
|
} |
|
if (!exists($$cache{$id.'.time'})) { |
|
# &logthis("Didn't find $id"); |
|
return (undef,undef); |
|
} else { |
|
if (time-($$cache{$id.'.time'})>$time) { |
|
# &logthis("Devalidating $id - ".time-($$cache{$id.'.time'})); |
|
&devalidate_cache($cache,$id,$name); |
|
return (undef,undef); |
|
} |
|
} |
|
return ($$cache{$id},1); |
|
} |
|
|
|
sub do_cache { |
|
my ($cache,$id,$value,$name) = @_; |
|
$$cache{$id.'.time'}=time; |
|
$$cache{$id}=$value; |
|
# &logthis("Caching $id as :$value:"); |
|
&save_cache_item($cache,$name,$id); |
|
# do_cache implictly return the set value |
|
$$cache{$id}; |
|
} |
|
|
|
sub save_cache_item { |
|
my ($cache,$name,$id)=@_; |
|
if ($disk_caching_disabled) { return; } |
|
my $starttime=&Time::HiRes::time(); |
|
# &logthis("Saving :$name:$id"); |
|
my %hash; |
|
my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db"; |
|
open(DB,"$filename.lock"); |
|
flock(DB,LOCK_EX); |
|
if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) { |
|
eval <<'EVALBLOCK'; |
|
$hash{$id.'.time'}=$$cache{$id.'.time'}; |
|
$hash{$id}=freeze({'item'=>$$cache{$id}}); |
|
EVALBLOCK |
|
if ($@) { |
|
&logthis("<font color='red'>save_cache blew up :$@:$name</font>"); |
|
unlink($filename); |
|
} |
|
} else { |
|
if (-e $filename) { |
|
&logthis("Unable to tie hash (save cache item): $name ($!)"); |
|
unlink($filename); |
|
} |
|
} |
|
untie(%hash); |
|
flock(DB,LOCK_UN); |
|
close(DB); |
|
# &logthis("save_cache_item $name took ".(&Time::HiRes::time()-$starttime)); |
|
} |
|
|
|
sub load_cache_item { |
|
my ($cache,$name,$id)=@_; |
|
if ($disk_caching_disabled) { return; } |
|
my $starttime=&Time::HiRes::time(); |
|
# &logthis("Before Loading $name for $id size is ".scalar(%$cache)); |
|
my %hash; |
|
my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db"; |
|
open(DB,"$filename.lock"); |
|
flock(DB,LOCK_SH); |
|
if (tie(%hash,'GDBM_File',$filename,&GDBM_READER(),0640)) { |
|
eval <<'EVALBLOCK'; |
|
if (!%$cache) { |
|
my $count; |
|
while (my ($key,$value)=each(%hash)) { |
|
$count++; |
|
if ($key =~ /\.time$/) { |
|
$$cache{$key}=$value; |
|
} else { |
|
my $hashref=thaw($value); |
|
$$cache{$key}=$hashref->{'item'}; |
|
} |
|
} |
|
# &logthis("Initial load: $count"); |
|
} else { |
|
my $hashref=thaw($hash{$id}); |
|
$$cache{$id}=$hashref->{'item'}; |
|
$$cache{$id.'.time'}=$hash{$id.'.time'}; |
|
} |
|
EVALBLOCK |
|
if ($@) { |
|
&logthis("<font color='red'>load_cache blew up :$@:$name</font>"); |
|
unlink($filename); |
|
} |
|
} else { |
|
if (-e $filename) { |
|
&logthis("Unable to tie hash (load cache item): $name ($!)"); |
|
unlink($filename); |
|
} |
|
} |
|
untie(%hash); |
|
flock(DB,LOCK_UN); |
|
close(DB); |
|
# &logthis("After Loading $name size is ".scalar(%$cache)); |
|
# &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime)); |
|
} |
|
|
sub usection { |
sub usection { |
my ($udom,$unam,$courseid)=@_; |
my ($udom,$unam,$courseid)=@_; |
|
my $hashid="$udom:$unam:$courseid"; |
|
|
|
my ($result,$cached)=&is_cached(\%usectioncache,$hashid,'usection'); |
|
if (defined($cached)) { return $result; } |
$courseid=~s/\_/\//g; |
$courseid=~s/\_/\//g; |
$courseid=~s/^(\w)/\/$1/; |
$courseid=~s/^(\w)/\/$1/; |
foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles', |
foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles', |
&homeserver($unam,$udom)))) { |
&homeserver($unam,$udom)))) { |
my ($key,$value)=split(/\=/,$_); |
my ($key,$value)=split(/\=/,$_); |
$key=&unescape($key); |
$key=&unescape($key); |
if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) { |
if ($key=~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/) { |
my $section=$1; |
my $section=$1; |
if ($key eq $courseid.'_st') { $section=''; } |
if ($key eq $courseid.'_st') { $section=''; } |
my ($dummy,$end,$start)=split(/\_/,&unescape($value)); |
my ($dummy,$end,$start)=split(/\_/,&unescape($value)); |
Line 663 sub usection {
|
Line 981 sub usection {
|
if ($end) { |
if ($end) { |
if ($now>$end) { $notactive=1; } |
if ($now>$end) { $notactive=1; } |
} |
} |
unless ($notactive) { return $section; } |
unless ($notactive) { |
|
return &do_cache(\%usectioncache,$hashid,$section,'usection'); |
|
} |
} |
} |
} |
} |
return '-1'; |
return &do_cache(\%usectioncache,$hashid,'-1','usection'); |
} |
} |
|
|
# ------------------------------------- Read an entry from a user's environment |
# ------------------------------------- Read an entry from a user's environment |
Line 706 sub getversion {
|
Line 1026 sub getversion {
|
|
|
sub currentversion { |
sub currentversion { |
my $fname=shift; |
my $fname=shift; |
|
my ($result,$cached)=&is_cached(\%resversioncache,$fname,'resversion',600); |
|
if (defined($cached)) { return $result; } |
my $author=$fname; |
my $author=$fname; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
my ($udom,$uname)=split(/\//,$author); |
my ($udom,$uname)=split(/\//,$author); |
Line 717 sub currentversion {
|
Line 1039 sub currentversion {
|
if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
return -1; |
return -1; |
} |
} |
return $answer; |
return &do_cache(\%resversioncache,$fname,$answer,'resversion'); |
} |
} |
|
|
# ----------------------------- Subscribe to a resource, return URL if possible |
# ----------------------------- Subscribe to a resource, return URL if possible |
Line 729 sub subscribe {
|
Line 1051 sub subscribe {
|
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
my ($udom,$uname)=split(/\//,$author); |
my ($udom,$uname)=split(/\//,$author); |
my $home=homeserver($uname,$udom); |
my $home=homeserver($uname,$udom); |
if ($home eq 'no_host') { |
if ($home eq 'no_host') { |
return 'not_found'; |
return 'not_found'; |
} |
} |
my $answer=reply("sub:$fname",$home); |
my $answer=reply("sub:$fname",$home); |
if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
Line 752 sub repcopy {
|
Line 1074 sub repcopy {
|
&logthis("Subscribe returned $remoteurl: $filename"); |
&logthis("Subscribe returned $remoteurl: $filename"); |
return HTTP_SERVICE_UNAVAILABLE; |
return HTTP_SERVICE_UNAVAILABLE; |
} elsif ($remoteurl eq 'not_found') { |
} elsif ($remoteurl eq 'not_found') { |
&logthis("Subscribe returned not_found: $filename"); |
#&logthis("Subscribe returned not_found: $filename"); |
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} elsif ($remoteurl =~ /^rejected by/) { |
} elsif ($remoteurl =~ /^rejected by/) { |
&logthis("Subscribe returned $remoteurl: $filename"); |
&logthis("Subscribe returned $remoteurl: $filename"); |
Line 804 sub repcopy {
|
Line 1126 sub repcopy {
|
} |
} |
} |
} |
|
|
|
# ------------------------------------------------ Get server side include body |
|
sub ssi_body { |
|
my ($filelink,%form)=@_; |
|
my $output=($filelink=~/^http\:/?&externalssi($filelink): |
|
&ssi($filelink,%form)); |
|
$output=~s/^.*?\<body[^\>]*\>//si; |
|
$output=~s/(.*)\<\/body\s*\>.*?$/$1/si; |
|
$output=~ |
|
s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; |
|
return $output; |
|
} |
|
|
# --------------------------------------------------------- Server Side Include |
# --------------------------------------------------------- Server Side Include |
|
|
sub ssi { |
sub ssi { |
Line 835 sub externalssi {
|
Line 1169 sub externalssi {
|
return $response->content; |
return $response->content; |
} |
} |
|
|
# ------- Add a token to a remote URI's query string to vouch for access rights |
# -------------------------------- Allow a /uploaded/ URI to be vouched for |
|
|
sub tokenwrapper { |
sub allowuploaded { |
my $uri=shift; |
my ($srcurl,$url)=@_; |
$uri=~s/^http\:\/\/([^\/]+)//; |
$url=&clutter(&declutter($url)); |
$uri=~s/^\///; |
my $dir=$url; |
$ENV{'user.environment'}=~/\/([^\/]+)\.id/; |
$dir=~s/\/[^\/]+$//; |
my $token=$1; |
my %httpref=(); |
if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) { |
my $httpurl=&hreflocation('',$url); |
&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'}); |
$httpref{'httpref.'.$httpurl}=$srcurl; |
return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri. |
&Apache::lonnet::appenv(%httpref); |
(($uri=~/\?/)?'&':'?').'token='.$token. |
} |
'&tokenissued='.$perlvar{'lonHostID'}; |
|
|
# --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course |
|
# input: action, courseID, current domain, home server for course, intended |
|
# path to file, source of file. |
|
# output: url to file (if action was uploaddoc), |
|
# ok if successful, or diagnostic message otherwise (if action was propagate or copy) |
|
# |
|
# Allows directory structure to be used within lonUsers/../userfiles/ for a |
|
# course. |
|
# |
|
# action = propagate - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file |
|
# will be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles in |
|
# course's home server. |
|
# |
|
# action = copy - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file will |
|
# be copied from $source (current location) to |
|
# /home/httpd/html/userfiles/$domain/1/2/3/$course/$file |
|
# and will then be copied to |
|
# /home/httpd/lonUsers/$domain/1/2/3/$course/userfiles/$file in |
|
# course's home server. |
|
# |
|
# action = uploaddoc - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file |
|
# will be retrived from $ENV{form.uploaddoc} (from DOCS interface) to |
|
# /home/httpd/html/userfiles/$domain/1/2/3/$course/$file |
|
# and will then be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles/$file |
|
# in course's home server. |
|
|
|
|
|
sub process_coursefile { |
|
my ($action,$docuname,$docudom,$docuhome,$file,$source)=@_; |
|
my $fetchresult; |
|
if ($action eq 'propagate') { |
|
$fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file |
|
,$docuhome); |
} else { |
} else { |
return '/adm/notfound.html'; |
my $fetchresult = ''; |
|
my $fpath = ''; |
|
my $fname = $file; |
|
($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|); |
|
$fpath=$docudom.'/'.$docuname.'/'.$fpath; |
|
my $filepath=$perlvar{'lonDocRoot'}.'/userfiles'; |
|
unless ($fpath eq '') { |
|
my @parts=split('/',$fpath); |
|
foreach my $part (@parts) { |
|
$filepath.= '/'.$part; |
|
if ((-e $filepath)!=1) { |
|
mkdir($filepath,0777); |
|
} |
|
} |
|
} |
|
if ($action eq 'copy') { |
|
if ($source eq '') { |
|
$fetchresult = 'no source file'; |
|
return $fetchresult; |
|
} else { |
|
my $destination = $filepath.'/'.$fname; |
|
rename($source,$destination); |
|
$fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, |
|
$docuhome); |
|
} |
|
} elsif ($action eq 'uploaddoc') { |
|
open(my $fh,'>'.$filepath.'/'.$fname); |
|
print $fh $ENV{'form.'.$source}; |
|
close($fh); |
|
$fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, |
|
$docuhome); |
|
if ($fetchresult eq 'ok') { |
|
return '/uploaded/'.$fpath.'/'.$fname; |
|
} else { |
|
&logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. |
|
' to host '.$docuhome.': '.$fetchresult); |
|
return '/adm/notfound.html'; |
|
} |
|
} |
|
} |
|
unless ( $fetchresult eq 'ok') { |
|
&logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. |
|
' to host '.$docuhome.': '.$fetchresult); |
} |
} |
|
return $fetchresult; |
} |
} |
|
|
# --------------- Take an uploaded file and put it into the userfiles directory |
# --------------- Take an uploaded file and put it into the userfiles directory |
# input: name of form element, coursedoc=1 means this is for the course |
# input: name of form element, coursedoc=1 means this is for the course |
# output: url of file in userspace |
# output: url of file in userspace |
|
|
sub userfileupload { |
sub userfileupload { |
my ($formname,$coursedoc)=@_; |
my ($formname,$coursedoc,$subdir)=@_; |
|
if (!defined($subdir)) { $subdir='unknown'; } |
my $fname=$ENV{'form.'.$formname.'.filename'}; |
my $fname=$ENV{'form.'.$formname.'.filename'}; |
# Replace Windows backslashes by forward slashes |
# Replace Windows backslashes by forward slashes |
$fname=~s/\\/\//g; |
$fname=~s/\\/\//g; |
Line 875 sub userfileupload {
|
Line 1286 sub userfileupload {
|
my $docuname=''; |
my $docuname=''; |
my $docudom=''; |
my $docudom=''; |
my $docuhome=''; |
my $docuhome=''; |
|
$fname="$subdir/$fname"; |
if ($coursedoc) { |
if ($coursedoc) { |
$docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
$docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
$docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
$docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
$docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
$docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
|
if ($ENV{'form.folder'} =~ m/^default/) { |
|
return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname); |
|
} else { |
|
$fname=$ENV{'form.folder'}.'/'.$fname; |
|
return &process_coursefile('uploaddoc',$docuname,$docudom,$docuhome,$fname,$formname); |
|
} |
} else { |
} else { |
$docuname=$ENV{'user.name'}; |
$docuname=$ENV{'user.name'}; |
$docudom=$ENV{'user.domain'}; |
$docudom=$ENV{'user.domain'}; |
$docuhome=$ENV{'user.home'}; |
$docuhome=$ENV{'user.home'}; |
|
return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname); |
} |
} |
return |
|
&finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname); |
|
} |
} |
|
|
sub finishuserfileupload { |
sub finishuserfileupload { |
my ($docuname,$docudom,$docuhome,$formname,$fname)=@_; |
my ($docuname,$docudom,$docuhome,$formname,$fname)=@_; |
my $path=$docudom.'/'.$docuname.'/'; |
my $path=$docudom.'/'.$docuname.'/'; |
my $filepath=$perlvar{'lonDocRoot'}; |
my $filepath=$perlvar{'lonDocRoot'}; |
|
my ($fnamepath,$file); |
|
$file=$fname; |
|
if ($fname=~m|/|) { |
|
($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
|
$path.=$fnamepath.'/'; |
|
} |
my @parts=split(/\//,$filepath.'/userfiles/'.$path); |
my @parts=split(/\//,$filepath.'/userfiles/'.$path); |
my $count; |
my $count; |
for ($count=4;$count<=$#parts;$count++) { |
for ($count=4;$count<=$#parts;$count++) { |
Line 902 sub finishuserfileupload {
|
Line 1325 sub finishuserfileupload {
|
} |
} |
# Save the file |
# Save the file |
{ |
{ |
my $fh=Apache::File->new('>'.$filepath.'/'.$fname); |
#&Apache::lonnet::logthis("Saving to $filepath $file"); |
|
open(my $fh,'>'.$filepath.'/'.$file); |
print $fh $ENV{'form.'.$formname}; |
print $fh $ENV{'form.'.$formname}; |
|
close($fh); |
} |
} |
# Notify homeserver to grep it |
# Notify homeserver to grep it |
# |
# |
|
my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome); |
my $fetchresult= |
|
&reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,$docuhome); |
|
if ($fetchresult eq 'ok') { |
if ($fetchresult eq 'ok') { |
# |
# |
# Return the URL to it |
# Return the URL to it |
return '/uploaded/'.$path.$fname; |
return '/uploaded/'.$path.$file; |
} else { |
} else { |
&logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$fname. |
&logthis('Failed to transfer '.$path.$file.' to host '.$docuhome. |
' to host '.$docuhome.': '.$fetchresult); |
': '.$fetchresult); |
return '/adm/notfound.html'; |
return '/adm/notfound.html'; |
} |
} |
} |
} |
|
|
|
sub removeuploadedurl { |
|
my ($url)=@_; |
|
my (undef,undef,$udom,$uname,$fname)=split('/',$url,5); |
|
return &Apache::lonnet::removeuserfile($uname,$udom,$fname); |
|
} |
|
|
|
sub removeuserfile { |
|
my ($docuname,$docudom,$fname)=@_; |
|
my $home=&homeserver($docuname,$docudom); |
|
return &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
|
} |
|
|
# ------------------------------------------------------------------------- Log |
# ------------------------------------------------------------------------- Log |
|
|
sub log { |
sub log { |
Line 929 sub log {
|
Line 1364 sub log {
|
} |
} |
|
|
# ------------------------------------------------------------------ Course Log |
# ------------------------------------------------------------------ Course Log |
|
# |
|
# This routine flushes several buffers of non-mission-critical nature |
|
# |
|
|
sub flushcourselogs { |
sub flushcourselogs { |
&logthis('Flushing course log buffers'); |
&logthis('Flushing log buffers'); |
|
# |
|
# course logs |
|
# This is a log of all transactions in a course, which can be used |
|
# for data mining purposes |
|
# |
|
# It also collects the courseid database, which lists last transaction |
|
# times and course titles for all courseids |
|
# |
|
my %courseidbuffer=(); |
foreach (keys %courselogs) { |
foreach (keys %courselogs) { |
my $crsid=$_; |
my $crsid=$_; |
if (&reply('log:'.$coursedombuf{$crsid}.':'. |
if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'. |
&escape($courselogs{$crsid}), |
&escape($courselogs{$crsid}), |
$coursehombuf{$crsid}) eq 'ok') { |
$coursehombuf{$crsid}) eq 'ok') { |
delete $courselogs{$crsid}; |
delete $courselogs{$crsid}; |
Line 945 sub flushcourselogs {
|
Line 1392 sub flushcourselogs {
|
" exceeded maximum size, deleting.</font>"); |
" exceeded maximum size, deleting.</font>"); |
delete $courselogs{$crsid}; |
delete $courselogs{$crsid}; |
} |
} |
} |
} |
|
if ($courseidbuffer{$coursehombuf{$crsid}}) { |
|
$courseidbuffer{$coursehombuf{$crsid}}.='&'. |
|
&escape($crsid).'='.&escape($coursedescrbuf{$crsid}). |
|
'='.&escape($courseinstcodebuf{$crsid}); |
|
} else { |
|
$courseidbuffer{$coursehombuf{$crsid}}= |
|
&escape($crsid).'='.&escape($coursedescrbuf{$crsid}). |
|
'='.&escape($courseinstcodebuf{$crsid}); |
|
} |
} |
} |
&logthis('Flushing access logs'); |
# |
foreach (keys %accesshash) { |
# Write course id database (reverse lookup) to homeserver of courses |
|
# Is used in pickcourse |
|
# |
|
foreach (keys %courseidbuffer) { |
|
&courseidput($hostdom{$_},$courseidbuffer{$_},$_); |
|
} |
|
# |
|
# File accesses |
|
# Writes to the dynamic metadata of resources to get hit counts, etc. |
|
# |
|
foreach my $entry (keys(%accesshash)) { |
|
if ($entry =~ /___count$/) { |
|
my ($dom,$name); |
|
($dom,$name,undef)=($entry=~m:___(\w+)/(\w+)/(.*)___count$:); |
|
if (! defined($dom) || $dom eq '' || |
|
! defined($name) || $name eq '') { |
|
my $cid = $ENV{'request.course.id'}; |
|
$dom = $ENV{'request.'.$cid.'.domain'}; |
|
$name = $ENV{'request.'.$cid.'.num'}; |
|
} |
|
my $value = $accesshash{$entry}; |
|
my (undef,$url,undef) = ($entry =~ /^(.*)___(.*)___count$/); |
|
my %temphash=($url => $value); |
|
my $result = &inc('nohist_accesscount',\%temphash,$dom,$name); |
|
if ($result eq 'ok') { |
|
delete $accesshash{$entry}; |
|
} elsif ($result eq 'unknown_cmd') { |
|
# Target server has old code running on it. |
|
my %temphash=($entry => $value); |
|
if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
|
delete $accesshash{$entry}; |
|
} |
|
} |
|
} else { |
|
my ($dom,$name) = ($entry=~m:___(\w+)/(\w+)/(.*)___(\w+)$:); |
|
my %temphash=($entry => $accesshash{$entry}); |
|
if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
|
delete $accesshash{$entry}; |
|
} |
|
} |
|
} |
|
# |
|
# Roles |
|
# Reverse lookup of user roles for course faculty/staff and co-authorship |
|
# |
|
foreach (keys %userrolehash) { |
my $entry=$_; |
my $entry=$_; |
$entry=~/\_\_\_(\w+)\/(\w+)\/(.*)\_\_\_(\w+)$/; |
my ($role,$uname,$udom,$runame,$rudom,$rsec)= |
my %temphash=($entry => $accesshash{$entry}); |
split(/\:/,$entry); |
if (&Apache::lonnet::put('nohist_resevaldata',\%temphash,$1,$2) eq 'ok') { |
if (&Apache::lonnet::put('nohist_userroles', |
delete $accesshash{$entry}; |
{ $role.':'.$uname.':'.$udom.':'.$rsec => $userrolehash{$entry} }, |
|
$rudom,$runame) eq 'ok') { |
|
delete $userrolehash{$entry}; |
} |
} |
} |
} |
$dumpcount++; |
$dumpcount++; |
Line 964 sub courselog {
|
Line 1467 sub courselog {
|
$what=time.':'.$what; |
$what=time.':'.$what; |
unless ($ENV{'request.course.id'}) { return ''; } |
unless ($ENV{'request.course.id'}) { return ''; } |
$coursedombuf{$ENV{'request.course.id'}}= |
$coursedombuf{$ENV{'request.course.id'}}= |
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. |
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
$coursenumbuf{$ENV{'request.course.id'}}= |
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
$coursehombuf{$ENV{'request.course.id'}}= |
$coursehombuf{$ENV{'request.course.id'}}= |
$ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
$ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
|
$coursedescrbuf{$ENV{'request.course.id'}}= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
|
$courseinstcodebuf{$ENV{'request.course.id'}}= |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.internal.coursecode'}; |
if (defined $courselogs{$ENV{'request.course.id'}}) { |
if (defined $courselogs{$ENV{'request.course.id'}}) { |
$courselogs{$ENV{'request.course.id'}}.='&'.$what; |
$courselogs{$ENV{'request.course.id'}}.='&'.$what; |
} else { |
} else { |
Line 982 sub courseacclog {
|
Line 1490 sub courseacclog {
|
my $fnsymb=shift; |
my $fnsymb=shift; |
unless ($ENV{'request.course.id'}) { return ''; } |
unless ($ENV{'request.course.id'}) { return ''; } |
my $what=$fnsymb.':'.$ENV{'user.name'}.':'.$ENV{'user.domain'}; |
my $what=$fnsymb.':'.$ENV{'user.name'}.':'.$ENV{'user.domain'}; |
if ($fnsymb=~/(problem|exam|quiz|assess|survey|form)$/) { |
if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|page)$/) { |
$what.=':POST'; |
$what.=':POST'; |
foreach (keys %ENV) { |
foreach (keys %ENV) { |
if ($_=~/^form\.(.*)/) { |
if ($_=~/^form\.(.*)/) { |
Line 995 sub courseacclog {
|
Line 1503 sub courseacclog {
|
|
|
sub countacc { |
sub countacc { |
my $url=&declutter(shift); |
my $url=&declutter(shift); |
|
return if (! defined($url) || $url eq ''); |
unless ($ENV{'request.course.id'}) { return ''; } |
unless ($ENV{'request.course.id'}) { return ''; } |
$accesshash{$ENV{'request.course.id'}.'___'.$url.'___course'}=1; |
$accesshash{$ENV{'request.course.id'}.'___'.$url.'___course'}=1; |
my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count'; |
my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count'; |
if (defined($accesshash{$key})) { |
$accesshash{$key}++; |
$accesshash{$key}++; |
} |
|
|
|
sub linklog { |
|
my ($from,$to)=@_; |
|
$from=&declutter($from); |
|
$to=&declutter($to); |
|
$accesshash{$from.'___'.$to.'___comefrom'}=1; |
|
$accesshash{$to.'___'.$from.'___goto'}=1; |
|
} |
|
|
|
sub userrolelog { |
|
my ($trole,$username,$domain,$area,$tstart,$tend)=@_; |
|
if (($trole=~/^ca/) || ($trole=~/^in/) || |
|
($trole=~/^cc/) || ($trole=~/^ep/) || |
|
($trole=~/^cr/) || ($trole=~/^ta/)) { |
|
my (undef,$rudom,$runame,$rsec)=split(/\//,$area); |
|
$userrolehash |
|
{$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
|
=$tend.':'.$tstart; |
|
} |
|
} |
|
|
|
sub get_course_adv_roles { |
|
my $cid=shift; |
|
$cid=$ENV{'request.course.id'} unless (defined($cid)); |
|
my %coursehash=&coursedescription($cid); |
|
my %nothide=(); |
|
foreach (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
|
$nothide{join(':',split(/[\@\:]/,$_))}=1; |
|
} |
|
my %returnhash=(); |
|
my %dumphash= |
|
&dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'}); |
|
my $now=time; |
|
foreach (keys %dumphash) { |
|
my ($tend,$tstart)=split(/\:/,$dumphash{$_}); |
|
if (($tstart) && ($tstart<0)) { next; } |
|
if (($tend) && ($tend<$now)) { next; } |
|
if (($tstart) && ($now<$tstart)) { next; } |
|
my ($role,$username,$domain,$section)=split(/\:/,$_); |
|
if ((&privileged($username,$domain)) && |
|
(!$nothide{$username.':'.$domain})) { next; } |
|
my $key=&plaintext($role); |
|
if ($section) { $key.=' (Sec/Grp '.$section.')'; } |
|
if ($returnhash{$key}) { |
|
$returnhash{$key}.=','.$username.':'.$domain; |
|
} else { |
|
$returnhash{$key}=$username.':'.$domain; |
|
} |
|
} |
|
return %returnhash; |
|
} |
|
|
|
sub get_my_roles { |
|
my ($uname,$udom)=@_; |
|
unless (defined($uname)) { $uname=$ENV{'user.name'}; } |
|
unless (defined($udom)) { $udom=$ENV{'user.domain'}; } |
|
my %dumphash= |
|
&dump('nohist_userroles',$udom,$uname); |
|
my %returnhash=(); |
|
my $now=time; |
|
foreach (keys %dumphash) { |
|
my ($tend,$tstart)=split(/\:/,$dumphash{$_}); |
|
if (($tstart) && ($tstart<0)) { next; } |
|
if (($tend) && ($tend<$now)) { next; } |
|
if (($tstart) && ($now<$tstart)) { next; } |
|
my ($role,$username,$domain,$section)=split(/\:/,$_); |
|
$returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; |
|
} |
|
return %returnhash; |
|
} |
|
|
|
# ----------------------------------------------------- Frontpage Announcements |
|
# |
|
# |
|
|
|
sub postannounce { |
|
my ($server,$text)=@_; |
|
unless (&allowed('psa',$hostdom{$server})) { return 'refused'; } |
|
unless ($text=~/\w/) { $text=''; } |
|
return &reply('setannounce:'.&escape($text),$server); |
|
} |
|
|
|
sub getannounce { |
|
|
|
if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) { |
|
my $announcement=''; |
|
while (<$fh>) { $announcement .=$_; } |
|
close($fh); |
|
if ($announcement=~/\w/) { |
|
return |
|
'<table bgcolor="#FF5555" cellpadding="5" cellspacing="3">'. |
|
'<tr><td bgcolor="#FFFFFF"><tt>'.$announcement.'</tt></td></tr></table>'; |
|
} else { |
|
return ''; |
|
} |
} else { |
} else { |
$accesshash{$key}=1; |
return ''; |
} |
} |
} |
} |
|
|
|
# ---------------------------------------------------------- Course ID routines |
|
# Deal with domain's nohist_courseid.db files |
|
# |
|
|
|
sub courseidput { |
|
my ($domain,$what,$coursehome)=@_; |
|
return &reply('courseidput:'.$domain.':'.$what,$coursehome); |
|
} |
|
|
|
sub courseiddump { |
|
my ($domfilter,$descfilter,$sincefilter,$hostidflag,$hostidref)=@_; |
|
my %returnhash=(); |
|
unless ($domfilter) { $domfilter=''; } |
|
foreach my $tryserver (keys %libserv) { |
|
if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) { |
|
if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) { |
|
foreach ( |
|
split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'. |
|
$sincefilter.':'.&escape($descfilter), |
|
$tryserver))) { |
|
my ($key,$value)=split(/\=/,$_); |
|
if (($key) && ($value)) { |
|
$returnhash{&unescape($key)}=$value; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return %returnhash; |
|
} |
|
|
|
# |
# ----------------------------------------------------------- Check out an item |
# ----------------------------------------------------------- Check out an item |
|
|
|
sub get_first_access { |
|
my ($type,$argsymb)=@_; |
|
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
if ($argsymb) { $symb=$argsymb; } |
|
my ($map,$id,$res)=&decode_symb($symb); |
|
if ($type eq 'map') { $res=$map; } |
|
my %times=&get('firstaccesstimes',[$res],$udom,$uname); |
|
return $times{$res}; |
|
} |
|
|
|
sub set_first_access { |
|
my ($type)=@_; |
|
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my ($map,$id,$res)=&decode_symb($symb); |
|
if ($type eq 'map') { $res=$map; } |
|
my $firstaccess=&get_first_access($type); |
|
if (!$firstaccess) { |
|
return &put('firstaccesstimes',{$res=>time},$udom,$uname); |
|
} |
|
return 'already_set'; |
|
} |
|
|
sub checkout { |
sub checkout { |
my ($symb,$tuname,$tudom,$tcrsid)=@_; |
my ($symb,$tuname,$tudom,$tcrsid)=@_; |
my $now=time; |
my $now=time; |
Line 1115 sub devalidate {
|
Line 1773 sub devalidate {
|
my ($symb,$uname,$udom)=@_; |
my ($symb,$uname,$udom)=@_; |
my $cid=$ENV{'request.course.id'}; |
my $cid=$ENV{'request.course.id'}; |
if ($cid) { |
if ($cid) { |
# delete the stored spreadsheets for |
# delete the stored spreadsheets for |
# - the student level sheet of this user in course's homespace |
# - the student level sheet of this user in course's homespace |
# - the assessment level sheet for this resource |
# - the assessment level sheet for this resource |
# for this user in user's homespace |
# for this user in user's homespace |
my $key=$uname.':'.$udom.':'; |
my $key=$uname.':'.$udom.':'; |
my $status= |
my $status= |
&del('nohist_calculatedsheets', |
&del('nohist_calculatedsheets', |
[$key.'studentcalc'], |
[$key.'studentcalc:'], |
$ENV{'course.'.$cid.'.domain'}, |
$ENV{'course.'.$cid.'.domain'}, |
$ENV{'course.'.$cid.'.num'}) |
$ENV{'course.'.$cid.'.num'}) |
.' '. |
.' '. |
&del('nohist_calculatedsheets_'.$cid, |
&del('nohist_calculatedsheets_'.$cid, |
[$key.'assesscalc:'.$symb]); |
[$key.'assesscalc:'.$symb],$udom,$uname); |
unless ($status eq 'ok ok') { |
unless ($status eq 'ok ok') { |
&logthis('Could not devalidate spreadsheet '. |
&logthis('Could not devalidate spreadsheet '. |
$uname.' at '.$udom.' for '. |
$uname.' at '.$udom.' for '. |
Line 1185 sub hash2str {
|
Line 1843 sub hash2str {
|
sub hashref2str { |
sub hashref2str { |
my ($hashref)=@_; |
my ($hashref)=@_; |
my $result='__HASH_REF__'; |
my $result='__HASH_REF__'; |
foreach (keys(%$hashref)) { |
foreach (sort(keys(%$hashref))) { |
if (ref($_) eq 'ARRAY') { |
if (ref($_) eq 'ARRAY') { |
$result.=&arrayref2str($_).'='; |
$result.=&arrayref2str($_).'='; |
} elsif (ref($_) eq 'HASH') { |
} elsif (ref($_) eq 'HASH') { |
Line 1333 sub tmpreset {
|
Line 1991 sub tmpreset {
|
my ($symb,$namespace,$domain,$stuname) = @_; |
my ($symb,$namespace,$domain,$stuname) = @_; |
if (!$symb) { |
if (!$symb) { |
$symb=&symbread(); |
$symb=&symbread(); |
if (!$symb) { $symb= $ENV{'REQUEST_URI'}; } |
if (!$symb) { $symb= $ENV{'request.url'}; } |
} |
} |
$symb=escape($symb); |
$symb=escape($symb); |
|
|
Line 1474 sub store {
|
Line 2132 sub store {
|
} |
} |
} |
} |
if (!$home) { $home=$ENV{'user.home'}; } |
if (!$home) { $home=$ENV{'user.home'}; } |
|
|
|
$$storehash{'ip'}=$ENV{'REMOTE_ADDR'}; |
|
$$storehash{'host'}=$perlvar{'lonHostID'}; |
|
|
my $namevalue=''; |
my $namevalue=''; |
foreach (keys %$storehash) { |
foreach (keys %$storehash) { |
$namevalue.=escape($_).'='.escape($$storehash{$_}).'&'; |
$namevalue.=escape($_).'='.escape($$storehash{$_}).'&'; |
Line 1507 sub cstore {
|
Line 2169 sub cstore {
|
} |
} |
if (!$home) { $home=$ENV{'user.home'}; } |
if (!$home) { $home=$ENV{'user.home'}; } |
|
|
|
$$storehash{'ip'}=$ENV{'REMOTE_ADDR'}; |
|
$$storehash{'host'}=$perlvar{'lonHostID'}; |
|
|
my $namevalue=''; |
my $namevalue=''; |
foreach (keys %$storehash) { |
foreach (keys %$storehash) { |
$namevalue.=escape($_).'='.escape($$storehash{$_}).'&'; |
$namevalue.=escape($_).'='.escape($$storehash{$_}).'&'; |
Line 1589 sub coursedescription {
|
Line 2254 sub coursedescription {
|
return %returnhash; |
return %returnhash; |
} |
} |
|
|
|
# -------------------------------------------------See if a user is privileged |
|
|
|
sub privileged { |
|
my ($username,$domain)=@_; |
|
my $rolesdump=&reply("dump:$domain:$username:roles", |
|
&homeserver($username,$domain)); |
|
if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return 0; } |
|
my $now=time; |
|
if ($rolesdump ne '') { |
|
foreach (split(/&/,$rolesdump)) { |
|
if ($_!~/^rolesdef\&/) { |
|
my ($area,$role)=split(/=/,$_); |
|
$area=~s/\_\w\w$//; |
|
my ($trole,$tend,$tstart)=split(/_/,$role); |
|
if (($trole eq 'dc') || ($trole eq 'su')) { |
|
my $active=1; |
|
if ($tend) { |
|
if ($tend<$now) { $active=0; } |
|
} |
|
if ($tstart) { |
|
if ($tstart>$now) { $active=0; } |
|
} |
|
if ($active) { return 1; } |
|
} |
|
} |
|
} |
|
} |
|
return 0; |
|
} |
|
|
# -------------------------------------------------------- Get user privileges |
# -------------------------------------------------------- Get user privileges |
|
|
sub rolesinit { |
sub rolesinit { |
Line 1609 sub rolesinit {
|
Line 2304 sub rolesinit {
|
my ($trole,$tend,$tstart)=split(/_/,$role); |
my ($trole,$tend,$tstart)=split(/_/,$role); |
$userroles.='user.role.'.$trole.'.'.$area.'='. |
$userroles.='user.role.'.$trole.'.'.$area.'='. |
$tstart.'.'.$tend."\n"; |
$tstart.'.'.$tend."\n"; |
|
# log the associated role with the area |
|
&userrolelog($trole,$username,$domain,$area,$tstart,$tend); |
if ($tend!=0) { |
if ($tend!=0) { |
if ($tend<$now) { |
if ($tend<$now) { |
$trole=''; |
$trole=''; |
Line 1620 sub rolesinit {
|
Line 2317 sub rolesinit {
|
} |
} |
} |
} |
if (($area ne '') && ($trole ne '')) { |
if (($area ne '') && ($trole ne '')) { |
my $spec=$trole.'.'.$area; |
my $spec=$trole.'.'.$area; |
my ($tdummy,$tdomain,$trest)=split(/\//,$area); |
my ($tdummy,$tdomain,$trest)=split(/\//,$area); |
if ($trole =~ /^cr\//) { |
if ($trole =~ /^cr\//) { |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole); |
my $homsvr=homeserver($rauthor,$rdomain); |
my $homsvr=homeserver($rauthor,$rdomain); |
if ($hostname{$homsvr} ne '') { |
if ($hostname{$homsvr} ne '') { |
my $roledef= |
my ($rdummy,$roledef)= |
reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole", |
&get('roles',["rolesdef_$rrole"],$rdomain,$rauthor); |
$homsvr); |
|
if (($roledef ne 'con_lost') && ($roledef ne '')) { |
if (($rdummy ne 'con_lost') && ($roledef ne '')) { |
my ($syspriv,$dompriv,$coursepriv)= |
my ($syspriv,$dompriv,$coursepriv)= |
split(/\_/,unescape($roledef)); |
split(/\_/,$roledef); |
$allroles{'cm./'}.=':'.$syspriv; |
if (defined($syspriv)) { |
$allroles{$spec.'./'}.=':'.$syspriv; |
$allroles{'cm./'}.=':'.$syspriv; |
if ($tdomain ne '') { |
$allroles{$spec.'./'}.=':'.$syspriv; |
$allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv; |
} |
$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv; |
if ($tdomain ne '') { |
if ($trest ne '') { |
if (defined($dompriv)) { |
$allroles{'cm.'.$area}.=':'.$coursepriv; |
$allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv; |
$allroles{$spec.'.'.$area}.=':'.$coursepriv; |
$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv; |
} |
} |
} |
if ($trest ne '') { |
} |
if (defined($coursepriv)) { |
} |
$allroles{'cm.'.$area}.=':'.$coursepriv; |
} else { |
$allroles{$spec.'.'.$area}.=':'.$coursepriv; |
$allroles{'cm./'}.=':'.$pr{$trole.':s'}; |
} |
$allroles{$spec.'./'}.=':'.$pr{$trole.':s'}; |
} |
if ($tdomain ne '') { |
} |
$allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'}; |
} |
$allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'}; |
} |
if ($trest ne '') { |
} else { |
$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'}; |
if (defined($pr{$trole.':s'})) { |
$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'}; |
$allroles{'cm./'}.=':'.$pr{$trole.':s'}; |
} |
$allroles{$spec.'./'}.=':'.$pr{$trole.':s'}; |
} |
} |
} |
if ($tdomain ne '') { |
|
if (defined($pr{$trole.':d'})) { |
|
$allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'}; |
|
$allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'}; |
|
} |
|
if ($trest ne '') { |
|
if (defined($pr{$trole.':c'})) { |
|
$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'}; |
|
$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'}; |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 1753 sub dump {
|
Line 2462 sub dump {
|
return %returnhash; |
return %returnhash; |
} |
} |
|
|
|
# -------------------------------------------------------------- keys interface |
|
|
|
sub getkeys { |
|
my ($namespace,$udomain,$uname)=@_; |
|
if (!$udomain) { $udomain=$ENV{'user.domain'}; } |
|
if (!$uname) { $uname=$ENV{'user.name'}; } |
|
my $uhome=&homeserver($uname,$udomain); |
|
my $rep=reply("keys:$udomain:$uname:$namespace",$uhome); |
|
my @keyarray=(); |
|
foreach (split(/\&/,$rep)) { |
|
push (@keyarray,&unescape($_)); |
|
} |
|
return @keyarray; |
|
} |
|
|
# --------------------------------------------------------------- currentdump |
# --------------------------------------------------------------- currentdump |
sub currentdump { |
sub currentdump { |
my ($sname,$sdom,$courseid)=@_; |
my ($courseid,$sdom,$sname)=@_; |
$courseid = $ENV{'request.course.id'} if (! defined($courseid)); |
$courseid = $ENV{'request.course.id'} if (! defined($courseid)); |
$sdom = $ENV{'user.domain'} if (! defined($sdom)); |
$sdom = $ENV{'user.domain'} if (! defined($sdom)); |
$sname = $ENV{'user.name'} if (! defined($sname)); |
$sname = $ENV{'user.name'} if (! defined($sname)); |
Line 1772 sub currentdump {
|
Line 2496 sub currentdump {
|
return if ($tmp[0] =~ /^(error:|no_such_host)/); |
return if ($tmp[0] =~ /^(error:|no_such_host)/); |
my %hash = @tmp; |
my %hash = @tmp; |
@tmp=(); |
@tmp=(); |
# Code ripped from lond, essentially. The only difference |
%returnhash = %{&convert_dump_to_currentdump(\%hash)}; |
# here is the unescaping done by lonnet::dump(). Conceivably |
|
# we might run in to problems with parameter names =~ /^v\./ |
|
while (my ($key,$value) = each(%hash)) { |
|
my ($v,$symb,$param) = split(/:/,$key); |
|
next if ($v eq 'version' || $symb eq 'keys'); |
|
next if (exists($returnhash{$symb}) && |
|
exists($returnhash{$symb}->{$param}) && |
|
$returnhash{$symb}->{'v.'.$param} > $v); |
|
$returnhash{$symb}->{$param}=$value; |
|
$returnhash{$symb}->{'v.'.$param}=$v; |
|
} |
|
# |
|
# Remove all of the keys in the hashes which keep track of |
|
# the version of the parameter. |
|
while (my ($symb,$param_hash) = each(%returnhash)) { |
|
# use a foreach because we are going to delete from the hash. |
|
foreach my $key (keys(%$param_hash)) { |
|
delete($param_hash->{$key}) if ($key =~ /^v\./); |
|
} |
|
} |
|
} else { |
} else { |
my @pairs=split(/\&/,$rep); |
my @pairs=split(/\&/,$rep); |
foreach (@pairs) { |
foreach (@pairs) { |
Line 1805 sub currentdump {
|
Line 2509 sub currentdump {
|
return %returnhash; |
return %returnhash; |
} |
} |
|
|
|
sub convert_dump_to_currentdump{ |
|
my %hash = %{shift()}; |
|
my %returnhash; |
|
# Code ripped from lond, essentially. The only difference |
|
# here is the unescaping done by lonnet::dump(). Conceivably |
|
# we might run in to problems with parameter names =~ /^v\./ |
|
while (my ($key,$value) = each(%hash)) { |
|
my ($v,$symb,$param) = split(/:/,$key); |
|
next if ($v eq 'version' || $symb eq 'keys'); |
|
next if (exists($returnhash{$symb}) && |
|
exists($returnhash{$symb}->{$param}) && |
|
$returnhash{$symb}->{'v.'.$param} > $v); |
|
$returnhash{$symb}->{$param}=$value; |
|
$returnhash{$symb}->{'v.'.$param}=$v; |
|
} |
|
# |
|
# Remove all of the keys in the hashes which keep track of |
|
# the version of the parameter. |
|
while (my ($symb,$param_hash) = each(%returnhash)) { |
|
# use a foreach because we are going to delete from the hash. |
|
foreach my $key (keys(%$param_hash)) { |
|
delete($param_hash->{$key}) if ($key =~ /^v\./); |
|
} |
|
} |
|
return \%returnhash; |
|
} |
|
|
|
# --------------------------------------------------------------- inc interface |
|
|
|
sub inc { |
|
my ($namespace,$store,$udomain,$uname) = @_; |
|
if (!$udomain) { $udomain=$ENV{'user.domain'}; } |
|
if (!$uname) { $uname=$ENV{'user.name'}; } |
|
my $uhome=&homeserver($uname,$udomain); |
|
my $items=''; |
|
if (! ref($store)) { |
|
# got a single value, so use that instead |
|
$items = &escape($store).'=&'; |
|
} elsif (ref($store) eq 'SCALAR') { |
|
$items = &escape($$store).'=&'; |
|
} elsif (ref($store) eq 'ARRAY') { |
|
$items = join('=&',map {&escape($_);} @{$store}); |
|
} elsif (ref($store) eq 'HASH') { |
|
while (my($key,$value) = each(%{$store})) { |
|
$items.= &escape($key).'='.&escape($value).'&'; |
|
} |
|
} |
|
$items=~s/\&$//; |
|
return &reply("inc:$udomain:$uname:$namespace:$items",$uhome); |
|
} |
|
|
# --------------------------------------------------------------- put interface |
# --------------------------------------------------------------- put interface |
|
|
sub put { |
sub put { |
Line 1858 sub eget {
|
Line 2613 sub eget {
|
return %returnhash; |
return %returnhash; |
} |
} |
|
|
|
# ---------------------------------------------- Custom access rule evaluation |
|
|
|
sub customaccess { |
|
my ($priv,$uri)=@_; |
|
my ($urole,$urealm)=split(/\./,$ENV{'request.role'}); |
|
$urealm=~s/^\W//; |
|
my ($udom,$ucrs,$usec)=split(/\//,$urealm); |
|
my $access=0; |
|
foreach (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) { |
|
my ($effect,$realm,$role)=split(/\:/,$_); |
|
if ($role) { |
|
if ($role ne $urole) { next; } |
|
} |
|
foreach (split(/\s*\,\s*/,$realm)) { |
|
my ($tdom,$tcrs,$tsec)=split(/\_/,$_); |
|
if ($tdom) { |
|
if ($tdom ne $udom) { next; } |
|
} |
|
if ($tcrs) { |
|
if ($tcrs ne $ucrs) { next; } |
|
} |
|
if ($tsec) { |
|
if ($tsec ne $usec) { next; } |
|
} |
|
$access=($effect eq 'allow'); |
|
last; |
|
} |
|
if ($realm eq '' && $role eq '') { |
|
$access=($effect eq 'allow'); |
|
} |
|
} |
|
return $access; |
|
} |
|
|
# ------------------------------------------------- Check for a user privilege |
# ------------------------------------------------- Check for a user privilege |
|
|
sub allowed { |
sub allowed { |
my ($priv,$uri)=@_; |
my ($priv,$uri)=@_; |
|
$uri=&deversion($uri); |
my $orguri=$uri; |
my $orguri=$uri; |
$uri=&declutter($uri); |
$uri=&declutter($uri); |
|
|
|
if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; } |
# Free bre access to adm and meta resources |
# Free bre access to adm and meta resources |
|
|
if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) { |
if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) { |
Line 1896 sub allowed {
|
Line 2686 sub allowed {
|
# Library role, so allow browsing of resources in this domain. |
# Library role, so allow browsing of resources in this domain. |
return 'F'; |
return 'F'; |
} |
} |
|
if ($copyright eq 'custom') { |
|
unless (&customaccess($priv,$uri)) { return ''; } |
|
} |
} |
} |
# Domain coordinator is trying to create a course |
# Domain coordinator is trying to create a course |
if (($priv eq 'ccc') && ($ENV{'request.role'} =~ /^dc\./)) { |
if (($priv eq 'ccc') && ($ENV{'request.role'} =~ /^dc\./)) { |
Line 1911 sub allowed {
|
Line 2704 sub allowed {
|
|
|
# Course |
# Course |
|
|
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'}=~/$priv\&([^\:]*)/) { |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'}=~/\Q$priv\E\&([^\:]*)/) { |
$thisallowed.=$1; |
$thisallowed.=$1; |
} |
} |
|
|
# Domain |
# Domain |
|
|
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.(split(/\//,$uri))[0].'/'} |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.(split(/\//,$uri))[0].'/'} |
=~/$priv\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
$thisallowed.=$1; |
$thisallowed.=$1; |
} |
} |
|
|
Line 1928 sub allowed {
|
Line 2721 sub allowed {
|
$courseuri=~s/^([^\/])/\/$1/; |
$courseuri=~s/^([^\/])/\/$1/; |
|
|
if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri} |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri} |
=~/$priv\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
$thisallowed.=$1; |
$thisallowed.=$1; |
} |
} |
|
|
# URI is an uploaded document for this course |
# URI is an uploaded document for this course |
|
|
if (($priv eq 'bre') && |
if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) { |
($uri=~/^uploaded\/$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}\/$ENV{'course.'.$ENV{'request.course.id'}.'.num'}/)) { |
my $refuri=$ENV{'httpref.'.$orguri}; |
return 'F'; |
if ($refuri) { |
|
if ($refuri =~ m|^/adm/|) { |
|
$thisallowed='F'; |
|
} |
|
} |
} |
} |
|
|
# Full access at system, domain or course-wide level? Exit. |
# Full access at system, domain or course-wide level? Exit. |
|
|
if ($thisallowed=~/F/) { |
if ($thisallowed=~/F/) { |
Line 1946 sub allowed {
|
Line 2744 sub allowed {
|
|
|
# If this is generating or modifying users, exit with special codes |
# If this is generating or modifying users, exit with special codes |
|
|
if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:cca:'=~/\:$priv\:/) { |
if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:cca:'=~/\:\Q$priv\E\:/) { |
return $thisallowed; |
return $thisallowed; |
} |
} |
# |
# |
Line 1967 sub allowed {
|
Line 2765 sub allowed {
|
if ($match) { |
if ($match) { |
$statecond=$cond; |
$statecond=$cond; |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid} |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid} |
=~/$priv\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
$thisallowed.=$1; |
$thisallowed.=$1; |
$checkreferer=0; |
$checkreferer=0; |
} |
} |
Line 1995 sub allowed {
|
Line 2793 sub allowed {
|
if ($match) { |
if ($match) { |
my $refstatecond=$cond; |
my $refstatecond=$cond; |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid} |
if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid} |
=~/$priv\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
$thisallowed.=$1; |
$thisallowed.=$1; |
$uri=$refuri; |
$uri=$refuri; |
$statecond=$refstatecond; |
$statecond=$refstatecond; |
Line 2048 sub allowed {
|
Line 2846 sub allowed {
|
if ((time-$ENV{$prefix.'last_cache'})>$expiretime) { |
if ((time-$ENV{$prefix.'last_cache'})>$expiretime) { |
&coursedescription($courseid); |
&coursedescription($courseid); |
} |
} |
if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,$csec\,/) |
if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,\Q$csec\E\,/) |
|| ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) { |
|| ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) { |
if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) { |
if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) { |
&log($ENV{'user.domain'},$ENV{'user.name'}, |
&log($ENV{'user.domain'},$ENV{'user.name'}, |
Line 2059 sub allowed {
|
Line 2857 sub allowed {
|
return ''; |
return ''; |
} |
} |
} |
} |
if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,$csec\,/) |
if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,\Q$csec\E\,/) |
|| ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) { |
|| ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) { |
if ($ENV{'priv.'.$priv.'.lock.expire'}>time) { |
if ($ENV{'priv.'.$priv.'.lock.expire'}>time) { |
&log($ENV{'user.domain'},$ENV{'user.name'}, |
&log($ENV{'user.domain'},$ENV{'user.name'}, |
Line 2093 sub allowed {
|
Line 2891 sub allowed {
|
my $rolecode=(split(/\./,$ENV{'request.role'}))[0]; |
my $rolecode=(split(/\./,$ENV{'request.role'}))[0]; |
my $unamedom=$ENV{'user.name'}.':'.$ENV{'user.domain'}; |
my $unamedom=$ENV{'user.name'}.':'.$ENV{'user.domain'}; |
if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.roles.denied'} |
if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.roles.denied'} |
=~/$rolecode/) { |
=~/\Q$rolecode\E/) { |
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '. |
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '. |
$ENV{'request.course.id'}); |
$ENV{'request.course.id'}); |
Line 2101 sub allowed {
|
Line 2899 sub allowed {
|
} |
} |
|
|
if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.users.denied'} |
if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.users.denied'} |
=~/$unamedom/) { |
=~/\Q$unamedom\E/) { |
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '. |
'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '. |
$ENV{'request.course.id'}); |
$ENV{'request.course.id'}); |
Line 2113 sub allowed {
|
Line 2911 sub allowed {
|
|
|
if ($thisallowed=~/R/) { |
if ($thisallowed=~/R/) { |
my $rolecode=(split(/\./,$ENV{'request.role'}))[0]; |
my $rolecode=(split(/\./,$ENV{'request.role'}))[0]; |
my $filename=$perlvar{'lonDocRoot'}.'/res/'.$uri.'.meta'; |
if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) { |
if (-e $filename) { |
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
my @content; |
|
{ |
|
my $fh=Apache::File->new($filename); |
|
@content=<$fh>; |
|
} |
|
if (join('',@content)=~ |
|
/\<roledeny[^\>]*\>[^\<]*$rolecode[^\<]*\<\/roledeny\>/) { |
|
&log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'}, |
|
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode); |
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode); |
return ''; |
return ''; |
|
|
} |
|
} |
} |
} |
} |
|
|
Line 2135 sub allowed {
|
Line 2923 sub allowed {
|
if ($thisallowed=~/X/) { |
if ($thisallowed=~/X/) { |
if ($ENV{'acc.randomout'}) { |
if ($ENV{'acc.randomout'}) { |
my $symb=&symbread($uri,1); |
my $symb=&symbread($uri,1); |
if (($symb) && ($ENV{'acc.randomout'}=~/\&$symb\&/)) { |
if (($symb) && ($ENV{'acc.randomout'}=~/\&\Q$symb\E\&/)) { |
return ''; |
return ''; |
} |
} |
} |
} |
Line 2153 sub allowed {
|
Line 2941 sub allowed {
|
|
|
sub is_on_map { |
sub is_on_map { |
my $uri=&declutter(shift); |
my $uri=&declutter(shift); |
|
$uri=~s/\.\d+\.(\w+)$/\.$1/; |
my @uriparts=split(/\//,$uri); |
my @uriparts=split(/\//,$uri); |
my $filename=$uriparts[$#uriparts]; |
my $filename=$uriparts[$#uriparts]; |
my $pathname=$uri; |
my $pathname=$uri; |
$pathname=~s|/\Q$filename\E$||; |
$pathname=~s|/\Q$filename\E$||; |
|
$pathname=~s/^adm\/wrapper\///; |
#Trying to find the conditional for the file |
#Trying to find the conditional for the file |
my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~ |
my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~ |
/\&\Q$filename\E\:([\d\|]+)\&/); |
/\&\Q$filename\E\:([\d\|]+)\&/); |
Line 2167 sub is_on_map {
|
Line 2957 sub is_on_map {
|
} |
} |
} |
} |
|
|
|
# --------------------------------------------------------- Get symb from alias |
|
|
|
sub get_symb_from_alias { |
|
my $symb=shift; |
|
my ($map,$resid,$url)=&decode_symb($symb); |
|
# Already is a symb |
|
if ($url) { return $symb; } |
|
# Must be an alias |
|
my $aliassymb=''; |
|
my %bighash; |
|
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
|
&GDBM_READER(),0640)) { |
|
my $rid=$bighash{'mapalias_'.$symb}; |
|
if ($rid) { |
|
my ($mapid,$resid)=split(/\./,$rid); |
|
$aliassymb=&encode_symb($bighash{'map_id_'.$mapid}, |
|
$resid,$bighash{'src_'.$rid}); |
|
} |
|
untie %bighash; |
|
} |
|
return $aliassymb; |
|
} |
|
|
# ----------------------------------------------------------------- Define Role |
# ----------------------------------------------------------------- Define Role |
|
|
sub definerole { |
sub definerole { |
if (allowed('mcr','/')) { |
if (allowed('mcr','/')) { |
my ($rolename,$sysrole,$domrole,$courole)=@_; |
my ($rolename,$sysrole,$domrole,$courole)=@_; |
foreach (split('/',$sysrole)) { |
foreach (split(':',$sysrole)) { |
my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$_); |
if ($pr{'cr:s'}!~/$crole/) { return "refused:s:$crole"; } |
if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; } |
if ($pr{'cr:s'}=~/$crole\&/) { |
if ($pr{'cr:s'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:s'}!~/$crole\&\w*$cqual/) { |
if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
return "refused:s:$crole&$cqual"; |
return "refused:s:$crole&$cqual"; |
} |
} |
} |
} |
} |
} |
foreach (split('/',$domrole)) { |
foreach (split(':',$domrole)) { |
my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$_); |
if ($pr{'cr:d'}!~/$crole/) { return "refused:d:$crole"; } |
if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; } |
if ($pr{'cr:d'}=~/$crole\&/) { |
if ($pr{'cr:d'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:d'}!~/$crole\&\w*$cqual/) { |
if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) { |
return "refused:d:$crole&$cqual"; |
return "refused:d:$crole&$cqual"; |
} |
} |
} |
} |
} |
} |
foreach (split('/',$courole)) { |
foreach (split(':',$courole)) { |
my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$_); |
if ($pr{'cr:c'}!~/$crole/) { return "refused:c:$crole"; } |
if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; } |
if ($pr{'cr:c'}=~/$crole\&/) { |
if ($pr{'cr:c'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:c'}!~/$crole\&\w*$cqual/) { |
if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
return "refused:c:$crole&$cqual"; |
return "refused:c:$crole&$cqual"; |
} |
} |
} |
} |
Line 2241 sub log_query {
|
Line 3054 sub log_query {
|
my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters)); |
my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters)); |
my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command, |
my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command, |
$uhome); |
$uhome); |
unless ($queryid=~/^$uhost\_/) { return 'error: '.$queryid; } |
unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; } |
return get_query_reply($queryid); |
return get_query_reply($queryid); |
} |
} |
|
|
|
# ------- Request retrieval of institutional classlists for course(s) |
|
|
|
sub fetch_enrollment_query { |
|
my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_; |
|
my $homeserver; |
|
if ($context eq 'automated') { |
|
$homeserver = $perlvar{'lonHostID'}; |
|
} else { |
|
$homeserver = &homeserver($cnum,$dom); |
|
} |
|
my $host=$hostname{$homeserver}; |
|
my $cmd = ''; |
|
foreach (keys %{$affiliatesref}) { |
|
$cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%'; |
|
} |
|
$cmd =~ s/%%$//; |
|
$cmd = &escape($cmd); |
|
my $query = 'fetchenrollment'; |
|
my $queryid=&reply("querysend:".$query.':'.$dom.':'.$ENV{'user.name'}.':'.$cmd,$homeserver); |
|
unless ($queryid=~/^\Q$host\E\_/) { return 'error: '.$queryid; } |
|
my $reply = &get_query_reply($queryid); |
|
unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
|
my @responses = split/:/,$reply; |
|
if ($homeserver eq $perlvar{'lonHostID'}) { |
|
foreach (@responses) { |
|
my ($key,$value) = split/=/,$_; |
|
$$replyref{$key} = $value; |
|
} |
|
} else { |
|
my $pathname = $perlvar{'lonDaemons'}.'/tmp'; |
|
foreach (@responses) { |
|
my ($key,$value) = split/=/,$_; |
|
$$replyref{$key} = $value; |
|
if ($value > 0) { |
|
foreach (@{$$affiliatesref{$key}}) { |
|
my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml'; |
|
my $destname = $pathname.'/'.$filename; |
|
my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver); |
|
unless ($xml_classlist =~ /^error/) { |
|
if ( open(FILE,">$destname") ) { |
|
print FILE &unescape($xml_classlist); |
|
close(FILE); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return 'ok'; |
|
} |
|
return 'error'; |
|
} |
|
|
sub get_query_reply { |
sub get_query_reply { |
my $queryid=shift; |
my $queryid=shift; |
my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid; |
my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid; |
Line 2252 sub get_query_reply {
|
Line 3118 sub get_query_reply {
|
for (1..100) { |
for (1..100) { |
sleep 2; |
sleep 2; |
if (-e $replyfile.'.end') { |
if (-e $replyfile.'.end') { |
if (my $fh=Apache::File->new($replyfile)) { |
if (open(my $fh,$replyfile)) { |
$reply.=<$fh>; |
$reply.=<$fh>; |
$fh->close; |
close($fh); |
} else { return 'error: reply_file_error'; } |
} else { return 'error: reply_file_error'; } |
return &unescape($reply); |
return &unescape($reply); |
} |
} |
Line 2289 sub userlog_query {
|
Line 3155 sub userlog_query {
|
return &log_query($uname,$udom,'userlog',%filters); |
return &log_query($uname,$udom,'userlog',%filters); |
} |
} |
|
|
|
#--------- Call auto-enrollment subs in localenroll.pm for homeserver for course |
|
|
|
sub auto_run { |
|
my ($cnum,$cdom) = @_; |
|
my $homeserver = &homeserver($cnum,$cdom); |
|
my $response = &reply('autorun:'.$cdom,$homeserver); |
|
return $response; |
|
} |
|
|
|
sub auto_get_sections { |
|
my ($cnum,$cdom,$inst_coursecode) = @_; |
|
my $homeserver = &homeserver($cnum,$cdom); |
|
my @secs = (); |
|
my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); |
|
unless ($response eq 'refused') { |
|
@secs = split/:/,$response; |
|
} |
|
return @secs; |
|
} |
|
|
|
sub auto_new_course { |
|
my ($cnum,$cdom,$inst_course_id,$owner) = @_; |
|
my $homeserver = &homeserver($cnum,$cdom); |
|
my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver)); |
|
return $response; |
|
} |
|
|
|
sub auto_validate_courseID { |
|
my ($cnum,$cdom,$inst_course_id) = @_; |
|
my $homeserver = &homeserver($cnum,$cdom); |
|
my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver)); |
|
return $response; |
|
} |
|
|
|
sub auto_create_password { |
|
my ($cnum,$cdom,$authparam) = @_; |
|
my $homeserver = &homeserver($cnum,$cdom); |
|
my $create_passwd = 0; |
|
my $authchk = ''; |
|
my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver)); |
|
if ($response eq 'refused') { |
|
$authchk = 'refused'; |
|
} else { |
|
($authparam,$create_passwd,$authchk) = split/:/,$response; |
|
} |
|
return ($authparam,$create_passwd,$authchk); |
|
} |
|
|
|
sub auto_instcode_format { |
|
my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_; |
|
my $courses = ''; |
|
my $homeserver; |
|
if ($caller eq 'global') { |
|
$homeserver = $perlvar{'lonHostID'}; |
|
} else { |
|
$homeserver = &homeserver($caller,$codedom); |
|
} |
|
my $host=$hostname{$homeserver}; |
|
foreach (keys %{$instcodes}) { |
|
$courses .= &escape($_).'='.&escape($$instcodes{$_}).'&'; |
|
} |
|
chop($courses); |
|
my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver); |
|
unless ($response =~ /(con_lost|error|no_such_host|refused)/) { |
|
my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response; |
|
%{$codes} = &str2hash($codes_str); |
|
@{$codetitles} = &str2array($codetitles_str); |
|
%{$cat_titles} = &str2hash($cat_titles_str); |
|
%{$cat_order} = &str2hash($cat_order_str); |
|
return 'ok'; |
|
} |
|
return $response; |
|
} |
|
|
# ------------------------------------------------------------------ Plain Text |
# ------------------------------------------------------------------ Plain Text |
|
|
sub plaintext { |
sub plaintext { |
my $short=shift; |
my $short=shift; |
return $prp{$short}; |
return &mt($prp{$short}); |
} |
} |
|
|
# ----------------------------------------------------------------- Assign Role |
# ----------------------------------------------------------------- Assign Role |
|
|
sub assignrole { |
sub assignrole { |
my ($udom,$uname,$url,$role,$end,$start)=@_; |
my ($udom,$uname,$url,$role,$end,$start,$deleteflag)=@_; |
my $mrole; |
my $mrole; |
if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
unless (&allowed('ccr',$url)) { |
my $cwosec=$url; |
|
$cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
|
unless (&allowed('ccr',$cwosec)) { |
&logthis('Refused custom assignrole: '. |
&logthis('Refused custom assignrole: '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$ENV{'user.name'}.' at '.$ENV{'user.domain'}); |
$ENV{'user.name'}.' at '.$ENV{'user.domain'}); |
Line 2312 sub assignrole {
|
Line 3254 sub assignrole {
|
} else { |
} else { |
my $cwosec=$url; |
my $cwosec=$url; |
$cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
$cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
unless (&allowed('c'.$role,$cwosec)) { |
unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) { |
&logthis('Refused assignrole: '. |
&logthis('Refused assignrole: '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$ENV{'user.name'}.' at '.$ENV{'user.domain'}); |
$ENV{'user.name'}.' at '.$ENV{'user.domain'}); |
Line 2330 sub assignrole {
|
Line 3272 sub assignrole {
|
$command.='_0_'.$start; |
$command.='_0_'.$start; |
} |
} |
} |
} |
return &reply($command,&homeserver($uname,$udom)); |
# actually delete |
|
if ($deleteflag) { |
|
if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) { |
|
# modify command to delete the role |
|
$command="encrypt:rolesdel:$ENV{'user.domain'}:$ENV{'user.name'}:". |
|
"$udom:$uname:$url".'_'."$mrole"; |
|
&logthis("$ENV{'user.name'} at $ENV{'user.domain'} deletes $mrole in $url for $uname at $udom"); |
|
# set start and finish to negative values for userrolelog |
|
$start=-1; |
|
$end=-1; |
|
} |
|
} |
|
# send command |
|
my $answer=&reply($command,&homeserver($uname,$udom)); |
|
# log new user role if status is ok |
|
if ($answer eq 'ok') { |
|
&userrolelog($mrole,$uname,$udom,$url,$start,$end); |
|
} |
|
return $answer; |
} |
} |
|
|
# -------------------------------------------------- Modify user authentication |
# -------------------------------------------------- Modify user authentication |
Line 2365 sub modifyuser {
|
Line 3325 sub modifyuser {
|
my ($udom, $uname, $uid, |
my ($udom, $uname, $uid, |
$umode, $upass, $first, |
$umode, $upass, $first, |
$middle, $last, $gene, |
$middle, $last, $gene, |
$forceid, $desiredhome)=@_; |
$forceid, $desiredhome, $email)=@_; |
$udom=~s/\W//g; |
$udom=~s/\W//g; |
$uname=~s/\W//g; |
$uname=~s/\W//g; |
&logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
&logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
Line 2377 sub modifyuser {
|
Line 3337 sub modifyuser {
|
' in domain '.$ENV{'request.role.domain'}); |
' in domain '.$ENV{'request.role.domain'}); |
my $uhome=&homeserver($uname,$udom,'true'); |
my $uhome=&homeserver($uname,$udom,'true'); |
# ----------------------------------------------------------------- Create User |
# ----------------------------------------------------------------- Create User |
if (($uhome eq 'no_host') && ($umode) && ($upass)) { |
if (($uhome eq 'no_host') && |
|
(($umode && $upass) || ($umode eq 'localauth'))) { |
my $unhome=''; |
my $unhome=''; |
if (defined($desiredhome) && $hostdom{$desiredhome} eq $udom) { |
if (defined($desiredhome) && $hostdom{$desiredhome} eq $udom) { |
$unhome = $desiredhome; |
$unhome = $desiredhome; |
Line 2407 sub modifyuser {
|
Line 3368 sub modifyuser {
|
} |
} |
$uhome=&homeserver($uname,$udom,'true'); |
$uhome=&homeserver($uname,$udom,'true'); |
if (($uhome eq '') || ($uhome eq 'no_host') || ($uhome ne $unhome)) { |
if (($uhome eq '') || ($uhome eq 'no_host') || ($uhome ne $unhome)) { |
return 'error: verify home'; |
return 'error: unable verify users home machine.'; |
} |
} |
} # End of creation of new user |
} # End of creation of new user |
# ---------------------------------------------------------------------- Add ID |
# ---------------------------------------------------------------------- Add ID |
Line 2417 sub modifyuser {
|
Line 3378 sub modifyuser {
|
if (($uidhash{$uname}) && ($uidhash{$uname}!~/error\:/) |
if (($uidhash{$uname}) && ($uidhash{$uname}!~/error\:/) |
&& (!$forceid)) { |
&& (!$forceid)) { |
unless ($uid eq $uidhash{$uname}) { |
unless ($uid eq $uidhash{$uname}) { |
return 'error: mismatch '.$uidhash{$uname}.' versus '.$uid; |
return 'error: user id "'.$uid.'" does not match '. |
|
'current user id "'.$uidhash{$uname}.'".'; |
} |
} |
} else { |
} else { |
&idput($udom,($uname => $uid)); |
&idput($udom,($uname => $uid)); |
Line 2433 sub modifyuser {
|
Line 3395 sub modifyuser {
|
} else { |
} else { |
%names = @tmp; |
%names = @tmp; |
} |
} |
|
# |
|
# Make sure to not trash student environment if instructor does not bother |
|
# to supply name and email information |
|
# |
if ($first) { $names{'firstname'} = $first; } |
if ($first) { $names{'firstname'} = $first; } |
if ($middle) { $names{'middlename'} = $middle; } |
if (defined($middle)) { $names{'middlename'} = $middle; } |
if ($last) { $names{'lastname'} = $last; } |
if ($last) { $names{'lastname'} = $last; } |
if ($gene) { $names{'generation'} = $gene; } |
if (defined($gene)) { $names{'generation'} = $gene; } |
|
if ($email) { $names{'notification'} = $email; |
|
$names{'critnotification'} = $email; } |
|
|
my $reply = &put('environment', \%names, $udom,$uname); |
my $reply = &put('environment', \%names, $udom,$uname); |
if ($reply ne 'ok') { return 'error: '.$reply; } |
if ($reply ne 'ok') { return 'error: '.$reply; } |
&logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '. |
&logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '. |
Line 2450 sub modifyuser {
|
Line 3419 sub modifyuser {
|
|
|
sub modifystudent { |
sub modifystudent { |
my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
$end,$start,$forceid,$desiredhome)=@_; |
$end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid)=@_; |
my $cid=''; |
if (!$cid) { |
unless ($cid=$ENV{'request.course.id'}) { |
unless ($cid=$ENV{'request.course.id'}) { |
return 'not_in_class'; |
return 'not_in_class'; |
|
} |
} |
} |
# --------------------------------------------------------------- Make the user |
# --------------------------------------------------------------- Make the user |
my $reply=&modifyuser |
my $reply=&modifyuser |
($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid, |
($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid, |
$desiredhome); |
$desiredhome,$email); |
unless ($reply eq 'ok') { return $reply; } |
unless ($reply eq 'ok') { return $reply; } |
# This will cause &modify_student_enrollment to get the uid from the |
# This will cause &modify_student_enrollment to get the uid from the |
# students environment |
# students environment |
$uid = undef if (!$forceid); |
$uid = undef if (!$forceid); |
$reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle, |
$reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last, |
$last,$gene,$usec,$end,$start); |
$gene,$usec,$end,$start,$type,$locktype,$cid); |
return $reply; |
return $reply; |
} |
} |
|
|
sub modify_student_enrollment { |
sub modify_student_enrollment { |
my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start) = @_; |
my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid) = @_; |
# Get the course id from the environment |
my ($cdom,$cnum,$chome); |
my $cid=''; |
if (!$cid) { |
unless ($cid=$ENV{'request.course.id'}) { |
unless ($cid=$ENV{'request.course.id'}) { |
return 'not_in_class'; |
return 'not_in_class'; |
|
} |
|
$cdom=$ENV{'course.'.$cid.'.domain'}; |
|
$cnum=$ENV{'course.'.$cid.'.num'}; |
|
} else { |
|
($cdom,$cnum)=split(/_/,$cid); |
} |
} |
|
$chome=$ENV{'course.'.$cid.'.home'}; |
|
if (!$chome) { |
|
$chome=&homeserver($cnum,$cdom); |
|
} |
|
if (!$chome) { return 'unknown_course'; } |
# Make sure the user exists |
# Make sure the user exists |
my $uhome=&homeserver($uname,$udom); |
my $uhome=&homeserver($uname,$udom); |
if (($uhome eq '') || ($uhome eq 'no_host')) { |
if (($uhome eq '') || ($uhome eq 'no_host')) { |
return 'error: no such user'; |
return 'error: no such user'; |
} |
} |
# |
|
# Get student data if we were not given enough information |
# Get student data if we were not given enough information |
if (!defined($first) || $first eq '' || |
if (!defined($first) || $first eq '' || |
!defined($last) || $last eq '' || |
!defined($last) || $last eq '' || |
Line 2493 sub modify_student_enrollment {
|
Line 3472 sub modify_student_enrollment {
|
['firstname','middlename','lastname', 'generation','id'] |
['firstname','middlename','lastname', 'generation','id'] |
,$udom,$uname); |
,$udom,$uname); |
|
|
foreach (keys(%tmp)) { |
#foreach (keys(%tmp)) { |
&logthis("key $_ = ".$tmp{$_}); |
# &logthis("key $_ = ".$tmp{$_}); |
} |
#} |
$first = $tmp{'firstname'} if (!defined($first) || $first eq ''); |
$first = $tmp{'firstname'} if (!defined($first) || $first eq ''); |
$middle = $tmp{'middlename'} if (!defined($middle) || $middle eq ''); |
$middle = $tmp{'middlename'} if (!defined($middle) || $middle eq ''); |
$last = $tmp{'lastname'} if (!defined($last) || $last eq ''); |
$last = $tmp{'lastname'} if (!defined($last) || $last eq ''); |
Line 2504 sub modify_student_enrollment {
|
Line 3483 sub modify_student_enrollment {
|
} |
} |
my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene, |
my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene, |
$first,$middle); |
$first,$middle); |
my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'. |
my $reply=cput('classlist', |
$ENV{'course.'.$cid.'.num'}.':classlist:'. |
{"$uname:$udom" => |
&escape($uname.':'.$udom).'='. |
join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) }, |
&escape(join(':',$end,$start,$uid,$usec,$fullname)), |
$cdom,$cnum); |
$ENV{'course.'.$cid.'.home'}); |
|
unless (($reply eq 'ok') || ($reply eq 'delayed')) { |
unless (($reply eq 'ok') || ($reply eq 'delayed')) { |
return 'error: '.$reply; |
return 'error: '.$reply; |
} |
} |
Line 2543 sub writecoursepref {
|
Line 3521 sub writecoursepref {
|
# ---------------------------------------------------------- Make/modify course |
# ---------------------------------------------------------- Make/modify course |
|
|
sub createcourse { |
sub createcourse { |
my ($udom,$description,$url,$course_server,$nonstandard)=@_; |
my ($udom,$description,$url,$course_server,$nonstandard,$inst_code)=@_; |
$url=&declutter($url); |
$url=&declutter($url); |
my $cid=''; |
my $cid=''; |
unless (&allowed('ccc',$udom)) { |
unless (&allowed('ccc',$udom)) { |
Line 2576 sub createcourse {
|
Line 3554 sub createcourse {
|
return 'error: no such course'; |
return 'error: no such course'; |
} |
} |
# ----------------------------------------------------------------- Course made |
# ----------------------------------------------------------------- Course made |
|
# log existence |
|
&courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description). |
|
'='.&escape($inst_code),$uhome); |
|
&flushcourselogs(); |
|
# set toplevel url |
my $topurl=$url; |
my $topurl=$url; |
unless ($nonstandard) { |
unless ($nonstandard) { |
# ------------------------------------------ For standard courses, make top url |
# ------------------------------------------ For standard courses, make top url |
Line 2604 ENDINITMAP
|
Line 3587 ENDINITMAP
|
# ---------------------------------------------------------- Assign Custom Role |
# ---------------------------------------------------------- Assign Custom Role |
|
|
sub assigncustomrole { |
sub assigncustomrole { |
my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start)=@_; |
my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag)=@_; |
return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename, |
return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename, |
$end,$start); |
$end,$start,$deleteflag); |
} |
} |
|
|
# ----------------------------------------------------------------- Revoke Role |
# ----------------------------------------------------------------- Revoke Role |
|
|
sub revokerole { |
sub revokerole { |
my ($udom,$uname,$url,$role)=@_; |
my ($udom,$uname,$url,$role,$deleteflag)=@_; |
my $now=time; |
my $now=time; |
return &assignrole($udom,$uname,$url,$role,$now); |
return &assignrole($udom,$uname,$url,$role,$now,$deleteflag); |
} |
} |
|
|
# ---------------------------------------------------------- Revoke Custom Role |
# ---------------------------------------------------------- Revoke Custom Role |
|
|
sub revokecustomrole { |
sub revokecustomrole { |
my ($udom,$uname,$url,$rdom,$rnam,$rolename)=@_; |
my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag)=@_; |
my $now=time; |
my $now=time; |
return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now); |
return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now, |
|
$deleteflag); |
} |
} |
|
|
|
|
|
# ------------------------------------------------------------ Portfolio Director Lister |
|
# returns listing of contents of user's /userfiles/portfolio/ directory |
|
# |
|
|
|
sub portfoliolist { |
|
my ($currentPath, $currentFile) = @_; |
|
my ($udom, $uname, $portfolioRoot); |
|
$uname=$ENV{'user.name'}; |
|
$udom=$ENV{'user.domain'}; |
|
# really should interrogate the system for home directory information, but . . . |
|
$portfolioRoot = '/home/httpd/lonUsers/'.$udom.'/'; |
|
$uname =~ /^(.?)(.?)(.?)/; |
|
$portfolioRoot = $portfolioRoot.$1.'/'.$2.'/'.$3.'/'.$uname.'/userfiles/portfolio'; |
|
my $listing = &reply('ls:'.$portfolioRoot.$currentPath, &homeserver($uname,$udom)); |
|
return $listing; |
|
} |
|
|
|
sub portfoliomanage { |
|
|
|
#FIXME please user the existing remove userfile function instead and |
|
#add a userfilerename functions. |
|
#FIXME uhome should never be an argument to any lonnet functions |
|
|
|
# handles deleting and renaming files in user's userfiles/portfolio/ directory |
|
# |
|
my ($filename, $fileaction, $filenewname) = @_; |
|
my ($udom, $uname, $uhome); |
|
$uname=$ENV{'user.name'}; |
|
$udom=$ENV{'user.domain'}; |
|
$uhome=$ENV{'user.home'}; |
|
my $listing = reply('portfoliomanage:'.$uname.':'.$udom.':'.$filename.':'.$fileaction.':'.$filenewname, $uhome); |
|
return $listing; |
|
} |
|
|
|
|
# ------------------------------------------------------------ Directory lister |
# ------------------------------------------------------------ Directory lister |
|
|
sub dirlist { |
sub dirlist { |
Line 2687 sub dirlist {
|
Line 3707 sub dirlist {
|
} |
} |
my $alldomstr=''; |
my $alldomstr=''; |
foreach (sort keys %alldom) { |
foreach (sort keys %alldom) { |
$alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:'; |
$alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:'; |
} |
} |
$alldomstr=~s/:$//; |
$alldomstr=~s/:$//; |
return split(/:/,$alldomstr); |
return split(/:/,$alldomstr); |
Line 2703 sub dirlist {
|
Line 3723 sub dirlist {
|
# when it was last modified. It will also return an error of -1 |
# when it was last modified. It will also return an error of -1 |
# if an error occurs |
# if an error occurs |
|
|
|
## |
|
## FIXME: This subroutine assumes its caller knows something about the |
|
## directory structure of the home server for the student ($root). |
|
## Not a good assumption to make. Since this is for looking up files |
|
## in user directories, the full path should be constructed by lond, not |
|
## whatever machine we request data from. |
|
## |
sub GetFileTimestamp { |
sub GetFileTimestamp { |
my ($studentDomain,$studentName,$filename,$root)=@_; |
my ($studentDomain,$studentName,$filename,$root)=@_; |
$studentDomain=~s/\W//g; |
$studentDomain=~s/\W//g; |
Line 2711 sub GetFileTimestamp {
|
Line 3738 sub GetFileTimestamp {
|
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
my $proname="$studentDomain/$subdir/$studentName"; |
my $proname="$studentDomain/$subdir/$studentName"; |
$proname .= '/'.$filename; |
$proname .= '/'.$filename; |
my @dir = &Apache::lonnet::dirlist($proname, $studentDomain, $studentName, |
my ($fileStat) = &Apache::lonnet::dirlist($proname, $studentDomain, |
$root); |
$studentName, $root); |
my $fileStat = $dir[0]; |
|
my @stats = split('&', $fileStat); |
my @stats = split('&', $fileStat); |
if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
return $stats[9]; |
# @stats contains first the filename, then the stat output |
|
return $stats[10]; # so this is 10 instead of 9. |
} else { |
} else { |
return -1; |
return -1; |
} |
} |
Line 2779 sub condval {
|
Line 3806 sub condval {
|
sub devalidatecourseresdata { |
sub devalidatecourseresdata { |
my ($coursenum,$coursedomain)=@_; |
my ($coursenum,$coursedomain)=@_; |
my $hashid=$coursenum.':'.$coursedomain; |
my $hashid=$coursenum.':'.$coursedomain; |
delete $courseresdatacache{$hashid.'.time'}; |
&devalidate_cache(\%courseresdatacache,$hashid,'courseres'); |
} |
} |
|
|
# --------------------------------------------------- Course Resourcedata Query |
# --------------------------------------------------- Course Resourcedata Query |
Line 2788 sub courseresdata {
|
Line 3815 sub courseresdata {
|
my ($coursenum,$coursedomain,@which)=@_; |
my ($coursenum,$coursedomain,@which)=@_; |
my $coursehom=&homeserver($coursenum,$coursedomain); |
my $coursehom=&homeserver($coursenum,$coursedomain); |
my $hashid=$coursenum.':'.$coursedomain; |
my $hashid=$coursenum.':'.$coursedomain; |
my $dodump=0; |
my ($result,$cached)=&is_cached(\%courseresdatacache,$hashid,'courseres'); |
if (!defined($courseresdatacache{$hashid.'.time'})) { |
unless (defined($cached)) { |
$dodump=1; |
|
} else { |
|
if (time-$courseresdatacache{$hashid.'.time'}>300) { $dodump=1; } |
|
} |
|
if ($dodump) { |
|
my %dumpreply=&dump('resourcedata',$coursedomain,$coursenum); |
my %dumpreply=&dump('resourcedata',$coursedomain,$coursenum); |
|
$result=\%dumpreply; |
my ($tmp) = keys(%dumpreply); |
my ($tmp) = keys(%dumpreply); |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
$courseresdatacache{$hashid.'.time'}=time; |
&do_cache(\%courseresdatacache,$hashid,$result,'courseres'); |
$courseresdatacache{$hashid}=\%dumpreply; |
|
} elsif ($tmp =~ /^(con_lost|no_such_host)/) { |
} elsif ($tmp =~ /^(con_lost|no_such_host)/) { |
return $tmp; |
return $tmp; |
|
} elsif ($tmp =~ /^(error)/) { |
|
$result=undef; |
|
&do_cache(\%courseresdatacache,$hashid,$result,'courseres'); |
} |
} |
} |
} |
foreach my $item (@which) { |
foreach my $item (@which) { |
if (defined($courseresdatacache{$hashid}->{$item})) { |
if (defined($result->{$item})) { |
return $courseresdatacache{$hashid}->{$item}; |
return $result->{$item}; |
} |
} |
} |
} |
return undef; |
return undef; |
} |
} |
|
|
# --------------------------------------------------------- Value of a Variable |
# |
|
# EXT resource caching routines |
|
# |
|
|
|
sub clear_EXT_cache_status { |
|
&delenv('cache.EXT.'); |
|
} |
|
|
|
sub EXT_cache_status { |
|
my ($target_domain,$target_user) = @_; |
|
my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; |
|
if (exists($ENV{$cachename}) && ($ENV{$cachename}+600) > time) { |
|
# We know already the user has no data |
|
return 1; |
|
} else { |
|
return 0; |
|
} |
|
} |
|
|
|
sub EXT_cache_set { |
|
my ($target_domain,$target_user) = @_; |
|
my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; |
|
&appenv($cachename => time); |
|
} |
|
|
|
# --------------------------------------------------------- Value of a Variable |
sub EXT { |
sub EXT { |
my ($varname,$symbparm,$udom,$uname,)=@_; |
my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_; |
|
|
unless ($varname) { return ''; } |
unless ($varname) { return ''; } |
|
|
#get real user name/domain, courseid and symb |
#get real user name/domain, courseid and symb |
my $courseid; |
my $courseid; |
|
my $publicuser; |
|
if ($symbparm) { |
|
$symbparm=&get_symb_from_alias($symbparm); |
|
} |
if (!($uname && $udom)) { |
if (!($uname && $udom)) { |
(my $cursymb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
(my $cursymb,$courseid,$udom,$uname,$publicuser)= |
|
&Apache::lonxml::whichuser($symbparm); |
if (!$symbparm) { $symbparm=$cursymb; } |
if (!$symbparm) { $symbparm=$cursymb; } |
} else { |
} else { |
$courseid=$ENV{'request.course.id'}; |
$courseid=$ENV{'request.course.id'}; |
Line 2842 sub EXT {
|
Line 3895 sub EXT {
|
if ($realm eq 'user') { |
if ($realm eq 'user') { |
# --------------------------------------------------------------- user.resource |
# --------------------------------------------------------------- user.resource |
if ($space eq 'resource') { |
if ($space eq 'resource') { |
my %restored=&restore(undef,undef,$udom,$uname); |
if (defined($Apache::lonhomework::parsing_a_problem)) { |
return $restored{$qualifierrest}; |
return $Apache::lonhomework::history{$qualifierrest}; |
|
} else { |
|
my %restored; |
|
if ($publicuser || $ENV{'request.state'} eq 'construct') { |
|
%restored=&tmprestore($symbparm,$courseid,$udom,$uname); |
|
} else { |
|
%restored=&restore($symbparm,$courseid,$udom,$uname); |
|
} |
|
return $restored{$qualifierrest}; |
|
} |
# ----------------------------------------------------------------- user.access |
# ----------------------------------------------------------------- user.access |
} elsif ($space eq 'access') { |
} elsif ($space eq 'access') { |
# FIXME - not supporting calls for a specific user |
# FIXME - not supporting calls for a specific user |
Line 2854 sub EXT {
|
Line 3916 sub EXT {
|
($udom eq $ENV{'user.domain'})) { |
($udom eq $ENV{'user.domain'})) { |
return $ENV{join('.',('environment',$qualifierrest))}; |
return $ENV{join('.',('environment',$qualifierrest))}; |
} else { |
} else { |
my %returnhash=&userenvironment($udom,$uname,$qualifierrest); |
my %returnhash; |
|
if (!$publicuser) { |
|
%returnhash=&userenvironment($udom,$uname, |
|
$qualifierrest); |
|
} |
return $returnhash{$qualifierrest}; |
return $returnhash{$qualifierrest}; |
} |
} |
# ----------------------------------------------------------------- user.course |
# ----------------------------------------------------------------- user.course |
Line 2878 sub EXT {
|
Line 3944 sub EXT {
|
return $uname; |
return $uname; |
# ---------------------------------------------------- Any other user namespace |
# ---------------------------------------------------- Any other user namespace |
} else { |
} else { |
my $item=($rest)?$qualifier.'.'.$rest:$qualifier; |
my %reply; |
my %reply=&get($space,[$item]); |
if (!$publicuser) { |
return $reply{$item}; |
%reply=&get($space,[$qualifierrest],$udom,$uname); |
|
} |
|
return $reply{$qualifierrest}; |
} |
} |
} elsif ($realm eq 'query') { |
} elsif ($realm eq 'query') { |
# ---------------------------------------------- pull stuff out of query string |
# ---------------------------------------------- pull stuff out of query string |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},[$space]); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
return $ENV{'form.'.$space}; |
[$spacequalifierrest]); |
|
return $ENV{'form.'.$spacequalifierrest}; |
} elsif ($realm eq 'request') { |
} elsif ($realm eq 'request') { |
# ------------------------------------------------------------- request.browser |
# ------------------------------------------------------------- request.browser |
if ($space eq 'browser') { |
if ($space eq 'browser') { |
return $ENV{'browser.'.$qualifier}; |
if ($qualifier eq 'textremote') { |
|
if (&mt('textual_remote_display') eq 'on') { |
|
return 1; |
|
} else { |
|
return 0; |
|
} |
|
} else { |
|
return $ENV{'browser.'.$qualifier}; |
|
} |
# ------------------------------------------------------------ request.filename |
# ------------------------------------------------------------ request.filename |
} else { |
} else { |
return $ENV{'request.'.$spacequalifierrest}; |
return $ENV{'request.'.$spacequalifierrest}; |
Line 2899 sub EXT {
|
Line 3976 sub EXT {
|
return $ENV{'course.'.$courseid.'.'.$spacequalifierrest}; |
return $ENV{'course.'.$courseid.'.'.$spacequalifierrest}; |
} elsif ($realm eq 'resource') { |
} elsif ($realm eq 'resource') { |
|
|
if ($courseid eq $ENV{'request.course.id'}) { |
my $section; |
|
if (defined($courseid) && $courseid eq $ENV{'request.course.id'}) { |
|
|
#print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest; |
#print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest; |
|
|
# ----------------------------------------------------- Cascading lookup scheme |
# ----------------------------------------------------- Cascading lookup scheme |
if (!$symbparm) { $symbparm=&symbread(); } |
if (!$symbparm) { $symbparm=&symbread(); } |
my $symbp=$symbparm; |
my $symbp=$symbparm; |
my $mapp=(split(/\_\_\_/,$symbp))[0]; |
my $mapp=(&decode_symb($symbp))[0]; |
|
|
my $symbparm=$symbp.'.'.$spacequalifierrest; |
my $symbparm=$symbp.'.'.$spacequalifierrest; |
my $mapparm=$mapp.'___(all).'.$spacequalifierrest; |
my $mapparm=$mapp.'___(all).'.$spacequalifierrest; |
|
|
my $section; |
|
if (($ENV{'user.name'} eq $uname) && |
if (($ENV{'user.name'} eq $uname) && |
($ENV{'user.domain'} eq $udom)) { |
($ENV{'user.domain'} eq $udom)) { |
$section=$ENV{'request.course.sec'}; |
$section=$ENV{'request.course.sec'}; |
} else { |
} else { |
$section=&usection($udom,$uname,$courseid); |
if (! defined($usection)) { |
|
$section=&usection($udom,$uname,$courseid); |
|
} else { |
|
$section = $usection; |
|
} |
} |
} |
|
|
my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest; |
my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest; |
Line 2928 sub EXT {
|
Line 4009 sub EXT {
|
my $courselevelm=$courseid.'.'.$mapparm; |
my $courselevelm=$courseid.'.'.$mapparm; |
|
|
# ----------------------------------------------------------- first, check user |
# ----------------------------------------------------------- first, check user |
#most student don't have any data set, check if there is some data |
#most student don\'t have any data set, check if there is some data |
#every thirty minutes |
if (! &EXT_cache_status($udom,$uname)) { |
if (! |
my $hashid="$udom:$uname"; |
(exists($ENV{'cache.studentresdata'}) |
my ($result,$cached)=&is_cached(\%userresdatacache,$hashid, |
&& (($ENV{'cache.studentresdata'}+1800) > time))) { |
'userres'); |
my %resourcedata=&get('resourcedata', |
if (!defined($cached)) { |
[$courselevelr,$courselevelm,$courselevel], |
my %resourcedata=&dump('resourcedata',$udom,$uname); |
$udom,$uname); |
$result=\%resourcedata; |
my ($tmp)=keys(%resourcedata); |
&do_cache(\%userresdatacache,$hashid,$result,'userres'); |
|
} |
|
my ($tmp)=keys(%$result); |
if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) { |
if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) { |
if ($resourcedata{$courselevelr}) { |
if ($$result{$courselevelr}) { |
return $resourcedata{$courselevelr}; } |
return $$result{$courselevelr}; } |
if ($resourcedata{$courselevelm}) { |
if ($$result{$courselevelm}) { |
return $resourcedata{$courselevelm}; } |
return $$result{$courselevelm}; } |
if ($resourcedata{$courselevel}) { |
if ($$result{$courselevel}) { |
return $resourcedata{$courselevel}; } |
return $$result{$courselevel}; } |
} else { |
} else { |
if ($tmp!~/No such file/) { |
#error 2 occurs when the .db doesn't exist |
|
if ($tmp!~/error: 2 /) { |
&logthis("<font color=blue>WARNING:". |
&logthis("<font color=blue>WARNING:". |
" Trying to get resource data for ". |
" Trying to get resource data for ". |
$uname." at ".$udom.": ". |
$uname." at ".$udom.": ". |
$tmp."</font>"); |
$tmp."</font>"); |
} elsif ($tmp=~/error:No such file/) { |
} elsif ($tmp=~/error: 2 /) { |
$ENV{'cache.studentresdata'}=time; |
&EXT_cache_set($udom,$uname); |
&appenv(('cache.studentresdata'=> |
|
$ENV{'cache.studentresdata'})); |
|
} elsif ($tmp =~ /^(con_lost|no_such_host)/) { |
} elsif ($tmp =~ /^(con_lost|no_such_host)/) { |
return $tmp; |
return $tmp; |
} |
} |
Line 2986 sub EXT {
|
Line 4068 sub EXT {
|
my $filename; |
my $filename; |
if (!$symbparm) { $symbparm=&symbread(); } |
if (!$symbparm) { $symbparm=&symbread(); } |
if ($symbparm) { |
if ($symbparm) { |
$filename=(split(/\_\_\_/,$symbparm))[2]; |
$filename=(&decode_symb($symbparm))[2]; |
} else { |
} else { |
$filename=$ENV{'request.filename'}; |
$filename=$ENV{'request.filename'}; |
} |
} |
Line 2997 sub EXT {
|
Line 4079 sub EXT {
|
|
|
# ------------------------------------------------------------------ Cascade up |
# ------------------------------------------------------------------ Cascade up |
unless ($space eq '0') { |
unless ($space eq '0') { |
my ($part,$id)=split(/\_/,$space); |
my @parts=split(/_/,$space); |
if ($id) { |
my $id=pop(@parts); |
my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest, |
my $part=join('_',@parts); |
$symbparm,$udom,$uname); |
if ($part eq '') { $part='0'; } |
if (defined($partgeneral)) { return $partgeneral; } |
my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest, |
} else { |
$symbparm,$udom,$uname,$section,1); |
my $resourcegeneral=&EXT('resource.0.'.$qualifierrest, |
if (defined($partgeneral)) { return $partgeneral; } |
$symbparm,$udom,$uname); |
|
if (defined($resourcegeneral)) { return $resourcegeneral; } |
|
} |
|
} |
} |
|
if ($recurse) { return undef; } |
|
my $pack_def=&packages_tab_default($filename,$varname); |
|
if (defined($pack_def)) { return $pack_def; } |
|
|
# ---------------------------------------------------- Any other user namespace |
# ---------------------------------------------------- Any other user namespace |
} elsif ($realm eq 'environment') { |
} elsif ($realm eq 'environment') { |
Line 3028 sub EXT {
|
Line 4110 sub EXT {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub packages_tab_default { |
|
my ($uri,$varname)=@_; |
|
my (undef,$part,$name)=split(/\./,$varname); |
|
my $packages=&metadata($uri,'packages'); |
|
foreach my $package (split(/,/,$packages)) { |
|
my ($pack_type,$pack_part)=split(/_/,$package,2); |
|
if (defined($packagetab{"$pack_type&$name&default"})) { |
|
return $packagetab{"$pack_type&$name&default"}; |
|
} |
|
if (defined($packagetab{$pack_type."_".$pack_part."&$name&default"})) { |
|
return $packagetab{$pack_type."_".$pack_part."&$name&default"}; |
|
} |
|
} |
|
return undef; |
|
} |
|
|
|
sub add_prefix_and_part { |
|
my ($prefix,$part)=@_; |
|
my $keyroot; |
|
if (defined($prefix) && $prefix !~ /^__/) { |
|
# prefix that has a part already |
|
$keyroot=$prefix; |
|
} elsif (defined($prefix)) { |
|
# prefix that is missing a part |
|
if (defined($part)) { $keyroot='_'.$part.substr($prefix,1); } |
|
} else { |
|
# no prefix at all |
|
if (defined($part)) { $keyroot='_'.$part; } |
|
} |
|
return $keyroot; |
|
} |
|
|
# ---------------------------------------------------------------- Get metadata |
# ---------------------------------------------------------------- Get metadata |
|
|
sub metadata { |
sub metadata { |
my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
|
|
$uri=&declutter($uri); |
$uri=&declutter($uri); |
# if it is a non metadata possible uri return quickly |
# if it is a non metadata possible uri return quickly |
if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) || |
if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) || |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|)) { |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) || |
return ''; |
($uri =~ m|home/[^/]+/public_html/|)) { |
|
return undef; |
} |
} |
my $filename=$uri; |
my $filename=$uri; |
$uri=~s/\.meta$//; |
$uri=~s/\.meta$//; |
Line 3046 sub metadata {
|
Line 4160 sub metadata {
|
# Look at timestamp of caching |
# Look at timestamp of caching |
# Everything is cached by the main uri, libraries are never directly cached |
# Everything is cached by the main uri, libraries are never directly cached |
# |
# |
unless (abs($metacache{$uri.':cachedtimestamp'}-time)<600 && !defined($liburi)) { |
if (!defined($liburi)) { |
|
my ($result,$cached)=&is_cached(\%metacache,$uri,'meta'); |
|
if (defined($cached)) { return $result->{':'.$what}; } |
|
} |
|
{ |
# |
# |
# Is this a recursive call for a library? |
# Is this a recursive call for a library? |
# |
# |
|
if (! exists($metacache{$uri})) { |
|
$metacache{$uri}={}; |
|
} |
if ($liburi) { |
if ($liburi) { |
$liburi=&declutter($liburi); |
$liburi=&declutter($liburi); |
$filename=$liburi; |
$filename=$liburi; |
} |
} else { |
|
&devalidate_cache(\%metacache,$uri,'meta'); |
|
} |
my %metathesekeys=(); |
my %metathesekeys=(); |
unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
my $metastring=&getfile($perlvar{'lonDocRoot'}.'/res/'.$filename); |
my $metastring; |
|
if ($uri !~ m|^uploaded/|) { |
|
$metastring=&getfile(&filelocation('',&clutter($filename))); |
|
} |
my $parser=HTML::LCParser->new(\$metastring); |
my $parser=HTML::LCParser->new(\$metastring); |
my $token; |
my $token; |
undef %metathesekeys; |
undef %metathesekeys; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
if (defined($token->[2]->{'package'})) { |
if (defined($token->[2]->{'package'})) { |
# |
# |
# This is a package - get package info |
# This is a package - get package info |
# |
# |
my $package=$token->[2]->{'package'}; |
my $package=$token->[2]->{'package'}; |
my $keyroot=''; |
my $keyroot=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
if ($prefix) { |
if (defined($token->[2]->{'id'})) { |
$keyroot.=$prefix; |
$keyroot.='_'.$token->[2]->{'id'}; |
} else { |
} |
if (defined($token->[2]->{'part'})) { |
if ($metacache{$uri}->{':packages'}) { |
$keyroot.='_'.$token->[2]->{'part'}; |
$metacache{$uri}->{':packages'}.=','.$package.$keyroot; |
} |
} else { |
} |
$metacache{$uri}->{':packages'}=$package.$keyroot; |
if (defined($token->[2]->{'id'})) { |
} |
$keyroot.='_'.$token->[2]->{'id'}; |
foreach (keys %packagetab) { |
} |
my $part=$keyroot; |
if ($metacache{$uri.':packages'}) { |
$part=~s/^\_//; |
$metacache{$uri.':packages'}.=','.$package.$keyroot; |
if ($_=~/^\Q$package\E\&/ || |
} else { |
$_=~/^\Q$package\E_0\&/) { |
$metacache{$uri.':packages'}=$package.$keyroot; |
my ($pack,$name,$subp)=split(/\&/,$_); |
} |
# ignore package.tab specified default values |
foreach (keys %packagetab) { |
# here &package_tab_default() will fetch those |
if ($_=~/^$package\&/) { |
if ($subp eq 'default') { next; } |
my ($pack,$name,$subp)=split(/\&/,$_); |
my $value=$packagetab{$_}; |
my $value=$packagetab{$_}; |
my $unikey; |
my $part=$keyroot; |
if ($pack =~ /_0$/) { |
$part=~s/^\_//; |
$unikey='parameter_0_'.$name; |
if ($subp eq 'display') { |
$part=0; |
$value.=' [Part: '.$part.']'; |
} else { |
} |
$unikey='parameter'.$keyroot.'_'.$name; |
my $unikey='parameter'.$keyroot.'_'.$name; |
} |
$metathesekeys{$unikey}=1; |
if ($subp eq 'display') { |
$metacache{$uri.':'.$unikey.'.part'}=$part; |
$value.=' [Part: '.$part.']'; |
unless (defined($metacache{$uri.':'.$unikey.'.'.$subp})) { |
} |
$metacache{$uri.':'.$unikey.'.'.$subp}=$value; |
$metacache{$uri}->{':'.$unikey.'.part'}=$part; |
} |
$metathesekeys{$unikey}=1; |
if (defined($metacache{$uri.':'.$unikey.'.default'})) { |
unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) { |
$metacache{$uri.':'.$unikey}= |
$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value; |
$metacache{$uri.':'.$unikey.'.default'} |
} |
} |
if (defined($metacache{$uri}->{':'.$unikey.'.default'})) { |
} |
$metacache{$uri}->{':'.$unikey}= |
} |
$metacache{$uri}->{':'.$unikey.'.default'}; |
} else { |
} |
|
} |
|
} |
|
} else { |
# |
# |
# This is not a package - some other kind of start tag |
# This is not a package - some other kind of start tag |
# |
# |
my $entry=$token->[1]; |
my $entry=$token->[1]; |
my $unikey; |
my $unikey; |
if ($entry eq 'import') { |
if ($entry eq 'import') { |
$unikey=''; |
$unikey=''; |
} else { |
} else { |
$unikey=$entry; |
$unikey=$entry; |
} |
} |
if ($prefix) { |
$unikey.=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
$unikey.=$prefix; |
|
} else { |
|
if (defined($token->[2]->{'part'})) { |
|
$unikey.='_'.$token->[2]->{'part'}; |
|
} |
|
} |
|
if (defined($token->[2]->{'id'})) { |
|
$unikey.='_'.$token->[2]->{'id'}; |
|
} |
|
|
|
if ($entry eq 'import') { |
if (defined($token->[2]->{'id'})) { |
|
$unikey.='_'.$token->[2]->{'id'}; |
|
} |
|
|
|
if ($entry eq 'import') { |
# |
# |
# Importing a library here |
# Importing a library here |
# |
# |
if ($depthcount<20) { |
if ($depthcount<20) { |
my $location=$parser->get_text('/import'); |
my $location=$parser->get_text('/import'); |
my $dir=$filename; |
my $dir=$filename; |
$dir=~s|[^/]*$||; |
$dir=~s|[^/]*$||; |
$location=&filelocation($dir,$location); |
$location=&filelocation($dir,$location); |
foreach (sort(split(/\,/,&metadata($uri,'keys', |
foreach (sort(split(/\,/,&metadata($uri,'keys', |
$location,$unikey, |
$location,$unikey, |
$depthcount+1)))) { |
$depthcount+1)))) { |
$metathesekeys{$_}=1; |
$metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_}; |
} |
$metathesekeys{$_}=1; |
} |
} |
} else { |
} |
|
} else { |
if (defined($token->[2]->{'name'})) { |
|
$unikey.='_'.$token->[2]->{'name'}; |
if (defined($token->[2]->{'name'})) { |
} |
$unikey.='_'.$token->[2]->{'name'}; |
$metathesekeys{$unikey}=1; |
} |
foreach (@{$token->[3]}) { |
$metathesekeys{$unikey}=1; |
$metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_}; |
foreach (@{$token->[3]}) { |
} |
$metacache{$uri}->{':'.$unikey.'.'.$_}=$token->[2]->{$_}; |
my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry)); |
} |
my $default=$metacache{$uri.':'.$unikey.'.default'}; |
my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry)); |
if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) { |
my $default=$metacache{$uri}->{':'.$unikey.'.default'}; |
# only ws inside the tag, and not in default, so use default |
if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) { |
# as value |
# only ws inside the tag, and not in default, so use default |
$metacache{$uri.':'.$unikey}=$default; |
# as value |
} else { |
$metacache{$uri}->{':'.$unikey}=$default; |
|
} else { |
# either something interesting inside the tag or default |
# either something interesting inside the tag or default |
# uninteresting |
# uninteresting |
$metacache{$uri.':'.$unikey}=$internaltext; |
$metacache{$uri}->{':'.$unikey}=$internaltext; |
} |
} |
# end of not-a-package not-a-library import |
# end of not-a-package not-a-library import |
} |
} |
# end of not-a-package start tag |
# end of not-a-package start tag |
} |
} |
# the next is the end of "start tag" |
# the next is the end of "start tag" |
} |
} |
} |
} |
$metacache{$uri.':keys'}=join(',',keys %metathesekeys); |
my ($extension) = ($uri =~ /\.(\w+)$/); |
&metadata_generate_part0(\%metathesekeys,\%metacache,$uri); |
foreach my $key (sort(keys(%packagetab))) { |
$metacache{$uri.':allpossiblekeys'}=join(',',keys %metathesekeys); |
#&logthis("extsion1 $extension $key !!"); |
$metacache{$uri.':cachedtimestamp'}=time; |
#no specific packages #how's our extension |
|
if ($key!~/^extension_\Q$extension\E&/) { next; } |
|
&metadata_create_package_def($uri,$key,'extension_'.$extension, |
|
\%metathesekeys); |
|
} |
|
if (!exists($metacache{$uri}->{':packages'})) { |
|
foreach my $key (sort(keys(%packagetab))) { |
|
#no specific packages well let's get default then |
|
if ($key!~/^default&/) { next; } |
|
&metadata_create_package_def($uri,$key,'default', |
|
\%metathesekeys); |
|
} |
|
} |
|
# are there custom rights to evaluate |
|
if ($metacache{$uri}->{':copyright'} eq 'custom') { |
|
|
|
# |
|
# Importing a rights file here |
|
# |
|
unless ($depthcount) { |
|
my $location=$metacache{$uri}->{':customdistributionfile'}; |
|
my $dir=$filename; |
|
$dir=~s|[^/]*$||; |
|
$location=&filelocation($dir,$location); |
|
foreach (sort(split(/\,/,&metadata($uri,'keys', |
|
$location,'_rights', |
|
$depthcount+1)))) { |
|
$metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_}; |
|
$metathesekeys{$_}=1; |
|
} |
|
} |
|
} |
|
$metacache{$uri}->{':keys'}=join(',',keys %metathesekeys); |
|
&metadata_generate_part0(\%metathesekeys,$metacache{$uri},$uri); |
|
$metacache{$uri}->{':allpossiblekeys'}=join(',',keys %metathesekeys); |
|
&do_cache(\%metacache,$uri,$metacache{$uri},'meta'); |
# this is the end of "was not already recently cached |
# this is the end of "was not already recently cached |
} |
} |
return $metacache{$uri.':'.$what}; |
return $metacache{$uri}->{':'.$what}; |
|
} |
|
|
|
sub metadata_create_package_def { |
|
my ($uri,$key,$package,$metathesekeys)=@_; |
|
my ($pack,$name,$subp)=split(/\&/,$key); |
|
if ($subp eq 'default') { next; } |
|
|
|
if (defined($metacache{$uri}->{':packages'})) { |
|
$metacache{$uri}->{':packages'}.=','.$package; |
|
} else { |
|
$metacache{$uri}->{':packages'}=$package; |
|
} |
|
my $value=$packagetab{$key}; |
|
my $unikey; |
|
$unikey='parameter_0_'.$name; |
|
$metacache{$uri}->{':'.$unikey.'.part'}=0; |
|
$$metathesekeys{$unikey}=1; |
|
unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) { |
|
$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value; |
|
} |
|
if (defined($metacache{$uri}->{':'.$unikey.'.default'})) { |
|
$metacache{$uri}->{':'.$unikey}= |
|
$metacache{$uri}->{':'.$unikey.'.default'}; |
|
} |
} |
} |
|
|
sub metadata_generate_part0 { |
sub metadata_generate_part0 { |
Line 3182 sub metadata_generate_part0 {
|
Line 4366 sub metadata_generate_part0 {
|
my %allnames; |
my %allnames; |
foreach my $metakey (sort keys %$metadata) { |
foreach my $metakey (sort keys %$metadata) { |
if ($metakey=~/^parameter\_(.*)/) { |
if ($metakey=~/^parameter\_(.*)/) { |
my $part=$$metacache{$uri.':'.$metakey.'.part'}; |
my $part=$$metacache{':'.$metakey.'.part'}; |
my $name=$$metacache{$uri.':'.$metakey.'.name'}; |
my $name=$$metacache{':'.$metakey.'.name'}; |
if (! exists($$metadata{'parameter_0_'.$name})) { |
if (! exists($$metadata{'parameter_0_'.$name.'.name'})) { |
$allnames{$name}=$part; |
$allnames{$name}=$part; |
} |
} |
} |
} |
} |
} |
foreach my $name (keys(%allnames)) { |
foreach my $name (keys(%allnames)) { |
$$metadata{"parameter_0_$name"}=1; |
$$metadata{"parameter_0_$name"}=1; |
my $key="$uri:parameter_0_$name"; |
my $key=":parameter_0_$name"; |
$$metacache{"$key.part"}='0'; |
$$metacache{"$key.part"}='0'; |
$$metacache{"$key.name"}=$name; |
$$metacache{"$key.name"}=$name; |
$$metacache{"$key.type"}=$$metacache{$uri.':parameter_'. |
$$metacache{"$key.type"}=$$metacache{':parameter_'. |
$allnames{$name}.'_'.$name. |
$allnames{$name}.'_'.$name. |
'.type'}; |
'.type'}; |
my $olddis=$$metacache{$uri.':parameter_'.$allnames{$name}.'_'.$name. |
my $olddis=$$metacache{':parameter_'.$allnames{$name}.'_'.$name. |
'.display'}; |
'.display'}; |
my $expr='\\[Part: '.$allnames{$name}.'\\]'; |
my $expr='\\[Part: '.$allnames{$name}.'\\]'; |
$olddis=~s/$expr/\[Part: 0\]/; |
$olddis=~s/\Q$expr\E/\[Part: 0\]/; |
$$metacache{"$key.display"}=$olddis; |
$$metacache{"$key.display"}=$olddis; |
} |
} |
} |
} |
Line 3214 sub gettitle {
|
Line 4398 sub gettitle {
|
unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; } |
unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; } |
return &metadata($urlsymb,'title'); |
return &metadata($urlsymb,'title'); |
} |
} |
if ($titlecache{$symb}) { return $titlecache{$symb}; } |
my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600); |
my ($map,$resid,$url)=split(/\_\_\_/,$symb); |
if (defined($cached)) { return $result; } |
|
my ($map,$resid,$url)=&decode_symb($symb); |
my $title=''; |
my $title=''; |
my %bighash; |
my %bighash; |
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
Line 3224 sub gettitle {
|
Line 4409 sub gettitle {
|
$title=$bighash{'title_'.$mapid.'.'.$resid}; |
$title=$bighash{'title_'.$mapid.'.'.$resid}; |
untie %bighash; |
untie %bighash; |
} |
} |
|
$title=~s/\&colon\;/\:/gs; |
if ($title) { |
if ($title) { |
$titlecache{$symb}=$title; |
return &do_cache(\%titlecache,$symb,$title,'title'); |
return $title; |
|
} else { |
} else { |
return &metadata($urlsymb,'title'); |
return &metadata($urlsymb,'title'); |
} |
} |
Line 3236 sub gettitle {
|
Line 4421 sub gettitle {
|
|
|
sub symblist { |
sub symblist { |
my ($mapname,%newhash)=@_; |
my ($mapname,%newhash)=@_; |
$mapname=declutter($mapname); |
$mapname=&deversion(&declutter($mapname)); |
my %hash; |
my %hash; |
if (($ENV{'request.course.fn'}) && (%newhash)) { |
if (($ENV{'request.course.fn'}) && (%newhash)) { |
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', |
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', |
&GDBM_WRCREAT(),0640)) { |
&GDBM_WRCREAT(),0640)) { |
foreach (keys %newhash) { |
foreach (keys %newhash) { |
$hash{declutter($_)}=$mapname.'___'.$newhash{$_}; |
$hash{declutter($_)}=$mapname.'___'.&deversion($newhash{$_}); |
} |
} |
if (untie(%hash)) { |
if (untie(%hash)) { |
return 'ok'; |
return 'ok'; |
Line 3255 sub symblist {
|
Line 4440 sub symblist {
|
# --------------------------------------------------------------- Verify a symb |
# --------------------------------------------------------------- Verify a symb |
|
|
sub symbverify { |
sub symbverify { |
my ($symb,$thisfn)=@_; |
my ($symb,$thisurl)=@_; |
|
my $thisfn=$thisurl; |
|
# wrapper not part of symbs |
|
$thisfn=~s/^\/adm\/wrapper//; |
$thisfn=&declutter($thisfn); |
$thisfn=&declutter($thisfn); |
# direct jump to resource in page or to a sequence - will construct own symbs |
# direct jump to resource in page or to a sequence - will construct own symbs |
if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
# check URL part |
# check URL part |
my ($map,$resid,$url)=split(/\_\_\_/,$symb); |
my ($map,$resid,$url)=&decode_symb($symb); |
unless (&symbclean($url) eq &symbclean($thisfn)) { return 0; } |
|
|
unless ($url eq $thisfn) { return 0; } |
|
|
$symb=&symbclean($symb); |
$symb=&symbclean($symb); |
|
$thisurl=&deversion($thisurl); |
|
$thisfn=&deversion($thisfn); |
|
|
my %bighash; |
my %bighash; |
my $okay=0; |
my $okay=0; |
|
|
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
&GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
my $ids=$bighash{'ids_'.&clutter($thisfn)}; |
my $ids=$bighash{'ids_'.&clutter($thisurl)}; |
unless ($ids) { |
unless ($ids) { |
$ids=$bighash{'ids_/'.$thisfn}; |
$ids=$bighash{'ids_/'.$thisurl}; |
} |
} |
if ($ids) { |
if ($ids) { |
# ------------------------------------------------------------------- Has ID(s) |
# ------------------------------------------------------------------- Has ID(s) |
Line 3300 sub symbclean {
|
Line 4492 sub symbclean {
|
# remove version from URL |
# remove version from URL |
$symb=~s/\.(\d+)\.(\w+)$/\.$2/; |
$symb=~s/\.(\d+)\.(\w+)$/\.$2/; |
|
|
|
# remove wrapper |
|
|
|
$symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/; |
return $symb; |
return $symb; |
} |
} |
|
|
|
# ---------------------------------------------- Split symb to find map and url |
|
|
|
sub encode_symb { |
|
my ($map,$resid,$url)=@_; |
|
return &symbclean(&declutter($map).'___'.$resid.'___'.&declutter($url)); |
|
} |
|
|
|
sub decode_symb { |
|
my ($map,$resid,$url)=split(/\_\_\_/,shift); |
|
return (&fixversion($map),$resid,&fixversion($url)); |
|
} |
|
|
|
sub fixversion { |
|
my $fn=shift; |
|
if ($fn=~/^(adm|uploaded|public)/) { return $fn; } |
|
my %bighash; |
|
my $uri=&clutter($fn); |
|
my $key=$ENV{'request.course.id'}.'_'.$uri; |
|
# is this cached? |
|
my ($result,$cached)=&is_cached(\%courseresversioncache,$key, |
|
'courseresversion',600); |
|
if (defined($cached)) { return $result; } |
|
# unfortunately not cached, or expired |
|
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
|
&GDBM_READER(),0640)) { |
|
if ($bighash{'version_'.$uri}) { |
|
my $version=$bighash{'version_'.$uri}; |
|
unless (($version eq 'mostrecent') || |
|
($version==&getversion($uri))) { |
|
$uri=~s/\.(\w+)$/\.$version\.$1/; |
|
} |
|
} |
|
untie %bighash; |
|
} |
|
return &do_cache |
|
(\%courseresversioncache,$key,&declutter($uri),'courseresversion'); |
|
} |
|
|
|
sub deversion { |
|
my $url=shift; |
|
$url=~s/\.\d+\.(\w+)$/\.$1/; |
|
return $url; |
|
} |
|
|
# ------------------------------------------------------ Return symb list entry |
# ------------------------------------------------------ Return symb list entry |
|
|
sub symbread { |
sub symbread { |
Line 3321 sub symbread {
|
Line 4560 sub symbread {
|
my %bighash; |
my %bighash; |
my $syval=''; |
my $syval=''; |
if (($ENV{'request.course.fn'}) && ($thisfn)) { |
if (($ENV{'request.course.fn'}) && ($thisfn)) { |
|
my $targetfn = $thisfn; |
|
if ( ($thisfn =~ m/^uploaded\//) && ($thisfn !~ m/\.(page|sequence)$/) ) { |
|
$targetfn = 'adm/wrapper/'.$thisfn; |
|
} |
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', |
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', |
&GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
$syval=$hash{$thisfn}; |
$syval=$hash{$targetfn}; |
untie(%hash); |
untie(%hash); |
} |
} |
# ---------------------------------------------------------- There was an entry |
# ---------------------------------------------------------- There was an entry |
Line 3375 sub symbread {
|
Line 4618 sub symbread {
|
} |
} |
} |
} |
untie(%bighash) |
untie(%bighash) |
} |
} |
} |
} |
if ($syval) { |
if ($syval) { |
return &symbclean($syval.'___'.$thisfn); |
return &symbclean($syval.'___'.$thisfn); |
Line 3397 sub numval {
|
Line 4640 sub numval {
|
$txt=~tr/u-z/0-5/; |
$txt=~tr/u-z/0-5/; |
$txt=~s/\D//g; |
$txt=~s/\D//g; |
return int($txt); |
return int($txt); |
} |
} |
|
|
|
sub numval2 { |
|
my $txt=shift; |
|
$txt=~tr/A-J/0-9/; |
|
$txt=~tr/a-j/0-9/; |
|
$txt=~tr/K-T/0-9/; |
|
$txt=~tr/k-t/0-9/; |
|
$txt=~tr/U-Z/0-5/; |
|
$txt=~tr/u-z/0-5/; |
|
$txt=~s/\D//g; |
|
my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt); |
|
my $total; |
|
foreach my $val (@txts) { $total+=$val; } |
|
return int($total); |
|
} |
|
|
|
sub latest_rnd_algorithm_id { |
|
return '64bit3'; |
|
} |
|
|
|
sub get_rand_alg { |
|
my ($courseid)=@_; |
|
if (!$courseid) { $courseid=(&Apache::lonxml::whichuser())[1]; } |
|
if ($courseid) { |
|
return $ENV{"course.$courseid.rndseed"}; |
|
} |
|
return &latest_rnd_algorithm_id(); |
|
} |
|
|
|
sub getCODE { |
|
if (defined($ENV{'form.CODE'})) { return $ENV{'form.CODE'}; } |
|
if (defined($Apache::lonhomework::parsing_a_problem) && |
|
defined($Apache::lonhomework::history{'resource.CODE'})) { |
|
return $Apache::lonhomework::history{'resource.CODE'}; |
|
} |
|
return undef; |
|
} |
|
|
sub rndseed { |
sub rndseed { |
my ($symb,$courseid,$domain,$username)=@_; |
my ($symb,$courseid,$domain,$username)=@_; |
|
|
|
my ($wsymb,$wcourseid,$wdomain,$wusername)=&Apache::lonxml::whichuser(); |
if (!$symb) { |
if (!$symb) { |
unless ($symb=&symbread()) { return time; } |
unless ($symb=$wsymb) { return time; } |
|
} |
|
if (!$courseid) { $courseid=$wcourseid; } |
|
if (!$domain) { $domain=$wdomain; } |
|
if (!$username) { $username=$wusername } |
|
my $which=&get_rand_alg(); |
|
if (defined(&getCODE())) { |
|
return &rndseed_CODE_64bit($symb,$courseid,$domain,$username); |
|
} elsif ($which eq '64bit3') { |
|
return &rndseed_64bit3($symb,$courseid,$domain,$username); |
|
} elsif ($which eq '64bit2') { |
|
return &rndseed_64bit2($symb,$courseid,$domain,$username); |
|
} elsif ($which eq '64bit') { |
|
return &rndseed_64bit($symb,$courseid,$domain,$username); |
} |
} |
if (!$courseid) { $courseid=$ENV{'request.course.id'};} |
return &rndseed_32bit($symb,$courseid,$domain,$username); |
if (!$domain) {$domain=$ENV{'user.domain'};} |
} |
if (!$username) {$username=$ENV{'user.name'};} |
|
|
sub rndseed_32bit { |
|
my ($symb,$courseid,$domain,$username)=@_; |
{ |
{ |
use integer; |
use integer; |
my $symbchck=unpack("%32C*",$symb) << 27; |
my $symbchck=unpack("%32C*",$symb) << 27; |
my $symbseed=numval($symb) << 22; |
my $symbseed=numval($symb) << 22; |
my $namechck=unpack("%32C*",$username) << 17; |
my $namechck=unpack("%32C*",$username) << 17; |
my $nameseed=numval($username) << 12; |
my $nameseed=numval($username) << 12; |
my $domainseed=unpack("%32C*",$domain) << 7; |
my $domainseed=unpack("%32C*",$domain) << 7; |
my $courseseed=unpack("%32C*",$courseid); |
my $courseseed=unpack("%32C*",$courseid); |
my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck; |
my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck; |
#uncommenting these lines can break things! |
#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&Apache::lonxml::debug("rndseed :$num:$symb"); |
#&Apache::lonxml::debug("rndseed :$num:$symb"); |
return $num; |
return $num; |
} |
|
} |
|
|
|
sub rndseed_64bit { |
|
my ($symb,$courseid,$domain,$username)=@_; |
|
{ |
|
use integer; |
|
my $symbchck=unpack("%32S*",$symb) << 21; |
|
my $symbseed=numval($symb) << 10; |
|
my $namechck=unpack("%32S*",$username); |
|
|
|
my $nameseed=numval($username) << 21; |
|
my $domainseed=unpack("%32S*",$domain) << 10; |
|
my $courseseed=unpack("%32S*",$courseid); |
|
|
|
my $num1=$symbchck+$symbseed+$namechck; |
|
my $num2=$nameseed+$domainseed+$courseseed; |
|
#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
|
#&Apache::lonxml::debug("rndseed :$num:$symb"); |
|
return "$num1,$num2"; |
|
} |
|
} |
|
|
|
sub rndseed_64bit2 { |
|
my ($symb,$courseid,$domain,$username)=@_; |
|
{ |
|
use integer; |
|
# strings need to be an even # of cahracters long, it it is odd the |
|
# last characters gets thrown away |
|
my $symbchck=unpack("%32S*",$symb.' ') << 21; |
|
my $symbseed=numval($symb) << 10; |
|
my $namechck=unpack("%32S*",$username.' '); |
|
|
|
my $nameseed=numval($username) << 21; |
|
my $domainseed=unpack("%32S*",$domain.' ') << 10; |
|
my $courseseed=unpack("%32S*",$courseid.' '); |
|
|
|
my $num1=$symbchck+$symbseed+$namechck; |
|
my $num2=$nameseed+$domainseed+$courseseed; |
|
#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
|
#&Apache::lonxml::debug("rndseed :$num:$symb"); |
|
return "$num1,$num2"; |
|
} |
|
} |
|
|
|
sub rndseed_64bit3 { |
|
my ($symb,$courseid,$domain,$username)=@_; |
|
{ |
|
use integer; |
|
# strings need to be an even # of cahracters long, it it is odd the |
|
# last characters gets thrown away |
|
my $symbchck=unpack("%32S*",$symb.' ') << 21; |
|
my $symbseed=numval2($symb) << 10; |
|
my $namechck=unpack("%32S*",$username.' '); |
|
|
|
my $nameseed=numval2($username) << 21; |
|
my $domainseed=unpack("%32S*",$domain.' ') << 10; |
|
my $courseseed=unpack("%32S*",$courseid.' '); |
|
|
|
my $num1=$symbchck+$symbseed+$namechck; |
|
my $num2=$nameseed+$domainseed+$courseseed; |
|
#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
|
#&Apache::lonxml::debug("rndseed :$num:$symb"); |
|
return "$num1:$num2"; |
|
} |
|
} |
|
|
|
sub rndseed_CODE_64bit { |
|
my ($symb,$courseid,$domain,$username)=@_; |
|
{ |
|
use integer; |
|
my $symbchck=unpack("%32S*",$symb.' ') << 16; |
|
my $symbseed=numval2($symb); |
|
my $CODEchck=unpack("%32S*",&getCODE().' ') << 16; |
|
my $CODEseed=numval(&getCODE()); |
|
my $courseseed=unpack("%32S*",$courseid.' '); |
|
my $num1=$symbseed+$CODEchck; |
|
my $num2=$CODEseed+$courseseed+$symbchck; |
|
#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck"); |
|
#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb"); |
|
return "$num1:$num2"; |
|
} |
|
} |
|
|
|
sub setup_random_from_rndseed { |
|
my ($rndseed)=@_; |
|
if ($rndseed =~/([,:])/) { |
|
my ($num1,$num2)=split(/[,:]/,$rndseed); |
|
&Math::Random::random_set_seed(abs($num1),abs($num2)); |
|
} else { |
|
&Math::Random::random_set_seed_from_phrase($rndseed); |
} |
} |
} |
} |
|
|
|
sub latest_receipt_algorithm_id { |
|
return 'receipt2'; |
|
} |
|
|
|
sub recunique { |
|
my $fucourseid=shift; |
|
my $unique; |
|
if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') { |
|
$unique=$ENV{"course.$fucourseid.internal.encseed"}; |
|
} else { |
|
$unique=$perlvar{'lonReceipt'}; |
|
} |
|
return unpack("%32C*",$unique); |
|
} |
|
|
|
sub recprefix { |
|
my $fucourseid=shift; |
|
my $prefix; |
|
if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') { |
|
$prefix=$ENV{"course.$fucourseid.internal.encpref"}; |
|
} else { |
|
$prefix=$perlvar{'lonHostID'}; |
|
} |
|
return unpack("%32C*",$prefix); |
|
} |
|
|
sub ireceipt { |
sub ireceipt { |
my ($funame,$fudom,$fucourseid,$fusymb)=@_; |
my ($funame,$fudom,$fucourseid,$fusymb,$part)=@_; |
my $cuname=unpack("%32C*",$funame); |
my $cuname=unpack("%32C*",$funame); |
my $cudom=unpack("%32C*",$fudom); |
my $cudom=unpack("%32C*",$fudom); |
my $cucourseid=unpack("%32C*",$fucourseid); |
my $cucourseid=unpack("%32C*",$fucourseid); |
my $cusymb=unpack("%32C*",$fusymb); |
my $cusymb=unpack("%32C*",$fusymb); |
my $cunique=unpack("%32C*",$perlvar{'lonReceipt'}); |
my $cunique=&recunique($fucourseid); |
return unpack("%32C*",$perlvar{'lonHostID'}).'-'. |
my $cpart=unpack("%32S*",$part); |
($cunique%$cuname+ |
my $return =&recprefix($fucourseid).'-'; |
$cunique%$cudom+ |
if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2' || |
$cusymb%$cuname+ |
$ENV{'request.state'} eq 'construct') { |
$cusymb%$cudom+ |
&Apache::lonxml::debug("doing receipt2 using parts $cpart, uname $cuname and udom $cudom gets ".($cpart%$cuname). |
$cucourseid%$cuname+ |
" and ".($cpart%$cudom)); |
$cucourseid%$cudom); |
|
|
$return.= ($cunique%$cuname+ |
|
$cunique%$cudom+ |
|
$cusymb%$cuname+ |
|
$cusymb%$cudom+ |
|
$cucourseid%$cuname+ |
|
$cucourseid%$cudom+ |
|
$cpart%$cuname+ |
|
$cpart%$cudom); |
|
} else { |
|
$return.= ($cunique%$cuname+ |
|
$cunique%$cudom+ |
|
$cusymb%$cuname+ |
|
$cusymb%$cudom+ |
|
$cucourseid%$cuname+ |
|
$cucourseid%$cudom); |
|
} |
|
return $return; |
} |
} |
|
|
sub receipt { |
sub receipt { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($part)=@_; |
return &ireceipt($name,$domain,$courseid,$symb); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
|
return &ireceipt($name,$domain,$courseid,$symb,$part); |
} |
} |
|
|
# ------------------------------------------------------------ Serves up a file |
# ------------------------------------------------------------ Serves up a file |
# returns either the contents of the file or a -1 |
# returns either the contents of the file or |
|
# -1 if the file doesn't exist |
|
# |
|
# if the target is a file that was uploaded via DOCS, |
|
# a check will be made to see if a current copy exists on the local server, |
|
# if it does this will be served, otherwise a copy will be retrieved from |
|
# the home server for the course and stored in /home/httpd/html/userfiles on |
|
# the local server. |
|
|
sub getfile { |
sub getfile { |
my $file=shift; |
my ($file,$caller) = @_; |
if ($file=~/^\/*uploaded\//) { # user file |
|
|
if ($file !~ m|^/*uploaded/(\w+)/(\w+)/(.+)$|) { |
|
# normal file from res space |
|
&repcopy($file); |
|
return &readfile($file); |
|
} |
|
|
|
my $info; |
|
my $cdom = $1; |
|
my $cnum = $2; |
|
my $filename = $3; |
|
my $path = $Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles'; |
|
my ($lwpresp,$rtncode); |
|
my $localfile = $path.'/'.$cdom.'/'.$cnum.'/'.$filename; |
|
if (-e "$localfile") { |
|
my @fileinfo = stat($localfile); |
|
$lwpresp = &getuploaded('HEAD',$file,$cdom,$cnum,\$info,\$rtncode); |
|
if ($lwpresp ne 'ok') { |
|
if ($rtncode eq '404') { |
|
unlink($localfile); |
|
} |
|
#my $ua=new LWP::UserAgent; |
|
#my $request=new HTTP::Request('GET',&tokenwrapper($file)); |
|
#my $response=$ua->request($request); |
|
#if ($response->is_success()) { |
|
# return $response->content; |
|
# } else { |
|
# return -1; |
|
# } |
|
return -1; |
|
} |
|
if ($info < $fileinfo[9]) { |
|
return &readfile($localfile); |
|
} |
|
$info = ''; |
|
$lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode); |
|
if ($lwpresp ne 'ok') { |
|
return -1; |
|
} |
|
} else { |
|
$lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode); |
|
if ($lwpresp ne 'ok') { |
|
my $ua=new LWP::UserAgent; |
|
my $request=new HTTP::Request('GET',&tokenwrapper($file)); |
|
my $response=$ua->request($request); |
|
if ($response->is_success()) { |
|
return $response->content; |
|
} else { |
|
return -1; |
|
} |
|
} |
|
my @parts = ($cdom,$cnum); |
|
if ($filename =~ m|^(.+)/[^/]+$|) { |
|
push @parts, split(/\//,$1); |
|
} |
|
foreach my $part (@parts) { |
|
$path .= '/'.$part; |
|
if (!-e $path) { |
|
mkdir($path,0770); |
|
} |
|
} |
|
} |
|
open (FILE,">$localfile"); |
|
print FILE $info; |
|
close(FILE); |
|
if ($caller eq 'uploadrep') { |
|
return 'ok'; |
|
} |
|
return $info; |
|
} |
|
|
|
sub tokenwrapper { |
|
my $uri=shift; |
|
$uri=~s/^http\:\/\/([^\/]+)//; |
|
$uri=~s/^\///; |
|
$ENV{'user.environment'}=~/\/([^\/]+)\.id/; |
|
my $token=$1; |
|
if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) { |
|
&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'}); |
|
return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri. |
|
(($uri=~/\?/)?'&':'?').'token='.$token. |
|
'&tokenissued='.$perlvar{'lonHostID'}; |
|
} else { |
|
return '/adm/notfound.html'; |
|
} |
|
} |
|
|
|
sub getuploaded { |
|
my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_; |
|
$uri=~s/^\///; |
|
$uri = 'http://'.$hostname{ &homeserver($cnum,$cdom)}.'/raw/'.$uri; |
my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
my $request=new HTTP::Request('GET',&tokenwrapper($file)); |
my $request=new HTTP::Request($reqtype,$uri); |
my $response=$ua->request($request); |
my $response=$ua->request($request); |
if ($response->is_success()) { |
$$rtncode = $response->code; |
return $response->content; |
if (! $response->is_success()) { |
} else { |
return 'failed'; |
return -1; |
} |
} |
if ($reqtype eq 'HEAD') { |
} else { # normal file from res space |
$$info = &HTTP::Date::str2time( $response->header('Last-modified') ); |
&repcopy($file); |
} elsif ($reqtype eq 'GET') { |
if (! -e $file ) { return -1; }; |
$$info = $response->content; |
my $fh=Apache::File->new($file); |
} |
my $a=''; |
return 'ok'; |
while (<$fh>) { $a .=$_; } |
} |
return $a; |
|
} |
sub readfile { |
|
my $file = shift; |
|
if ( (! -e $file ) || ($file eq '') ) { return -1; }; |
|
my $fh; |
|
open($fh,"<$file"); |
|
my $a=''; |
|
while (<$fh>) { $a .=$_; } |
|
return $a; |
} |
} |
|
|
sub filelocation { |
sub filelocation { |
Line 3477 sub filelocation {
|
Line 5013 sub filelocation {
|
} elsif ($file=~/^\/*uploaded/) { # is an uploaded file |
} elsif ($file=~/^\/*uploaded/) { # is an uploaded file |
$location=$file; |
$location=$file; |
} else { |
} else { |
$file=~s/^$perlvar{'lonDocRoot'}//; |
$file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$file=~s:^/*res::; |
$file=~s:^/res/:/:; |
if ( !( $file =~ m:^/:) ) { |
if ( !( $file =~ m:^/:) ) { |
$location = $dir. '/'.$file; |
$location = $dir. '/'.$file; |
} else { |
} else { |
Line 3487 sub filelocation {
|
Line 5023 sub filelocation {
|
} |
} |
$location=~s://+:/:g; # remove duplicate / |
$location=~s://+:/:g; # remove duplicate / |
while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/.. |
while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/.. |
|
while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./ |
return $location; |
return $location; |
} |
} |
|
|
sub hreflocation { |
sub hreflocation { |
my ($dir,$file)=@_; |
my ($dir,$file)=@_; |
unless (($file=~/^http:\/\//i) || ($file=~/^\//)) { |
unless (($file=~m-^http://-i) || ($file=~m-^/-)) { |
my $finalpath=filelocation($dir,$file); |
my $finalpath=filelocation($dir,$file); |
$finalpath=~s/^\/home\/httpd\/html//; |
$finalpath=~s-^/home/httpd/html--; |
$finalpath=~s-/home/(\w+)/public_html/-/~$1/-; |
$finalpath=~s-^/home/(\w+)/public_html/-/~$1/-; |
return $finalpath; |
return $finalpath; |
} else { |
} elsif ($file=~m-^/home-) { |
return $file; |
$file=~s-^/home/httpd/html--; |
|
$file=~s-^/home/(\w+)/public_html/-/~$1/-; |
|
return $file; |
|
} |
|
return $file; |
|
} |
|
|
|
sub current_machine_domains { |
|
my $hostname=$hostname{$perlvar{'lonHostID'}}; |
|
my @domains; |
|
while( my($id, $name) = each(%hostname)) { |
|
# &logthis("-$id-$name-$hostname-"); |
|
if ($hostname eq $name) { |
|
push(@domains,$hostdom{$id}); |
|
} |
} |
} |
|
return @domains; |
|
} |
|
|
|
sub current_machine_ids { |
|
my $hostname=$hostname{$perlvar{'lonHostID'}}; |
|
my @ids; |
|
while( my($id, $name) = each(%hostname)) { |
|
# &logthis("-$id-$name-$hostname-"); |
|
if ($hostname eq $name) { |
|
push(@ids,$id); |
|
} |
|
} |
|
return @ids; |
} |
} |
|
|
# ------------------------------------------------------------- Declutters URLs |
# ------------------------------------------------------------- Declutters URLs |
|
|
sub declutter { |
sub declutter { |
my $thisfn=shift; |
my $thisfn=shift; |
$thisfn=~s/^$perlvar{'lonDocRoot'}//; |
$thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$thisfn=~s/^\///; |
$thisfn=~s/^\///; |
$thisfn=~s/^res\///; |
$thisfn=~s/^res\///; |
$thisfn=~s/\?.+$//; |
$thisfn=~s/\?.+$//; |
Line 3517 sub declutter {
|
Line 5081 sub declutter {
|
|
|
sub clutter { |
sub clutter { |
my $thisfn='/'.&declutter(shift); |
my $thisfn='/'.&declutter(shift); |
unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv)\//) { |
unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv|public)\//) { |
$thisfn='/res'.$thisfn; |
$thisfn='/res'.$thisfn; |
} |
} |
return $thisfn; |
return $thisfn; |
Line 3539 sub unescape {
|
Line 5103 sub unescape {
|
return $str; |
return $str; |
} |
} |
|
|
|
sub mod_perl_version { |
|
if (defined($perlvar{'MODPERL2'})) { |
|
return 2; |
|
} |
|
return 1; |
|
} |
|
|
|
sub correct_line_ends { |
|
my ($result)=@_; |
|
$$result =~s/\r\n/\n/mg; |
|
$$result =~s/\r/\n/mg; |
|
} |
# ================================================================ Main Program |
# ================================================================ Main Program |
|
|
sub goodbye { |
sub goodbye { |
&logthis("Starting Shut down"); |
&logthis("Starting Shut down"); |
|
#not converted to using infrastruture and probably shouldn't be |
|
&logthis(sprintf("%-20s is %s",'%badServerCache',scalar(%badServerCache))); |
|
#converted |
|
&logthis(sprintf("%-20s is %s",'%metacache',scalar(%metacache))); |
|
&logthis(sprintf("%-20s is %s",'%homecache',scalar(%homecache))); |
|
&logthis(sprintf("%-20s is %s",'%titlecache',scalar(%titlecache))); |
|
&logthis(sprintf("%-20s is %s",'%courseresdatacache',scalar(%courseresdatacache))); |
|
#1.1 only |
|
&logthis(sprintf("%-20s is %s",'%userresdatacache',scalar(%userresdatacache))); |
|
&logthis(sprintf("%-20s is %s",'%usectioncache',scalar(%usectioncache))); |
|
&logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache))); |
|
&logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache))); |
&flushcourselogs(); |
&flushcourselogs(); |
&logthis("Shutting down"); |
&logthis("Shutting down"); |
|
return DONE; |
} |
} |
|
|
BEGIN { |
BEGIN { |
# ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
# ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
unless ($readit) { |
unless ($readit) { |
{ |
{ |
my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf"); |
open(my $config,"</etc/httpd/conf/loncapa.conf"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
if ($configline =~ /^[^\#]*PerlSetVar/) { |
if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) { |
my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); |
my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); |
chomp($varvalue); |
chomp($varvalue); |
$perlvar{$varname}=$varvalue; |
$perlvar{$varname}=$varvalue; |
} |
} |
} |
} |
|
close($config); |
} |
} |
{ |
{ |
my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf"); |
open(my $config,"</etc/httpd/conf/loncapa_apache.conf"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
if ($configline =~ /^[^\#]*PerlSetVar/) { |
if ($configline =~ /^[^\#]*PerlSetVar/) { |
Line 3571 BEGIN {
|
Line 5161 BEGIN {
|
$perlvar{$varname}=$varvalue; |
$perlvar{$varname}=$varvalue; |
} |
} |
} |
} |
|
close($config); |
} |
} |
|
|
# ------------------------------------------------------------ Read domain file |
# ------------------------------------------------------------ Read domain file |
{ |
{ |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. |
|
'/domain.tab'); |
|
%domaindescription = (); |
%domaindescription = (); |
%domain_auth_def = (); |
%domain_auth_def = (); |
%domain_auth_arg_def = (); |
%domain_auth_arg_def = (); |
if ($fh) { |
my $fh; |
|
if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) { |
while (<$fh>) { |
while (<$fh>) { |
next if /^\#/; |
next if (/^(\#|\s*$)/); |
|
# next if /^\#/; |
chomp; |
chomp; |
my ($domain, $domain_description, $def_auth, $def_auth_arg) |
my ($domain, $domain_description, $def_auth, $def_auth_arg, |
= split(/:/,$_,4); |
$def_lang, $city, $longi, $lati) = split(/:/,$_); |
$domain_auth_def{$domain}=$def_auth; |
$domain_auth_def{$domain}=$def_auth; |
$domain_auth_arg_def{$domain}=$def_auth_arg; |
$domain_auth_arg_def{$domain}=$def_auth_arg; |
$domaindescription{$domain}=$domain_description; |
$domaindescription{$domain}=$domain_description; |
# &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}"); |
$domain_lang_def{$domain}=$def_lang; |
|
$domain_city{$domain}=$city; |
|
$domain_longi{$domain}=$longi; |
|
$domain_lati{$domain}=$lati; |
|
|
|
# &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}"); |
# &logthis("Domain.tab: $domain ".$domaindescription{$domain} ); |
# &logthis("Domain.tab: $domain ".$domaindescription{$domain} ); |
} |
} |
} |
} |
|
close ($fh); |
} |
} |
|
|
|
|
# ------------------------------------------------------------- Read hosts file |
# ------------------------------------------------------------- Read hosts file |
{ |
{ |
my $config=Apache::File->new("$perlvar{'lonTabDir'}/hosts.tab"); |
open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
next if ($configline =~ /^(\#|\s*$)/); |
next if ($configline =~ /^(\#|\s*$)/); |
Line 3616 BEGIN {
|
Line 5213 BEGIN {
|
} |
} |
} |
} |
} |
} |
|
close($config); |
} |
} |
|
|
# ------------------------------------------------------ Read spare server file |
# ------------------------------------------------------ Read spare server file |
{ |
{ |
my $config=Apache::File->new("$perlvar{'lonTabDir'}/spare.tab"); |
open(my $config,"<$perlvar{'lonTabDir'}/spare.tab"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
chomp($configline); |
chomp($configline); |
Line 3628 BEGIN {
|
Line 5226 BEGIN {
|
$spareid{$configline}=1; |
$spareid{$configline}=1; |
} |
} |
} |
} |
|
close($config); |
} |
} |
# ------------------------------------------------------------ Read permissions |
# ------------------------------------------------------------ Read permissions |
{ |
{ |
my $config=Apache::File->new("$perlvar{'lonTabDir'}/roles.tab"); |
open(my $config,"<$perlvar{'lonTabDir'}/roles.tab"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
chomp($configline); |
chomp($configline); |
if ($configline) { |
if ($configline) { |
my ($role,$perm)=split(/ /,$configline); |
my ($role,$perm)=split(/ /,$configline); |
if ($perm ne '') { $pr{$role}=$perm; } |
if ($perm ne '') { $pr{$role}=$perm; } |
} |
} |
} |
} |
|
close($config); |
} |
} |
|
|
# -------------------------------------------- Read plain texts for permissions |
# -------------------------------------------- Read plain texts for permissions |
{ |
{ |
my $config=Apache::File->new("$perlvar{'lonTabDir'}/rolesplain.tab"); |
open(my $config,"<$perlvar{'lonTabDir'}/rolesplain.tab"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
chomp($configline); |
chomp($configline); |
if ($configline) { |
if ($configline) { |
my ($short,$plain)=split(/:/,$configline); |
my ($short,$plain)=split(/:/,$configline); |
if ($plain ne '') { $prp{$short}=$plain; } |
if ($plain ne '') { $prp{$short}=$plain; } |
} |
} |
} |
} |
|
close($config); |
} |
} |
|
|
# ---------------------------------------------------------- Read package table |
# ---------------------------------------------------------- Read package table |
{ |
{ |
my $config=Apache::File->new("$perlvar{'lonTabDir'}/packages.tab"); |
open(my $config,"<$perlvar{'lonTabDir'}/packages.tab"); |
|
|
while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
chomp($configline); |
if ($configline !~ /\S/ || $configline=~/^#/) { next; } |
my ($short,$plain)=split(/:/,$configline); |
chomp($configline); |
my ($pack,$name)=split(/\&/,$short); |
my ($short,$plain)=split(/:/,$configline); |
if ($plain ne '') { |
my ($pack,$name)=split(/\&/,$short); |
$packagetab{$pack.'&'.$name.'&name'}=$name; |
if ($plain ne '') { |
$packagetab{$short}=$plain; |
$packagetab{$pack.'&'.$name.'&name'}=$name; |
} |
$packagetab{$short}=$plain; |
|
} |
} |
} |
|
close($config); |
|
} |
|
|
|
# ------------- set up temporary directory |
|
{ |
|
$tmpdir = $perlvar{'lonDaemons'}.'/tmp/'; |
|
|
} |
} |
|
|
%metacache=(); |
%metacache=(); |
Line 3719 being set.
|
Line 5328 being set.
|
|
|
=back |
=back |
|
|
=head1 INTRODUCTION |
=head1 OVERVIEW |
|
|
This module provides subroutines which interact with the |
lonnet provides subroutines which interact with the |
lonc/lond (TCP) network layer of LON-CAPA. And Can be used to ask about |
lonc/lond (TCP) network layer of LON-CAPA. They can be used to ask |
- classes |
about classes, users, and resources. |
- users |
|
- resources |
|
|
|
For many of these objects you can also use this to store data about |
For many of these objects you can also use this to store data about |
them or modify them in various ways. |
them or modify them in various ways. |
|
|
This is part of the LearningOnline Network with CAPA project |
=head2 Symbs |
described at http://www.lon-capa.org. |
|
|
|
=head1 RETURN MESSAGES |
To identify a specific instance of a resource, LON-CAPA uses symbols |
|
or "symbs"X<symb>. These identifiers are built from the URL of the |
|
map, the resource number of the resource in the map, and the URL of |
|
the resource itself. The latter is somewhat redundant, but might help |
|
if maps change. |
|
|
=over 4 |
An example is |
|
|
=item * |
msu/korte/parts/part1.sequence___19___msu/korte/tests/part12.problem |
|
|
con_lost : unable to contact remote host |
The respective map entry is |
|
|
=item * |
<resource id="19" src="/res/msu/korte/tests/part12.problem" |
|
title="Problem 2"> |
|
</resource> |
|
|
con_delayed : unable to contact remote host, message will be delivered |
Symbs are used by the random number generator, as well as to store and |
when the connection is brought back up |
restore data specific to a certain instance of for example a problem. |
|
|
=item * |
=head2 Storing And Retrieving Data |
|
|
con_failed : unable to contact remote host and unable to save message |
X<store()>X<cstore()>X<restore()>Three of the most important functions |
for later delivery |
in C<lonnet.pm> are C<&Apache::lonnet::cstore()>, |
|
C<&Apache::lonnet:restore()>, and C<&Apache::lonnet::store()>, which |
|
is is the non-critical message twin of cstore. These functions are for |
|
handlers to store a perl hash to a user's permanent data space in an |
|
easy manner, and to retrieve it again on another call. It is expected |
|
that a handler would use this once at the beginning to retrieve data, |
|
and then again once at the end to send only the new data back. |
|
|
=item * |
The data is stored in the user's data directory on the user's |
|
homeserver under the ID of the course. |
|
|
error: : an error a occured, a description of the error follows the : |
The hash that is returned by restore will have all of the previous |
|
value for all of the elements of the hash. |
|
|
=item * |
Example: |
|
|
|
#creating a hash |
|
my %hash; |
|
$hash{'foo'}='bar'; |
|
|
|
#storing it |
|
&Apache::lonnet::cstore(\%hash); |
|
|
|
#changing a value |
|
$hash{'foo'}='notbar'; |
|
|
|
#adding a new value |
|
$hash{'bar'}='foo'; |
|
&Apache::lonnet::cstore(\%hash); |
|
|
|
#retrieving the hash |
|
my %history=&Apache::lonnet::restore(); |
|
|
|
#print the hash |
|
foreach my $key (sort(keys(%history))) { |
|
print("\%history{$key} = $history{$key}"); |
|
} |
|
|
|
Will print out: |
|
|
|
%history{1:foo} = bar |
|
%history{1:keys} = foo:timestamp |
|
%history{1:timestamp} = 990455579 |
|
%history{2:bar} = foo |
|
%history{2:foo} = notbar |
|
%history{2:keys} = foo:bar:timestamp |
|
%history{2:timestamp} = 990455580 |
|
%history{bar} = foo |
|
%history{foo} = notbar |
|
%history{timestamp} = 990455580 |
|
%history{version} = 2 |
|
|
|
Note that the special hash entries C<keys>, C<version> and |
|
C<timestamp> were added to the hash. C<version> will be equal to the |
|
total number of versions of the data that have been stored. The |
|
C<timestamp> attribute will be the UNIX time the hash was |
|
stored. C<keys> is available in every historical section to list which |
|
keys were added or changed at a specific historical revision of a |
|
hash. |
|
|
|
B<Warning>: do not store the hash that restore returns directly. This |
|
will cause a mess since it will restore the historical keys as if the |
|
were new keys. I.E. 1:foo will become 1:1:foo etc. |
|
|
|
Calling convention: |
|
|
|
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home); |
|
&Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home); |
|
|
|
For more detailed information, see lonnet specific documentation. |
|
|
|
=head1 RETURN MESSAGES |
|
|
|
=over 4 |
|
|
|
=item * B<con_lost>: unable to contact remote host |
|
|
|
=item * B<con_delayed>: unable to contact remote host, message will be delivered |
|
when the connection is brought back up |
|
|
|
=item * B<con_failed>: unable to contact remote host and unable to save message |
|
for later delivery |
|
|
no_such_host : unable to fund a host associated with the user/domain |
=item * B<error:>: an error a occured, a description of the error follows the : |
|
|
|
=item * B<no_such_host>: unable to fund a host associated with the user/domain |
that was requested |
that was requested |
|
|
=back |
=back |
Line 3768 that was requested
|
Line 5457 that was requested
|
|
|
=over 4 |
=over 4 |
|
|
=item * |
=item * |
|
X<appenv()> |
appenv(%hash) : the value of %hash is written to the user envirnoment |
B<appenv(%hash)>: the value of %hash is written to |
file, and will be restored for each access this user makes during this |
the user envirnoment file, and will be restored for each access this |
session, also modifies the %ENV for the current process |
user makes during this session, also modifies the %ENV for the current |
|
process |
|
|
=item * |
=item * |
|
X<delenv()> |
delenv($regexp) : removes all items from the session environment file that matches the regular expression in $regexp. The values are also delted from the current processes %ENV. |
B<delenv($regexp)>: removes all items from the session |
|
environment file that matches the regular expression in $regexp. The |
|
values are also delted from the current processes %ENV. |
|
|
=back |
=back |
|
|
Line 3785 delenv($regexp) : removes all items from
|
Line 5477 delenv($regexp) : removes all items from
|
=over 4 |
=over 4 |
|
|
=item * |
=item * |
|
X<queryauthenticate()> |
queryauthenticate($uname,$udom) : try to determine user's current |
B<queryauthenticate($uname,$udom)>: try to determine user's current |
authentication scheme |
authentication scheme |
|
|
=item * |
=item * |
|
X<authenticate()> |
authenticate($uname,$upass,$udom) : try to authenticate user from domain's lib |
B<authenticate($uname,$upass,$udom)>: try to |
servers (first use the current one), $upass should be the users password |
authenticate user from domain's lib servers (first use the current |
|
one). C<$upass> should be the users password. |
|
|
=item * |
=item * |
|
X<homeserver()> |
homeserver($uname,$udom) : find the server which has the user's |
B<homeserver($uname,$udom)>: find the server which has |
directory and files (there must be only one), this caches the answer, |
the user's directory and files (there must be only one), this caches |
and also caches if there is a borken connection. |
the answer, and also caches if there is a borken connection. |
|
|
=item * |
=item * |
|
X<idget()> |
idget($udom,@ids) : find the usernames behind a list of IDs (IDs are a |
B<idget($udom,@ids)>: find the usernames behind a list of IDs |
unique resource in a domain, there must be only 1 ID per username, and |
(IDs are a unique resource in a domain, there must be only 1 ID per |
only 1 username per ID in a specific domain) (returns hash: |
username, and only 1 username per ID in a specific domain) (returns |
id=>name,id=>name) |
hash: id=>name,id=>name) |
|
|
=item * |
=item * |
|
X<idrget()> |
idrget($udom,@unames) : find the IDs behind a list of usernames (returns hash: |
B<idrget($udom,@unames)>: find the IDs behind a list of |
name=>id,name=>id) |
usernames (returns hash: name=>id,name=>id) |
|
|
=item * |
=item * |
|
X<idput()> |
idput($udom,%ids) : store away a list of names and associated IDs |
B<idput($udom,%ids)>: store away a list of names and associated IDs |
|
|
=item * |
=item * |
|
X<rolesinit()> |
rolesinit($udom,$username,$authhost) : get user privileges |
B<rolesinit($udom,$username,$authhost)>: get user privileges |
|
|
=item * |
=item * |
|
X<usection()> |
usection($udom,$uname,$cname) : finds the section of student in the |
B<usection($udom,$uname,$cname)>: finds the section of student in the |
course $cname, return section name/number or '' for "not in course" |
course $cname, return section name/number or '' for "not in course" |
and '-1' for "no section" |
and '-1' for "no section" |
|
|
=item * |
=item * |
|
X<userenvironment()> |
userenvironment($udom,$uname,@what) : gets the values of the keys |
B<userenvironment($udom,$uname,@what)>: gets the values of the keys |
passed in @what from the requested user's environment, returns a hash |
passed in @what from the requested user's environment, returns a hash |
|
|
=back |
=back |
Line 4196 dumps the complete (or key matching rege
|
Line 5889 dumps the complete (or key matching rege
|
|
|
=item * |
=item * |
|
|
|
inc($namespace,$store,$udom,$uname) : increments $store in $namespace. |
|
$store can be a scalar, an array reference, or if the amount to be |
|
incremented is > 1, a hash reference. |
|
|
|
($udom and $uname are optional) |
|
|
|
=item * |
|
|
put($namespace,$storehash,$udom,$uname) : stores hash in namesp |
put($namespace,$storehash,$udom,$uname) : stores hash in namesp |
($udom and $uname are optional) |
($udom and $uname are optional) |
|
|
Line 4306 messages of critical importance should g
|
Line 6007 messages of critical importance should g
|
|
|
=item * |
=item * |
|
|
getfile($file) : returns the entire contents of a file or -1; it |
getfile($file,$caller) : two cases - requests for files in /res or in /uploaded. |
properly subscribes to and replicates the file if neccessary. |
(a) files in /uploaded |
|
(i) If a local copy of the file exists - |
|
compares modification date of local copy with last-modified date for |
|
definitive version stored on home server for course. If local copy is |
|
stale, requests a new version from the home server and stores it. |
|
If the original has been removed from the home server, then local copy |
|
is unlinked. |
|
(ii) If local copy does not exist - |
|
requests the file from the home server and stores it. |
|
|
|
If $caller is 'uploadrep': |
|
This indicates a call from lonuploadrep.pm (PerlHeaderParserHandler phase) |
|
for request for files originally uploaded via DOCS. |
|
- returns 'ok' if fresh local copy now available, -1 otherwise. |
|
|
|
Otherwise: |
|
This indicates a call from the content generation phase of the request. |
|
- returns the entire contents of the file or -1. |
|
|
|
(b) files in /res |
|
- returns the entire contents of a file or -1; |
|
it properly subscribes to and replicates the file if neccessary. |
|
|
=item * |
=item * |
|
|