) {
#ok, I know it's clunky, but I want it to work
my @paths_and_file = split(m|/|, $line);
@@ -10783,9 +9110,9 @@ sub modify_access_controls {
my $tries = 0;
my $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
- while (($gotlock ne 'ok') && $tries < 10) {
+ while (($gotlock ne 'ok') && $tries <3) {
$tries ++;
- sleep(0.1);
+ sleep 1;
$gotlock = &newput('file_permissions',$lockhash,$domain,$user);
}
if ($gotlock eq 'ok') {
@@ -11078,23 +9405,7 @@ sub dirlist {
foreach my $user (sort(keys(%allusers))) {
push(@alluserslist,$user.'&user');
}
- if (!%listerror) {
- # no errors
- return (\@alluserslist);
- } elsif (scalar(keys(%servers)) == 1) {
- # one library server, one error
- my ($key) = keys(%listerror);
- return (\@alluserslist, $listerror{$key});
- } elsif ( grep { $_ eq 'con_lost' } values(%listerror) ) {
- # con_lost indicates that we might miss data from at least one
- # library server
- return (\@alluserslist, 'con_lost');
- } else {
- # multiple library servers and no con_lost -> data should be
- # complete.
- return (\@alluserslist);
- }
-
+ return (\@alluserslist);
} else {
return ([],'missing username');
}
@@ -11311,12 +9622,10 @@ sub get_userresdata {
}
#error 2 occurs when the .db doesn't exist
if ($tmp!~/error: 2 /) {
- if ((!defined($cached)) || ($tmp ne 'con_lost')) {
- &logthis("WARNING:".
- " Trying to get resource data for ".
- $uname." at ".$udom.": ".
- $tmp."");
- }
+ &logthis("WARNING:".
+ " Trying to get resource data for ".
+ $uname." at ".$udom.": ".
+ $tmp."");
} elsif ($tmp=~/error: 2 /) {
#&EXT_cache_set($udom,$uname);
&do_cache_new('userres',$hashid,undef,600);
@@ -11368,7 +9677,7 @@ sub get_numsuppfiles {
unless ($chome eq 'no_host') {
($suppcount,my $errors) = (0,0);
my $suppmap = 'supplemental.sequence';
- ($suppcount,$errors) =
+ ($suppcount,$errors) =
&Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,$errors);
}
&do_cache_new('suppcount',$hashid,$suppcount,600);
@@ -11563,7 +9872,7 @@ sub EXT {
$courseid = $cid;
}
if (($symbparm && $courseid) &&
- (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
+ (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
#print '
'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
@@ -11804,7 +10113,6 @@ sub add_prefix_and_part {
my %metaentry;
my %importedpartids;
-my %importedrespids;
sub metadata {
my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
$uri=&declutter($uri);
@@ -11815,7 +10123,7 @@ sub metadata {
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
return undef;
}
- if (($uri =~ /^priv/ || $uri=~m{^home/httpd/html/priv})
+ if (($uri =~ /^priv/ || $uri=~/home\/httpd\/html\/priv/)
&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) {
return undef;
}
@@ -11832,11 +10140,9 @@ sub metadata {
}
{
# Imported parts would go here
- my @origfiletagids=();
+ my %importedids=();
+ my @origfileimportpartids=();
my $importedparts=0;
-
-# Imported responseids would go here
- my $importedresponses=0;
#
# Is this a recursive call for a library?
#
@@ -11931,37 +10237,8 @@ sub metadata {
my $dir=$filename;
$dir=~s|[^/]*$||;
$location=&filelocation($dir,$location);
-
- my $importid=$token->[2]->{'id'};
+
my $importmode=$token->[2]->{'importmode'};
-#
-# Check metadata for imported file to
-# see if it contained response items
-#
- my %currmetaentry = %metaentry;
- my $libresponseorder = &metadata($location,'responseorder');
- my $origfile;
- if ($libresponseorder ne '') {
- if ($#origfiletagids<0) {
- undef(%importedrespids);
- undef(%importedpartids);
- }
- @{$importedrespids{$importid}} = split(/\s*,\s*/,$libresponseorder);
- if (@{$importedrespids{$importid}} > 0) {
- $importedresponses = 1;
-# We need to get the original file and the imported file to get the response order correct
-# Load and inspect original file
- if ($#origfiletagids<0) {
- my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
- $origfile=&getfile($origfilelocation);
- @origfiletagids=($origfile=~/<((?:\w+)response|import|part)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
- }
- }
- }
-# Do not overwrite contents of %metaentry hash for resource itself with
-# hash populated for imported library file
- %metaentry = %currmetaentry;
- undef(%currmetaentry);
if ($importmode eq 'problem') {
# Import as problem/response
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
@@ -11970,15 +10247,12 @@ sub metadata {
$importedparts=1;
# We need to get the original file and the imported file to get the part order correct
# Good news: we do not need to worry about nested libraries, since parts cannot be nested
-# Load and inspect original file if we didn't do that already
- if ($#origfiletagids<0) {
- undef(%importedrespids);
- undef(%importedpartids);
- if ($origfile eq '') {
- my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
- $origfile=&getfile($origfilelocation);
- @origfiletagids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
- }
+# Load and inspect original file
+ if ($#origfileimportpartids<0) {
+ undef(%importedpartids);
+ my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
+ my $origfile=&getfile($origfilelocation);
+ @origfileimportpartids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
}
# Load and inspect imported file
@@ -12092,53 +10366,25 @@ sub metadata {
grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'}));
$metaentry{':packages'} = join(',',@uniq_packages);
- if (($importedresponses) || ($importedparts)) {
- if ($importedparts) {
+ if ($importedparts) {
# We had imported parts and need to rebuild partorder
- $metaentry{':partorder'}='';
- $metathesekeys{'partorder'}=1;
- }
- if ($importedresponses) {
-# We had imported responses and need to rebuild responseorder
- $metaentry{':responseorder'}='';
- $metathesekeys{'responseorder'}=1;
- }
- for (my $index=0;$index<$#origfiletagids;$index+=2) {
- my $origid = $origfiletagids[$index+1];
- if ($origfiletagids[$index] eq 'part') {
-# Original part, part of the problem
- if ($importedparts) {
- $metaentry{':partorder'}.=','.$origid;
- }
- } elsif ($origfiletagids[$index] eq 'import') {
- if ($importedparts) {
-# We have imported parts at this position
- $metaentry{':partorder'}.=','.$importedpartids{$origid};
- }
- if ($importedresponses) {
-# We have imported responses at this position
- if (ref($importedrespids{$origid}) eq 'ARRAY') {
- $metaentry{':responseorder'}.=','.join(',',map { $origid.'_'.$_ } @{$importedrespids{$origid}});
- }
- }
- } else {
-# Original response item, part of the problem
- if ($importedresponses) {
- $metaentry{':responseorder'}.=','.$origid;
- }
- }
- }
- if ($importedparts) {
- $metaentry{':partorder'}=~s/^\,//;
- }
- if ($importedresponses) {
- $metaentry{':responseorder'}=~s/^\,//;
- }
+ $metaentry{':partorder'}='';
+ $metathesekeys{'partorder'}=1;
+ for (my $index=0;$index<$#origfileimportpartids;$index+=2) {
+ if ($origfileimportpartids[$index] eq 'part') {
+# original part, part of the problem
+ $metaentry{':partorder'}.=','.$origfileimportpartids[$index+1];
+ } else {
+# we have imported parts at this position
+ $metaentry{':partorder'}.=','.$importedpartids{$origfileimportpartids[$index+1]};
+ }
+ }
+ $metaentry{':partorder'}=~s/^\,//;
}
$metaentry{':keys'} = join(',',keys(%metathesekeys));
&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
- $metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));
+ $metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
&do_cache_new('meta',$uri,\%metaentry,$cachetime);
# this is the end of "was not already recently cached
}
@@ -12398,21 +10644,23 @@ sub symbverify {
if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
&GDBM_READER(),0640)) {
+ my $noclutter;
if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) {
$thisurl =~ s/\?.+$//;
if ($map =~ m{^uploaded/.+\.page$}) {
$thisurl =~ s{^(/adm/wrapper|)/ext/}{http://};
$thisurl =~ s{^\Qhttp://https://\E}{https://};
+ $noclutter = 1;
}
}
my $ids;
- if ($map =~ m{^uploaded/.+\.page$}) {
- $ids=$bighash{'ids_'.&clutter_with_no_wrapper($thisurl)};
+ if ($noclutter) {
+ $ids=$bighash{'ids_'.$thisurl};
} else {
$ids=$bighash{'ids_'.&clutter($thisurl)};
}
unless ($ids) {
- my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
+ my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
$ids=$bighash{$idkey};
}
if ($ids) {
@@ -12428,14 +10676,14 @@ sub symbverify {
if (ref($encstate)) {
$$encstate = $bighash{'encrypted_'.$id};
}
- if (($env{'request.role.adv'}) ||
- ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+ if (($env{'request.role.adv'}) ||
+ ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
($thisurl eq '/adm/navmaps')) {
- $okay=1;
+ $okay=1;
last;
- }
- }
- }
+ }
+ }
+ }
}
untie(%bighash);
}
@@ -12507,24 +10755,19 @@ sub deversion {
# ------------------------------------------------------ Return symb list entry
sub symbread {
- my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles,
- $ignoresymbdb,$noenccheck)=@_;
- my $cache_str='request.symbread.cached.'.$thisfn;
- if (defined($env{$cache_str})) {
- unless (ref($possibles) eq 'HASH') {
- if ($ignorecachednull) {
- return $env{$cache_str} unless ($env{$cache_str} eq '');
- } else {
- return $env{$cache_str};
- }
+ my ($thisfn,$donotrecurse)=@_;
+ my $cache_str;
+ if ($thisfn ne '') {
+ $cache_str='request.symbread.cached.'.$thisfn;
+ if ($env{$cache_str} ne '') {
+ return $env{$cache_str};
}
- }
+ } else {
# no filename provided? try from environment
- unless ($thisfn) {
if ($env{'request.symb'}) {
- return $env{$cache_str}=&symbclean($env{'request.symb'});
- }
- $thisfn=$env{'request.filename'};
+ return $env{$cache_str}=&symbclean($env{'request.symb'});
+ }
+ $thisfn=$env{'request.filename'};
}
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
# is that filename actually a symb? Verify, clean, and return
@@ -12545,18 +10788,10 @@ sub symbread {
if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) {
$targetfn=$1;
}
- unless ($ignoresymbdb) {
- if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
- &GDBM_READER(),0640)) {
- $syval=$hash{$targetfn};
- untie(%hash);
- }
- if ($syval && $checkforblock) {
- my @blockers = &has_comm_blocking('bre',$syval,$thisfn,$ignoresymbdb,$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) {
@@ -12588,57 +10823,18 @@ sub symbread {
my ($mapid,$resid)=split(/\./,$ids);
$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;
- }
- }
- 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 $env{$cache_str}='';
- }
- }
- }
- } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
+ } elsif (!$donotrecurse) {
# ------------------------------------------ There is more than one possibility
my $realpossible=0;
foreach my $id (@possibilities) {
my $file=$bighash{'src_'.$id};
- my $canaccess;
- if (($donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
- $canaccess = 1;
- } else {
- $canaccess = &allowed('bre',$file);
- }
- if ($canaccess) {
- my ($mapid,$resid)=split(/\./,$id);
- 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 ($checkforblock) {
- my @blockers = &has_comm_blocking('bre',$poss_syval,$file,'',$noenccheck);
- if (@blockers > 0) {
- $syval = '';
- } else {
- $syval = $poss_syval;
- $realpossible++;
- }
- } else {
- $syval = $poss_syval;
- $realpossible++;
- }
- if ($syval) {
- if (ref($possibles) eq 'HASH') {
- $possibles->{$syval} = 1;
- }
- }
- }
+ if (&allowed('bre',$file)) {
+ my ($mapid,$resid)=split(/\./,$id);
+ if ($bighash{'map_type_'.$mapid} ne 'page') {
+ $realpossible++;
+ $syval=&encode_symb($bighash{'map_id_'.$mapid},
+ $resid,$thisfn);
+ }
}
}
if ($realpossible!=1) { $syval=''; }
@@ -12646,7 +10842,7 @@ sub symbread {
$syval='';
}
}
- untie(%bighash);
+ untie(%bighash)
}
}
if ($syval) {
@@ -12799,6 +10995,7 @@ sub rndseed {
$which =&get_rand_alg($courseid);
}
if (defined(&getCODE())) {
+
if ($which eq '64bit5') {
return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
} elsif ($which eq '64bit4') {
@@ -12984,12 +11181,8 @@ sub rndseed_CODE_64bit5 {
sub setup_random_from_rndseed {
my ($rndseed)=@_;
if ($rndseed =~/([,:])/) {
- my ($num1,$num2) = map { abs($_); } (split(/[,:]/,$rndseed));
- if ((!$num1) || (!$num2) || ($num1 > 2147483562) || ($num2 > 2147483398)) {
- &Math::Random::random_set_seed_from_phrase($rndseed);
- } else {
- &Math::Random::random_set_seed($num1,$num2);
- }
+ my ($num1,$num2)=split(/[,:]/,$rndseed);
+ &Math::Random::random_set_seed(abs($num1),abs($num2));
} else {
&Math::Random::random_set_seed_from_phrase($rndseed);
}
@@ -13175,10 +11368,9 @@ sub repcopy_userfile {
my $request;
$uri=~s/^\///;
my $homeserver = &homeserver($cnum,$cdom);
- my $hostname = &hostname($homeserver);
my $protocol = $protocol{$homeserver};
$protocol = 'http' if ($protocol ne 'https');
- $request=new HTTP::Request('GET',$protocol.'://'.$hostname.'/raw/'.$uri);
+ $request=new HTTP::Request('GET',$protocol.'://'.&hostname($homeserver).'/raw/'.$uri);
my $response=$ua->request($request,$transferfile);
# did it work?
if ($response->is_error()) {
@@ -13202,10 +11394,9 @@ sub tokenwrapper {
$file=~s|(\?\.*)*$||;
&appenv({"userfile.$udom/$uname/$file" => $env{'request.course.id'}});
my $homeserver = &homeserver($uname,$udom);
- my $hostname = &hostname($homeserver);
my $protocol = $protocol{$homeserver};
$protocol = 'http' if ($protocol ne 'https');
- return $protocol.'://'.$hostname.'/'.$uri.
+ return $protocol.'://'.&hostname($homeserver).'/'.$uri.
(($uri=~/\?/)?'&':'?').'token='.$token.
'&tokenissued='.$perlvar{'lonHostID'};
} else {
@@ -13221,10 +11412,9 @@ sub getuploaded {
my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_;
$uri=~s/^\///;
my $homeserver = &homeserver($cnum,$cdom);
- my $hostname = &hostname($homeserver);
my $protocol = $protocol{$homeserver};
$protocol = 'http' if ($protocol ne 'https');
- $uri = $protocol.'://'.$hostname.'/raw/'.$uri;
+ $uri = $protocol.'://'.&hostname($homeserver).'/raw/'.$uri;
my $ua=new LWP::UserAgent;
my $request=new HTTP::Request($reqtype,$uri);
my $response=$ua->request($request);
@@ -13244,7 +11434,7 @@ sub readfile {
my $file = shift;
if ( (! -e $file ) || ($file eq '') ) { return -1; };
my $fh;
- open($fh,"<",$file);
+ open($fh,"<$file");
my $a='';
while (my $line = <$fh>) { $a .= $line; }
return $a;
@@ -13357,7 +11547,7 @@ sub machine_ids {
sub additional_machine_domains {
my @domains;
- open(my $fh,"<","$perlvar{'lonTabDir'}/expected_domains.tab");
+ open(my $fh,"<$perlvar{'lonTabDir'}/expected_domains.tab");
while( my $line = <$fh>) {
$line =~ s/\s//g;
push(@domains,$line);
@@ -13378,88 +11568,12 @@ sub default_login_domain {
return $domain;
}
-sub shared_institution {
- my ($dom,$lonhost) = @_;
- if ($lonhost eq '') {
- $lonhost = $perlvar{'lonHostID'};
- }
- my $same_intdom;
- my $hostintdom = &internet_dom($lonhost);
- if ($hostintdom ne '') {
- my %iphost = &get_iphost();
- my $primary_id = &domain($dom,'primary');
- my $primary_ip = &get_host_ip($primary_id);
- if (ref($iphost{$primary_ip}) eq 'ARRAY') {
- foreach my $id (@{$iphost{$primary_ip}}) {
- my $intdom = &internet_dom($id);
- if ($intdom eq $hostintdom) {
- $same_intdom = 1;
- last;
- }
- }
- }
- }
- return $same_intdom;
-}
-
-sub uses_sts {
- my ($ignore_cache) = @_;
- my $lonhost = $perlvar{'lonHostID'};
- my $hostname = &hostname($lonhost);
- my $sts_on;
- if ($protocol{$lonhost} eq 'https') {
- my $cachetime = 12*3600;
- if (!$ignore_cache) {
- ($sts_on,my $cached)=&is_cached_new('stspolicy',$lonhost);
- if (defined($cached)) {
- return $sts_on;
- }
- }
- my $ua=new LWP::UserAgent;
- my $url = $protocol{$lonhost}.'://'.$hostname.'/index.html';
- my $request=new HTTP::Request('HEAD',$url);
- my $response=$ua->request($request);
- if ($response->is_success) {
- my $has_sts = $response->header('Strict-Transport-Security');
- if ($has_sts eq '') {
- $sts_on = 0;
- } else {
- if ($has_sts =~ /\Qmax-age=\E(\d+)/) {
- my $maxage = $1;
- if ($maxage) {
- $sts_on = 1;
- } else {
- $sts_on = 0;
- }
- } else {
- $sts_on = 0;
- }
- }
- return &do_cache_new('stspolicy',$lonhost,$sts_on,$cachetime);
- }
- }
- return;
-}
-
-sub get_requestor_ip {
- my ($r,$nolookup,$noproxy) = @_;
- my $from_ip;
- if (ref($r)) {
- $from_ip = $r->get_remote_host($nolookup);
- } else {
- $from_ip = $ENV{'REMOTE_ADDR'};
- }
- return $from_ip;
-}
-
# ------------------------------------------------------------- Declutters URLs
sub declutter {
my $thisfn=shift;
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
- unless ($thisfn=~m{^/home/httpd/html/priv/}) {
- $thisfn=~s{^/home/httpd/html}{};
- }
+ $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
$thisfn=~s/^\///;
$thisfn=~s|^adm/wrapper/||;
$thisfn=~s|^adm/coursedocs/showdoc/||;
@@ -13575,20 +11689,18 @@ sub get_dns {
}
my %alldns;
- if (open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab")) {
- foreach my $dns (<$config>) {
- next if ($dns !~ /^\^(\S*)/x);
- my $line = $1;
- my ($host,$protocol) = split(/:/,$line);
- if ($protocol ne 'https') {
- $protocol = 'http';
- }
- $alldns{$host} = $protocol;
+ open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
+ foreach my $dns (<$config>) {
+ next if ($dns !~ /^\^(\S*)/x);
+ my $line = $1;
+ my ($host,$protocol) = split(/:/,$line);
+ if ($protocol ne 'https') {
+ $protocol = 'http';
}
- close($config);
+ $alldns{$host} = $protocol;
}
while (%alldns) {
- my ($dns) = sort { $b cmp $a } keys(%alldns);
+ my ($dns) = keys(%alldns);
my $ua=new LWP::UserAgent;
$ua->timeout(30);
my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url");
@@ -13596,53 +11708,34 @@ sub get_dns {
delete($alldns{$dns});
next if ($response->is_error());
my @content = split("\n",$response->content);
- unless ($nocache) {
+ unless ($nocache) {
&do_cache_new('dns',$url,\@content,30*24*60*60);
- }
+ }
&$func(\@content,$hashref);
return;
}
+ close($config);
my $which = (split('/',$url))[3];
&logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
- if (open(my $config,"<","$perlvar{'lonTabDir'}/dns_$which.tab")) {
- my @content = <$config>;
- &$func(\@content,$hashref);
- }
+ open($config,"<$perlvar{'lonTabDir'}/dns_$which.tab");
+ my @content = <$config>;
+ &$func(\@content,$hashref);
return;
}
# ------------------------------------------------------Get DNS checksums file
sub parse_dns_checksums_tab {
my ($lines,$hashref) = @_;
- my $lonhost = $perlvar{'lonHostID'};
- my $machine_dom = &Apache::lonnet::host_domain($lonhost);
+ my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
my $loncaparev = &get_server_loncaparev($machine_dom);
- my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0];
- my $webconfdir = '/etc/httpd/conf';
- if ($distro =~ /^(ubuntu|debian)(\d+)$/) {
- $webconfdir = '/etc/apache2';
- } elsif ($distro =~ /^sles(\d+)$/) {
- if ($1 >= 10) {
- $webconfdir = '/etc/apache2';
- }
- } elsif ($distro =~ /^suse(\d+\.\d+)$/) {
- if ($1 >= 10.0) {
- $webconfdir = '/etc/apache2';
- }
- }
my ($release,$timestamp) = split(/\-/,$loncaparev);
my (%chksum,%revnum);
if (ref($lines) eq 'ARRAY') {
chomp(@{$lines});
my $version = shift(@{$lines});
- if ($version eq $release) {
+ if ($version eq $release) {
foreach my $line (@{$lines}) {
my ($file,$version,$shasum) = split(/,/,$line);
- if ($file =~ m{^/etc/httpd/conf}) {
- if ($webconfdir eq '/etc/apache2') {
- $file =~ s{^\Q/etc/httpd/conf/\E}{$webconfdir/};
- }
- }
$chksum{$file} = $shasum;
$revnum{$file} = $version;
}
@@ -13660,7 +11753,7 @@ sub parse_dns_checksums_tab {
sub fetch_dns_checksums {
my %checksums;
my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
- my $loncaparev = &get_server_loncaparev($machine_dom,$perlvar{'lonHostID'});
+ my $loncaparev = &get_server_loncaparev($machine_dom);
my ($release,$timestamp) = split(/\-/,$loncaparev);
&get_dns("/adm/dns/checksums/$release",\&parse_dns_checksums_tab,1,1,
\%checksums);
@@ -13695,10 +11788,10 @@ sub fetch_dns_checksums {
}
sub load_domain_tab {
- my ($ignore_cache,$nocache) = @_;
- &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache);
+ my ($ignore_cache) = @_;
+ &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache);
my $fh;
- if (open($fh,"<",$perlvar{'lonTabDir'}.'/domain.tab')) {
+ if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) {
my @lines = <$fh>;
&parse_domain_tab(\@lines);
}
@@ -13750,23 +11843,8 @@ sub fetch_dns_checksums {
my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline);
$name=~s/\s//g;
if ($id && $domain && $role && $name) {
- if ((exists($hostname{$id})) && ($hostname{$id} ne '')) {
- my $curr = $hostname{$id};
- my $skip;
- if (ref($name_to_host{$curr}) eq 'ARRAY') {
- if (($curr eq $name) && (@{$name_to_host{$curr}} == 1)) {
- $skip = 1;
- } else {
- @{$name_to_host{$curr}} = grep { $_ ne $id } @{$name_to_host{$curr}};
- }
- }
- unless ($skip) {
- push(@{$name_to_host{$name}},$id);
- }
- } else {
- push(@{$name_to_host{$name}},$id);
- }
$hostname{$id}=$name;
+ push(@{$name_to_host{$name}}, $id);
$hostdom{$id}=$domain;
if ($role eq 'library') { $libserv{$id}=$name; }
if (defined($protocol)) {
@@ -13797,9 +11875,9 @@ sub fetch_dns_checksums {
}
sub load_hosts_tab {
- my ($ignore_cache,$nocache) = @_;
- &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache);
- open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab");
+ my ($ignore_cache) = @_;
+ &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache);
+ open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
my @config = <$config>;
&parse_hosts_tab(\@config);
close($config);
@@ -13820,8 +11898,7 @@ sub fetch_dns_checksums {
}
sub all_names {
- my ($ignore_cache,$nocache) = @_;
- &load_hosts_tab($ignore_cache,$nocache) if (!$loaded);
+ &load_hosts_tab() if (!$loaded);
return %name_to_host;
}
@@ -13943,7 +12020,7 @@ sub fetch_dns_checksums {
}
sub get_iphost {
- my ($ignore_cache,$nocache) = @_;
+ my ($ignore_cache) = @_;
if (!$ignore_cache) {
if (%iphost) {
@@ -13967,7 +12044,7 @@ sub fetch_dns_checksums {
%old_name_to_ip = %{$ip_info->[1]};
}
- my %name_to_host = &all_names($ignore_cache,$nocache);
+ my %name_to_host = &all_names();
foreach my $name (keys(%name_to_host)) {
my $ip;
if (!exists($name_to_ip{$name})) {
@@ -13992,11 +12069,9 @@ sub fetch_dns_checksums {
}
push(@{$iphost{$ip}},@{$name_to_host{$name}});
}
- unless ($nocache) {
- &do_cache_new('iphost','iphost',
- [\%iphost,\%name_to_ip,\%lonid_to_ip],
- 48*60*60);
- }
+ &do_cache_new('iphost','iphost',
+ [\%iphost,\%name_to_ip,\%lonid_to_ip],
+ 48*60*60);
return %iphost;
}
@@ -14058,14 +12133,14 @@ sub fetch_dns_checksums {
}
sub all_loncaparevs {
- return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11);
+ return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10);
}
-# ------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
{
- sub load_loncaparevs {
+ sub load_loncaparevs {
if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
- if (open(my $config,"<","$perlvar{'lonTabDir'}/loncaparevs.tab")) {
+ if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
while (my $configline=<$config>) {
chomp($configline);
my ($hostid,$loncaparev)=split(/:/,$configline);
@@ -14077,11 +12152,11 @@ sub all_loncaparevs {
}
}
-# ----------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
{
sub load_serverhomeIDs {
if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
- if (open(my $config,"<","$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
+ if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
while (my $configline=<$config>) {
chomp($configline);
my ($name,$id)=split(/:/,$configline);
@@ -14106,7 +12181,7 @@ BEGIN {
# ------------------------------------------------------ Read spare server file
{
- open(my $config,"<","$perlvar{'lonTabDir'}/spare.tab");
+ open(my $config,"<$perlvar{'lonTabDir'}/spare.tab");
while (my $configline=<$config>) {
chomp($configline);
@@ -14120,7 +12195,7 @@ BEGIN {
}
# ------------------------------------------------------------ Read permissions
{
- open(my $config,"<","$perlvar{'lonTabDir'}/roles.tab");
+ open(my $config,"<$perlvar{'lonTabDir'}/roles.tab");
while (my $configline=<$config>) {
chomp($configline);
@@ -14134,7 +12209,7 @@ BEGIN {
# -------------------------------------------- Read plain texts for permissions
{
- open(my $config,"<","$perlvar{'lonTabDir'}/rolesplain.tab");
+ open(my $config,"<$perlvar{'lonTabDir'}/rolesplain.tab");
while (my $configline=<$config>) {
chomp($configline);
@@ -14154,7 +12229,7 @@ BEGIN {
# ---------------------------------------------------------- Read package table
{
- open(my $config,"<","$perlvar{'lonTabDir'}/packages.tab");
+ open(my $config,"<$perlvar{'lonTabDir'}/packages.tab");
while (my $configline=<$config>) {
if ($configline !~ /\S/ || $configline=~/^#/) { next; }
@@ -14169,11 +12244,11 @@ BEGIN {
close($config);
}
-# --------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
&load_loncaparevs();
-# ------------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
&load_serverhomeIDs();
@@ -14200,7 +12275,7 @@ BEGIN {
# ---------------------------------------------------------- Read managers table
{
if (-e "$perlvar{'lonTabDir'}/managers.tab") {
- if (open(my $config,"<","$perlvar{'lonTabDir'}/managers.tab")) {
+ if (open(my $config,"<$perlvar{'lonTabDir'}/managers.tab")) {
while (my $configline=<$config>) {
chomp($configline);
next if ($configline =~ /^\#/);
@@ -14219,16 +12294,6 @@ BEGIN {
}
-# ------------- set default texengine (domain default overrides this)
-{
- $deftex = LONCAPA::texengine();
-}
-
-# ------------- set default minimum length for passwords for internal auth users
-{
- $passwdmin = LONCAPA::passwd_min();
-}
-
$memcache=new Cache::Memcached({'servers' => ['127.0.0.1:11211'],
'compress_threshold'=> 20_000,
});
@@ -14246,6 +12311,17 @@ $readit=1;
if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
&logthis(" Detected 64bit platform ($_64bit)");
}
+
+ {
+ eval {
+ ($apache) =
+ (Apache2::ServerUtil::get_server_version() =~ m{Apache/(\d+\.\d+)});
+ };
+ if ($@) {
+ $apache = 1.3;
+ }
+ }
+
}
}
@@ -14387,7 +12463,7 @@ were new keys. I.E. 1:foo will become 1:
Calling convention:
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname);
- &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$laststore);
+ &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname);
For more detailed information, see lonnet specific documentation.
@@ -14523,29 +12599,13 @@ escaped strings of the action recorded i
=item *
-allowed($priv,$uri,$symb,$role,$clientip,$noblockcheck) : check for a user privilege;
-returns codes for allowed actions.
-
-The first argument is required, all others are optional.
-
-$priv is the privilege being checked.
-$uri contains additional information about what is being checked for access (e.g.,
-URL, course ID etc.).
-$symb is the unique resource instance identifier in a course; if needed,
-but not provided, it will be retrieved via a call to &symbread().
-$role is the role for which a priv is being checked (only used if priv is evb).
-$clientip is the user's IP address (only used when checking for access to portfolio
-files).
-$noblockcheck, if true, skips calls to &has_comm_blocking() for the bre priv. This
-prevents recursive calls to &allowed.
-
+allowed($priv,$uri,$symb,$role) : check for a user privilege; returns codes for allowed actions
F: full access
U,I,K: authentication modes (cxx only)
'': forbidden
1: user needs to choose course
2: browse allowed
A: passphrase authentication needed
- B: access temporarily blocked because of a blocking event in a course.
=item *
@@ -14564,10 +12624,9 @@ in which case the null string is returne
=item *
-definerole($rolename,$sysrole,$domrole,$courole,$uname,$udom) : define role;
-define a custom role rolename set privileges in format of lonTabs/roles.tab
-for system, domain, and course level. $uname and $udom are optional (current
-user's username and domain will be used when either of $uname or $udom are absent.
+definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
+role rolename set privileges in format of lonTabs/roles.tab for system, domain,
+and course level
=item *
@@ -14598,9 +12657,9 @@ provided for types, will default to retu
=item *
in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if
-user: $uname:$udom has a role in the course: $cdom_$cnum.
+user: $uname:$udom has a role in the course: $cdom_$cnum.
-Additional optional arguments are: $type (if role checking is to be restricted
+Additional optional arguments are: $type (if role checking is to be restricted
to certain user status types -- previous (expired roles), active (currently
available roles) or future (roles available in the future), and
$hideprivileged -- if true will not report course roles for users who
@@ -14771,8 +12830,6 @@ Inputs:
=item $credits, number of credits student will earn from this class
-=item $instsec, institutional course section code for student
-
=back
@@ -14839,7 +12896,7 @@ values that are the resource value. I b
versions are also returned.
get_numsuppfiles($cnum,$cdom) : retrieve number of files in a course's
-supplemental content area. This routine caches the number of files for
+supplemental content area. This routine caches the number of files for
10 minutes.
=back
@@ -14876,88 +12933,6 @@ Returns:
=back
-=head2 Bubblesheet Configuration
-
-=over 4
-
-=item *
-
-get_scantron_config($which)
-
-$which - the name of the configuration to parse from the file.
-
-Parses and returns the bubblesheet configuration line selected as a
-hash of configuration file fields.
-
-
-Returns:
- If the named configuration is not in the file, an empty
- hash is returned.
-
- a hash with the fields
- name - internal name for the this configuration setup
- description - text to display to operator that describes this config
- CODElocation - if 0 or the string 'none'
- - no CODE exists for this config
- if -1 || the string 'letter'
- - a CODE exists for this config and is
- a string of letters
- Unsupported value (but planned for future support)
- if a positive integer
- - The CODE exists as the first n items from
- the question section of the form
- if the string 'number'
- - The CODE exists for this config and is
- a string of numbers
- CODEstart - (only matter if a CODE exists) column in the line where
- the CODE starts
- CODElength - length of the CODE
- IDstart - column where the student/employee ID starts
- IDlength - length of the student/employee ID info
- Qstart - column where the information from the bubbled
- 'questions' start
- Qlength - number of columns comprising a single bubble line from
- the sheet. (usually either 1 or 10)
- Qon - either a single character representing the character used
- to signal a bubble was chosen in the positional setup, or
- the string 'letter' if the letter of the chosen bubble is
- in the final, or 'number' if a number representing the
- chosen bubble is in the file (1->A 0->J)
- Qoff - the character used to represent that a bubble was
- left blank
- PaperID - if the scanning process generates a unique number for each
- sheet scanned the column that this ID number starts in
- PaperIDlength - number of columns that comprise the unique ID number
- for the sheet of paper
- FirstName - column that the first name starts in
- FirstNameLength - number of columns that the first name spans
- LastName - column that the last name starts in
- LastNameLength - number of columns that the last name spans
- BubblesPerRow - number of bubbles available in each row used to
- bubble an answer. (If not specified, 10 assumed).
-
-
-=item *
-
-get_scantronformat_file($cdom)
-
-$cdom - the course's domain (optional); if not supplied, uses
-domain for current $env{'request.course.id'}.
-
-Returns an array containing lines from the scantron format file for
-the domain of the course.
-
-If a url for a custom.tab file is listed in domain's configuration.db,
-lines are from this file.
-
-Otherwise, if a default.tab has been published in RES space by the
-domainconfig user, lines are from this file.
-
-Otherwise, fall back to getting lines from the legacy file on the
-local server: /home/httpd/lonTabs/default_scantronformat.tab
-
-=back
-
=head2 Resource Subroutines
=over 4
@@ -15024,20 +12999,7 @@ will be stored for query
=item *
-symbread($filename,$donotrecurse,$ignorecachednull,$checkforblock,$possibles) :
-return symbolic list entry (all arguments optional).
-
-Args: filename is the filename (including path) for the file for which a symb
-is required; donotrecurse, if true will prevent calls to allowed() being made
-to check access status if more than one resource was found in the bighash
-(see rev. 1.249) to avoid an infinite loop if an ambiguous resource is part of
-a randompick); ignorecachednull, if true will prevent a symb of '' being
-returned if $env{$cache_str} is defined as ''; checkforblock if true will
-cause possible symbs to be checked to determine if they are subject to content
-blocking, if so they will not be included as possible symbs; possibles is a
-ref to a hash, which, as a side effect, will be populated with all possible
-symbs (content blocking not tested).
-
+symbread($filename) : return symbolic list entry (filename argument optional);
returns the data handle
=item *
@@ -15047,9 +13009,9 @@ and is a possible symb for the URL in $t
resource that the user accessed using /enc/ returns a 1 on success, 0
on failure, user must be in a course, as it assumes the existence of
the course initial hash, and uses $env('request.course.id'}. The third
-arg is an optional reference to a scalar. If this arg is passed in the
+arg is an optional reference to a scalar. If this arg is passed in the
call to symbverify, it will be set to 1 if the symb has been set to be
-encrypted; otherwise it will be null.
+encrypted; otherwise it will be null.
=item *
@@ -15102,13 +13064,13 @@ expirespread($uname,$udom,$stype,$usymb)
devalidate($symb) : devalidate temporary spreadsheet calculations,
forcing spreadsheet to reevaluate the resource scores next time.
-=item *
+=item *
can_edit_resource($file,$cnum,$cdom,$resurl,$symb,$group) : determine if current user can edit a particular resource,
when viewing in course context.
input: six args -- filename (decluttered), course number, course domain,
- url, symb (if registered) and group (if this is a
+ url, symb (if registered) and group (if this is a
group item -- e.g., bulletin board, group page etc.).
output: array of five scalars --
@@ -15116,15 +13078,15 @@ when viewing in course context.
$home -- homeserver of resource (i.e., for author if published,
or course if uploaded.).
$switchserver -- 1 if server switch will be needed.
- $forceedit -- 1 if icon/link should be to go to edit mode
+ $forceedit -- 1 if icon/link should be to go to edit mode
$forceview -- 1 if icon/link should be to go to view mode
=item *
is_course_upload($file,$cnum,$cdom)
-Used in course context to determine if current file was uploaded to
-the course (i.e., would be found in /userfiles/docs on the course's
+Used in course context to determine if current file was uploaded to
+the course (i.e., would be found in /userfiles/docs on the course's
homeserver.
input: 3 args -- filename (decluttered), course number and course domain.
@@ -15138,21 +13100,15 @@ homeserver.
=item *
-store($storehash,$symb,$namespace,$udom,$uname,$laststore) : stores hash
-permanently for this url; hashref needs to be given and should be a \%hashname;
-the remaining args aren't required and if they aren't passed or are '' they will
-be derived from the env (with the exception of $laststore, which is an
-optional arg used when a user's submission is stored in grading).
-$laststore is $version=$timestamp, where $version is the most recent version
-number retrieved for the corresponding $symb in the $namespace db file, and
-$timestamp is the timestamp for that transaction (UNIX time).
-$laststore is currently only passed when cstore() is called by
-structuretags::finalize_storage().
+store($storehash,$symb,$namespace,$udom,$uname) : stores hash permanently
+for this url; hashref needs to be given and should be a \%hashname; the
+remaining args aren't required and if they aren't passed or are '' they will
+be derived from the env
=item *
-cstore($storehash,$symb,$namespace,$udom,$uname,$laststore) : same as store
-but uses critical subroutine
+cstore($storehash,$symb,$namespace,$udom,$uname) : same as store but
+uses critical subroutine
=item *
@@ -15175,11 +13131,10 @@ $range should be either an integer '100'
=item *
-putstore($namespace,$symb,$version,$storehash,$udomain,$uname,$tolog) :
+putstore($namespace,$symb,$version,$storehash,$udomain,$uname) :
replaces a &store() version of data with a replacement set of data
for a particular resource in a namespace passed in the $storehash hash
-reference. If $tolog is true, the transaction is logged in the courselog
-with an action=PUTSTORE.
+reference
=item *
@@ -15289,7 +13244,7 @@ server ($udom and $uhome are optional)
=item *
-get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
+get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
for: authentication, language, quotas, timezone, date locale, and portal URL in
the target domain.
@@ -15323,7 +13278,7 @@ requestcourses: ability to request cours
=over
=item
-official, unofficial, community, textbook
+official, unofficial, community
=back
@@ -15333,7 +13288,7 @@ inststatus: types of institutional affil
=over
=item
-inststatustypes, inststatusorder, inststatusguest
+inststatustypes, inststatusorder
=back
@@ -15344,8 +13299,7 @@ for course's uploaded content.
=over
=item
-canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota,
-communityquota, textbookquota
+canuse_pdfforms, officialcredits, unofficialcredits, officialquota, unofficialquota, communityquota
=back
@@ -15355,7 +13309,7 @@ on your servers.
=over
-=item
+=item
remotesessions, hostedsessions
=back
@@ -15363,10 +13317,10 @@ remotesessions, hostedsessions
=back
In cases where a domain coordinator has never used the "Set Domain Configuration"
-utility to create a configuration.db file on a domain's primary library server
+utility to create a configuration.db file on a domain's primary library server
only the following domain defaults: auth_def, auth_arg_def, lang_def
-- corresponding values are authentication type (internal, krb4, krb5,
-or localauth), initial password or a kerberos realm, language (e.g., en-us) --
+or localauth), initial password or a kerberos realm, language (e.g., en-us) --
will be available. Values are retrieved from cache (if current), unless the
optional $ignore_cache arg is true, or from domain's configuration.db (if available),
or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
@@ -15598,8 +13552,7 @@ filelocation except for hrefs
=item *
-declutter() : declutters URLs -- remove beginning slashes, 'res' etc.
-also removes beginning /home/httpd/html unless /priv/ follows it.
+declutter() : declutters URLs (remove docroot, beginning slashes, 'res' etc)
=back
@@ -15649,7 +13602,6 @@ userspace, probably shouldn't be called
formname: same as for userfileupload()
fname: filename (including subdirectories) for the file
parser: if 'parse', will parse (html) file to extract references to objects, links etc.
- if hashref, and context is scantron, will convert csv format to standard format
allfiles: reference to hash used to store objects found by parser
codebase: reference to hash used for codebases of java objects found by parser
thumbwidth: width (pixels) of thumbnail to be created for uploaded image
@@ -15795,8 +13747,8 @@ Returns:
get_timebased_id():
-Attempts to get a unique timestamp-based suffix for use with items added to a
-course via the Course Editor (e.g., folders, composite pages,
+Attempts to get a unique timestamp-based suffix for use with items added to a
+course via the Course Editor (e.g., folders, composite pages,
group bulletin boards).
Args: (first three required; six others optional)
@@ -15807,24 +13759,24 @@ Args: (first three required; six others
2. keyid (alphanumeric): name of temporary locking key in hash,
e.g., num, boardids
-3. namespace: name of gdbm file used to store suffixes already assigned;
+3. namespace: name of gdbm file used to store suffixes already assigned;
file will be named nohist_namespace.db
4. cdom: domain of course; default is current course domain from %env
5. cnum: course number; default is current course number from %env
-6. idtype: set to concat if an additional digit is to be appended to the
+6. idtype: set to concat if an additional digit is to be appended to the
unix timestamp to form the suffix, if the plain timestamp is already
- in use. Default is to not do this, but simply increment the unix
+ in use. Default is to not do this, but simply increment the unix
timestamp by 1 until a unique key is obtained.
7. who: holder of locking key; defaults to user:domain for user.
-8. locktries: number of attempts to obtain a lock (sleep of 1s before
+8. locktries: number of attempts to obtain a lock (sleep of 1s before
retrying); default is 3.
-9. maxtries: number of attempts to obtain a unique suffix; default is 20.
+9. maxtries: number of attempts to obtain a unique suffix; default is 20.
Returns:
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.