--- loncom/lonnet/perl/lonnet.pm 2020/10/01 13:19:14 1.1172.2.118.2.8
+++ loncom/lonnet/perl/lonnet.pm 2020/05/04 15:07:10 1.1172.2.123
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1172.2.118.2.8 2020/10/01 13:19:14 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.123 2020/05/04 15:07:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1873,12 +1873,7 @@ sub get_dom {
}
}
if ($udom && $uhome && ($uhome ne 'no_host')) {
- my $rep;
- if ($namespace =~ /^enc/) {
- $rep=&reply("encrypt:egetdom:$udom:$namespace:$items",$uhome);
- } else {
- $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
- }
+ my $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
my %returnhash;
if ($rep eq '' || $rep =~ /^error: 2 /) {
return %returnhash;
@@ -1922,11 +1917,7 @@ sub put_dom {
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
}
$items=~s/\&$//;
- if ($namespace =~ /^enc/) {
- return &reply("encrypt:putdom:$udom:$namespace:$items",$uhome);
- } else {
- return &reply("putdom:$udom:$namespace:$items",$uhome);
- }
+ return &reply("putdom:$udom:$namespace:$items",$uhome);
} else {
&logthis("put_dom failed - no homeserver and/or domain");
}
@@ -2543,22 +2534,6 @@ sub get_passwdconf {
return %passwdconf;
}
-sub course_portal_url {
- my ($cnum,$cdom) = @_;
- my $chome = &homeserver($cnum,$cdom);
- my $hostname = &hostname($chome);
- my $protocol = $protocol{$chome};
- $protocol = 'http' if ($protocol ne 'https');
- my %domdefaults = &get_domain_defaults($cdom);
- my $firsturl;
- if ($domdefaults{'portal_def'}) {
- $firsturl = $domdefaults{'portal_def'};
- } else {
- $firsturl = $protocol.'://'.$hostname;
- }
- return $firsturl;
-}
-
# --------------------------------------------------- Assign a key to a student
sub assign_access_key {
@@ -3094,27 +3069,6 @@ sub repcopy {
}
}
-# ------------------------------------------------- Unsubscribe from a resource
-
-sub unsubscribe {
- my ($fname) = @_;
- my $answer;
- if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return $answer; }
- $fname=~s/[\n\r]//g;
- my $author=$fname;
- $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
- my ($udom,$uname)=split(/\//,$author);
- my $home=homeserver($uname,$udom);
- if ($home eq 'no_host') {
- $answer = 'no_host';
- } elsif (grep { $_ eq $home } ¤t_machine_ids()) {
- $answer = 'home';
- } else {
- $answer = reply("unsub:$fname",$home);
- }
- return $answer;
-}
-
# ------------------------------------------------ Get server side include body
sub ssi_body {
my ($filelink,%form)=@_;
@@ -3273,18 +3227,12 @@ sub remove_stale_resfile {
$stale = 1;
}
if ($stale) {
- if (unlink($fname)) {
- if ($uri!~/\.meta$/) {
- if (-e $fname.'.meta') {
- unlink($fname.'.meta');
- }
- }
- my $unsubresult = &unsubscribe($fname);
- unless ($unsubresult eq 'ok') {
- &logthis("no unsub of $fname from $homeserver, reason: $unsubresult");
- }
- $removed = 1;
+ unlink($fname);
+ if ($uri!~/\.meta$/) {
+ unlink($fname.'.meta');
}
+ &reply("unsub:$fname",$homeserver);
+ $removed = 1;
}
}
}
@@ -3446,14 +3394,6 @@ sub can_edit_resource {
$cfile = '/adm/wrapper'.$resurl;
}
}
- } elsif ($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
$incourse = 1;
if ($env{'form.forceedit'}) {
@@ -3478,14 +3418,6 @@ sub can_edit_resource {
$forceedit = 1;
}
$cfile = $resurl;
- } elsif (($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) && ($env{'form.folderpath'} =~ /^supplemental/)) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
} elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) {
$incourse = 1;
$forceview = 1;
@@ -3495,13 +3427,8 @@ sub can_edit_resource {
$cfile = &clutter($res);
} else {
$cfile = $env{'form.suppurl'};
- my $escfile = &unescape($cfile);
- if ($escfile =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
- $cfile = '/adm/wrapper'.$escfile;
- } else {
- $escfile =~ s{^http://}{};
- $cfile = &escape("/adm/wrapper/ext/$escfile");
- }
+ $cfile =~ s{^http://}{};
+ $cfile = '/adm/wrapper/ext/'.$cfile;
}
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
if ($env{'form.forceedit'}) {
@@ -5474,10 +5401,9 @@ my %cachedtimes=();
my $cachedtime='';
sub load_all_first_access {
- my ($uname,$udom,$ignorecache)=@_;
+ my ($uname,$udom)=@_;
if (($cachedkey eq $uname.':'.$udom) &&
- (abs($cachedtime-time)<5) && (!$env{'form.markaccess'}) &&
- (!$ignorecache)) {
+ (abs($cachedtime-time)<5) && (!$env{'form.markaccess'})) {
return;
}
$cachedtime=time;
@@ -5486,7 +5412,7 @@ sub load_all_first_access {
}
sub get_first_access {
- my ($type,$argsymb,$argmap,$ignorecache)=@_;
+ my ($type,$argsymb,$argmap)=@_;
my ($symb,$courseid,$udom,$uname)=&whichuser();
if ($argsymb) { $symb=$argsymb; }
my ($map,$id,$res)=&decode_symb($symb);
@@ -5498,7 +5424,7 @@ sub get_first_access {
} else {
$res=$symb;
}
- &load_all_first_access($uname,$udom,$ignorecache);
+ &load_all_first_access($uname,$udom);
return $cachedtimes{"$courseid\0$res"};
}
@@ -6915,7 +6841,7 @@ sub currentdump {
#
my %returnhash=();
#
- if ($rep eq 'unknown_cmd') {
+ if ($rep eq "unknown_cmd") {
# an old lond will not know currentdump
# Do a dump and make it look like a currentdump
my @tmp = &dumpstore($courseid,$sdom,$sname,'.');
@@ -7831,7 +7757,7 @@ sub customaccess {
# ------------------------------------------------- Check for a user privilege
sub allowed {
- my ($priv,$uri,$symb,$role,$clientip,$noblockcheck,$ignorecache)=@_;
+ my ($priv,$uri,$symb,$role,$clientip,$noblockcheck)=@_;
my $ver_orguri=$uri;
$uri=&deversion($uri);
my $orguri=$uri;
@@ -7848,7 +7774,7 @@ sub allowed {
if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }
# Free bre access to adm and meta resources
- if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard|ext\.tool)$}))
+ if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$}))
|| (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) ))
&& ($priv eq 'bre')) {
return 'F';
@@ -8056,7 +7982,7 @@ sub allowed {
if ($noblockcheck) {
$thisallowed.=$value;
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache);
+ my @blockers = &has_comm_blocking($priv,$symb,$uri);
if (@blockers > 0) {
$thisallowed = 'B';
} else {
@@ -8076,7 +8002,7 @@ sub allowed {
if ($noblockcheck) {
$thisallowed='F';
} else {
- my @blockers = &has_comm_blocking($priv,'',$refuri,'',1);
+ my @blockers = &has_comm_blocking($priv,$symb,$refuri);
if (@blockers > 0) {
$thisallowed = 'B';
} else {
@@ -8095,7 +8021,7 @@ sub allowed {
&& &is_portfolio_url($uri)) {
$thisallowed = &portfolio_access($uri,$clientip);
}
-
+
# Full access at system, domain or course-wide level? Exit.
if ($thisallowed=~/F/) {
return 'F';
@@ -8149,7 +8075,7 @@ sub allowed {
if ($noblockcheck) {
$thisallowed.=$value;
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache);
+ my @blockers = &has_comm_blocking($priv,$symb,$uri);
if (@blockers > 0) {
$thisallowed = 'B';
} else {
@@ -8162,7 +8088,7 @@ sub allowed {
$checkreferer=0;
}
}
-
+
if ($checkreferer) {
my $refuri=$env{'httpref.'.$orguri};
unless ($refuri) {
@@ -8191,7 +8117,7 @@ sub allowed {
if ($noblockcheck) {
$thisallowed.=$value;
} else {
- my @blockers = &has_comm_blocking($priv,'',$refuri,'',1);
+ my @blockers = &has_comm_blocking($priv,$symb,$refuri);
if (@blockers > 0) {
$thisallowed = 'B';
} else {
@@ -8277,7 +8203,7 @@ sub allowed {
}
}
}
-
+
#
# Rest of the restrictions depend on selected course
#
@@ -8435,10 +8361,6 @@ sub constructaccess {
#
# User for whom data are being temporarily cached.
my $cacheduser='';
-# Course for which data are being temporarily cached.
-my $cachedcid='';
-# List of blocks passed to &get_commblock_resources();
-my $cachedblocks='';
# Cached blockers for this user (a hash of blocking items).
my %cachedblockers=();
# When the data were last cached.
@@ -8448,22 +8370,13 @@ sub load_all_blockers {
my ($uname,$udom,$blocks)=@_;
if (($uname ne '') && ($udom ne '')) {
if (($cacheduser eq $uname.':'.$udom) &&
- ($cachedcid eq $env{'request.course.id'}) &&
- (abs($cachedlast-time)<5) &&
- (((ref($blocks) eq 'HASH') &&
- ($cachedblocks eq join(',',sort(keys(%{$blocks}))))) ||
- (!ref($blocks) && $cachedblocks eq ''))) {
+ (abs($cachedlast-time)<5)) {
return;
}
}
$cachedlast=time;
$cacheduser=$uname.':'.$udom;
- $cachedcid=$env{'request.course.id'};
%cachedblockers = &get_commblock_resources($blocks);
- if ((ref($blocks) eq 'HASH') && (keys(%{$blocks}) > 0)) {
- $cachedblocks = join(',',sort(keys(%{$blocks})));
- }
- return;
}
sub get_comm_blocks {
@@ -8558,8 +8471,7 @@ sub get_commblock_resources {
}
}
}
- if ($interval[0] =~ /^(\d+)/) {
- my $timelimit = $1;
+ if ($interval[0] =~ /^\d+$/) {
my $first_access;
if ($type eq 'resource') {
$first_access=&get_first_access($interval[1],$item);
@@ -8569,7 +8481,7 @@ sub get_commblock_resources {
$first_access=&get_first_access($interval[1]);
}
if ($first_access) {
- my $timesup = $first_access+$timelimit;
+ my $timesup = $first_access+$interval[0];
if ($timesup > $now) {
my $activeblock;
foreach my $res (@to_test) {
@@ -8601,7 +8513,7 @@ sub get_commblock_resources {
}
sub has_comm_blocking {
- my ($priv,$symb,$uri,$nosymbcache,$noenccheck,$blocked,$blocks) = @_;
+ my ($priv,$symb,$uri,$blocks) = @_;
my @blockers;
return unless ($env{'request.course.id'});
return unless ($priv eq 'bre');
@@ -8611,7 +8523,7 @@ sub has_comm_blocking {
return unless (keys(%cachedblockers) > 0);
my (%possibles,@symbs);
if (!$symb) {
- $symb = &symbread($uri,1,1,1,\%possibles,$nosymbcache,$noenccheck);
+ $symb = &symbread($uri,1,1,1,\%possibles);
}
if ($symb) {
@symbs = ($symb);
@@ -8625,11 +8537,9 @@ sub has_comm_blocking {
foreach my $block (keys(%cachedblockers)) {
if ($block =~ /^firstaccess____(.+)$/) {
my $item = $1;
- unless ($blocked) {
- if (($item eq $map) || ($item eq $symb)) {
- $noblock = 1;
- last;
- }
+ if (($item eq $map) || ($item eq $symb)) {
+ $noblock = 1;
+ last;
}
}
if (ref($cachedblockers{$block}) eq 'HASH') {
@@ -8640,20 +8550,18 @@ sub has_comm_blocking {
}
}
}
- if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') {
- if ($cachedblockers{$block}{'maps'}{$map}) {
- unless (grep(/^\Q$block\E$/,@blockers)) {
- push(@blockers,$block);
- }
+ }
+ if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') {
+ if ($cachedblockers{$block}{'maps'}{$map}) {
+ unless (grep(/^\Q$block\E$/,@blockers)) {
+ push(@blockers,$block);
}
}
}
}
}
- unless ($noblock) {
- return @blockers;
- }
- return;
+ return if ($noblock);
+ return @blockers;
}
}
@@ -10299,19 +10207,14 @@ sub writecoursepref {
sub createcourse {
my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,
- $course_owner,$crstype,$cnum,$context,$category,$callercontext)=@_;
+ $course_owner,$crstype,$cnum,$context,$category)=@_;
$url=&declutter($url);
my $cid='';
if ($context eq 'requestcourses') {
my $can_create = 0;
my ($ownername,$ownerdom) = split(':',$course_owner);
if ($udom eq $ownerdom) {
- my $reload;
- if (($callercontext eq 'auto') &&
- ($ownerdom eq $env{'user.domain'}) && ($ownername eq $env{'user.name'})) {
- $reload = 'reload';
- }
- if (&usertools_access($ownername,$ownerdom,$category,$reload,
+ if (&usertools_access($ownername,$ownerdom,$category,undef,
$context)) {
$can_create = 1;
}
@@ -11320,7 +11223,7 @@ sub get_userresdata {
# Parameters:
# $name - Course/user name.
# $domain - Name of the domain the user/course is registered on.
-# $type - Type of thing $name is (must be 'course' or 'user')
+# $type - Type of thing $name is (must be 'course' or 'user'
# @which - Array of names of resources desired.
# Returns:
# The value of the first reasource in @which that is found in the
@@ -11341,40 +11244,11 @@ sub resdata {
foreach my $item (@which) {
if (defined($result->{$item->[0]})) {
return [$result->{$item->[0]},$item->[1]];
- }
+ }
}
return undef;
}
-sub get_domain_ltitools {
- my ($cdom) = @_;
- my %ltitools;
- my ($result,$cached)=&is_cached_new('ltitools',$cdom);
- if (defined($cached)) {
- if (ref($result) eq 'HASH') {
- %ltitools = %{$result};
- }
- } else {
- my %domconfig = &get_dom('configuration',['ltitools'],$cdom);
- if (ref($domconfig{'ltitools'}) eq 'HASH') {
- %ltitools = %{$domconfig{'ltitools'}};
- my %encdomconfig = &get_dom('encconfig',['ltitools'],$cdom);
- if (ref($encdomconfig{'ltitools'}) eq 'HASH') {
- foreach my $id (keys(%ltitools)) {
- if (ref($encdomconfig{'ltitools'}{$id}) eq 'HASH') {
- foreach my $item ('key','secret') {
- $ltitools{$id}{$item} = $encdomconfig{'ltitools'}{$id}{$item};
- }
- }
- }
- }
- }
- my $cachetime = 24*60*60;
- &do_cache_new('ltitools',$cdom,\%ltitools,$cachetime);
- }
- return %ltitools;
-}
-
sub get_numsuppfiles {
my ($cnum,$cdom,$ignorecache)=@_;
my $hashid=$cnum.':'.$cdom;
@@ -11830,7 +11704,7 @@ sub metadata {
# if it is a non metadata possible uri return quickly
if (($uri eq '') ||
(($uri =~ m|^/*adm/|) &&
- ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard|ext\.tool)$})) ||
+ ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) ||
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
return undef;
}
@@ -12526,26 +12400,19 @@ sub deversion {
# ------------------------------------------------------ Return symb list entry
sub symbread {
- my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles,
- $nocache,$noenccheck)=@_;
+ my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles)=@_;
my $cache_str='request.symbread.cached.'.$thisfn;
- if (defined($env{$cache_str}) && !$nocache) {
- unless (ref($possibles) eq 'HASH') {
- if ($ignorecachednull) {
- return $env{$cache_str} unless ($env{$cache_str} eq '');
- } else {
- return $env{$cache_str};
- }
+ if (defined($env{$cache_str})) {
+ if ($ignorecachednull) {
+ return $env{$cache_str} unless ($env{$cache_str} eq '');
+ } else {
+ return $env{$cache_str};
}
}
# no filename provided? try from environment
unless ($thisfn) {
if ($env{'request.symb'}) {
- if ($nocache) {
- return &symbclean($env{'request.symb'});
- } else {
- return $env{$cache_str}=&symbclean($env{'request.symb'});
- }
+ return $env{$cache_str}=&symbclean($env{'request.symb'});
}
$thisfn=$env{'request.filename'};
}
@@ -12553,11 +12420,7 @@ sub symbread {
# is that filename actually a symb? Verify, clean, and return
if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) {
if (&symbverify($thisfn,$1)) {
- if ($nocache) {
- return &symbclean($thisfn);
- } else {
- return $env{$cache_str}=&symbclean($thisfn);
- }
+ return $env{$cache_str}=&symbclean($thisfn);
}
}
$thisfn=declutter($thisfn);
@@ -12572,18 +12435,10 @@ sub symbread {
if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) {
$targetfn=$1;
}
- unless ($nocache) {
- if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
- &GDBM_READER(),0640)) {
- $syval=$hash{$targetfn};
- untie(%hash);
- }
- if ($syval) {
- my @blockers = &has_comm_blocking('bre',$syval,$thisfn,$nocache,$noenccheck);
- if (@blockers) {
- $syval='';
- }
- }
+ if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+ &GDBM_READER(),0640)) {
+ $syval=$hash{$targetfn};
+ untie(%hash);
}
# ---------------------------------------------------------- There was an entry
if ($syval) {
@@ -12616,19 +12471,13 @@ sub symbread {
$syval=&encode_symb($bighash{'map_id_'.$mapid},
$resid,$thisfn);
if (ref($possibles) eq 'HASH') {
- unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) {
- $possibles->{$syval} = 1;
- }
+ $possibles->{$syval} = 1;
}
if ($checkforblock) {
- unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) {
- my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids},'',$noenccheck);
- if (@blockers) {
- $syval = '';
- untie(%bighash);
- return '' if ($nocache);
- return $env{$cache_str}='';
- }
+ my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids});
+ if (@blockers) {
+ $syval = '';
+ return;
}
}
} elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
@@ -12647,13 +12496,12 @@ sub symbread {
if ($bighash{'map_type_'.$mapid} ne 'page') {
my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid},
$resid,$thisfn);
- next if ($bighash{'randomout_'.$id} && !$env{'request.role.adv'});
- next unless (($noenccheck) || ($bighash{'encrypted_'.$id} eq $env{'request.enc'}));
+ if (ref($possibles) eq 'HASH') {
+ $possibles->{$syval} = 1;
+ }
if ($checkforblock) {
- my @blockers = &has_comm_blocking('bre',$poss_syval,$file,'',$noenccheck);
- if (@blockers > 0) {
- $syval = '';
- } else {
+ my @blockers = &has_comm_blocking('bre',$poss_syval,$file);
+ unless (@blockers > 0) {
$syval = $poss_syval;
$realpossible++;
}
@@ -12661,11 +12509,6 @@ sub symbread {
$syval = $poss_syval;
$realpossible++;
}
- if ($syval) {
- if (ref($possibles) eq 'HASH') {
- $possibles->{$syval} = 1;
- }
- }
}
}
}
@@ -12678,15 +12521,10 @@ sub symbread {
}
}
if ($syval) {
- if ($nocache) {
- return $syval;
- } else {
- return $env{$cache_str}=$syval;
- }
+ return $env{$cache_str}=$syval;
}
}
&appenv({'request.ambiguous' => $thisfn});
- return '' if ($nocache);
return $env{$cache_str}='';
}
@@ -13521,8 +13359,6 @@ sub clutter {
# &logthis("Got a blank emb style");
}
}
- } elsif ($thisfn =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
- $thisfn='/adm/wrapper'.$thisfn;
}
return $thisfn;
}