--- loncom/lond 2016/09/24 19:44:15 1.489.2.24
+++ loncom/lond 2013/10/06 20:33:38 1.503
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.489.2.24 2016/09/24 19:44:15 raeburn Exp $
+# $Id: lond,v 1.503 2013/10/06 20:33:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -55,16 +55,13 @@ use LONCAPA::lonssl;
use Fcntl qw(:flock);
use Apache::lonnet;
use Mail::Send;
-use Crypt::Eksblowfish::Bcrypt;
-use Digest::SHA;
-use Encode;
my $DEBUG = 0; # Non zero to enable debug log entries.
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.489.2.24 $'; #' stupid emacs
+my $VERSION='$Revision: 1.503 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
@@ -624,7 +621,7 @@ sub ConfigFileFromSelector {
# String to send to client ("ok" or "refused" if bad file).
#
sub PushFile {
- my $request = shift;
+ my $request = shift;
my ($command, $filename, $contents) = split(":", $request, 3);
&Debug("PushFile");
@@ -654,44 +651,6 @@ sub PushFile {
if($filename eq "host") {
$contents = AdjustHostContents($contents);
- } elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') {
- if ($contents eq '') {
- &logthis('<font color="red"> Pushfile: unable to install '
- .$tablefile." - no data received from push. </font>");
- return 'error: push had no data';
- }
- if (&Apache::lonnet::get_host_ip($clientname)) {
- my $clienthost = &Apache::lonnet::hostname($clientname);
- if ($managers{$clientip} eq $clientname) {
- my $clientprotocol = $Apache::lonnet::protocol{$clientname};
- $clientprotocol = 'http' if ($clientprotocol ne 'https');
- my $url = '/adm/'.$filename;
- $url =~ s{_}{/};
- my $ua=new LWP::UserAgent;
- $ua->timeout(60);
- my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url");
- my $response=$ua->request($request);
- if ($response->is_error()) {
- &logthis('<font color="red"> Pushfile: unable to install '
- .$tablefile." - error attempting to pull data. </font>");
- return 'error: pull failed';
- } else {
- my $result = $response->content;
- chomp($result);
- unless ($result eq $contents) {
- &logthis('<font color="red"> Pushfile: unable to install '
- .$tablefile." - pushed data and pulled data differ. </font>");
- my $pushleng = length($contents);
- my $pullleng = length($result);
- if ($pushleng != $pullleng) {
- return "error: $pushleng vs $pullleng bytes";
- } else {
- return "error: mismatch push and pull";
- }
- }
- }
- }
- }
}
# Install the new file:
@@ -1425,20 +1384,6 @@ sub du2_handler {
# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.
-#
-# If the requested path contains /../ or is:
-#
-# 1. for a directory, and the path does not begin with one of:
-# (a) /home/httpd/html/res/<domain>/
-# (b) /home/httpd/html/res/userfiles/
-# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
-# or is:
-#
-# 2. for a file, and the path (after prepending) does not begin with:
-# /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
-#
-# the response will be "refused".
-#
# Parameters:
# $cmd - The command that dispatched us (ls).
# $ulsdir - The directory path to list... I'm not sure what this
@@ -1460,17 +1405,8 @@ sub ls_handler {
my $rights;
my $ulsout='';
my $ulsfn;
- if ($ulsdir =~m{/\.\./}) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
if (-e $ulsdir) {
if(-d $ulsdir) {
- unless (($ulsdir =~ m{/home/httpd/html/(res/$LONCAPA::match_domain|userfiles)/}) ||
- ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/userfiles/})) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {
undef($obs);
@@ -1494,10 +1430,6 @@ sub ls_handler {
closedir(LSDIR);
}
} else {
- unless ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/}) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}
@@ -1522,20 +1454,6 @@ sub ls_handler {
# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.
-#
-# If the requested path contains /../ or is:
-#
-# 1. for a directory, and the path does not begin with one of:
-# (a) /home/httpd/html/res/<domain>/
-# (b) /home/httpd/html/res/userfiles/
-# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
-# or is:
-#
-# 2. for a file, and the path (after prepending) does not begin with:
-# /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
-#
-# the response will be "refused".
-#
# Parameters:
# $cmd - The command that dispatched us (ls).
# $ulsdir - The directory path to list... I'm not sure what this
@@ -1556,17 +1474,8 @@ sub ls2_handler {
my $rights;
my $ulsout='';
my $ulsfn;
- if ($ulsdir =~m{/\.\./}) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
if (-e $ulsdir) {
if(-d $ulsdir) {
- unless (($ulsdir =~ m{/home/httpd/html/(res/$LONCAPA::match_domain|userfiles)/}) ||
- ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/userfiles/})) {
- &Failure($client,"refused\n","$userinput");
- return 1;
- }
if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {
undef($obs);
@@ -1591,10 +1500,6 @@ sub ls2_handler {
closedir(LSDIR);
}
} else {
- unless ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/}) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}
@@ -1611,22 +1516,6 @@ sub ls2_handler {
# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.
-#
-# If the requested path (after prepending) contains /../ or is:
-#
-# 1. for a directory, and the path does not begin with one of:
-# (a) /home/httpd/html/res/<domain>/
-# (b) /home/httpd/html/res/userfiles/
-# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
-# (d) /home/httpd/html/priv/<domain>/ and client is the homeserver
-#
-# or is:
-#
-# 2. for a file, and the path (after prepending) does not begin with:
-# /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
-#
-# the response will be "refused".
-#
# Parameters:
# $cmd - The command that dispatched us (ls).
# $tail - The tail of the request that invoked us.
@@ -1666,12 +1555,22 @@ sub ls3_handler {
}
my $dir_root = $perlvar{'lonDocRoot'};
- if (($getpropath) || ($getuserdir)) {
+ if ($getpropath) {
if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
$dir_root = &propath($udom,$uname);
$dir_root =~ s/\/$//;
} else {
- &Failure($client,"refused\n",$userinput);
+ &Failure($client,"refused\n","$cmd:$tail");
+ return 1;
+ }
+ } elsif ($getuserdir) {
+ if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
+ my $subdir=$uname.'__';
+ $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+ $dir_root = $Apache::lonnet::perlvar{'lonUsersDir'}
+ ."/$udom/$subdir/$uname";
+ } else {
+ &Failure($client,"refused\n","$cmd:$tail");
return 1;
}
} elsif ($alternate_root ne '') {
@@ -1684,28 +1583,12 @@ sub ls3_handler {
$ulsdir = $dir_root.'/'.$ulsdir;
}
}
- if ($ulsdir =~m{/\.\./}) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
- my $islocal;
- my @machine_ids = &Apache::lonnet::current_machine_ids();
- if (grep(/^\Q$clientname\E$/,@machine_ids)) {
- $islocal = 1;
- }
my $obs;
my $rights;
my $ulsout='';
my $ulsfn;
if (-e $ulsdir) {
if(-d $ulsdir) {
- unless (($getpropath) || ($getuserdir) ||
- ($ulsdir =~ m{/home/httpd/html/(res/$LONCAPA::match_domain|userfiles)/}) ||
- ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/userfiles/}) ||
- (($ulsdir =~ m{/home/httpd/html/priv/$LONCAPA::match_domain/}) && ($islocal))) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {
undef($obs);
@@ -1730,11 +1613,6 @@ sub ls3_handler {
closedir(LSDIR);
}
} else {
- unless (($getpropath) || ($getuserdir) ||
- ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/})) {
- &Failure($client,"refused\n",$userinput);
- return 1;
- }
my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}
@@ -2016,12 +1894,8 @@ sub authenticate_handler {
if (ref($hostedsession) eq 'HASH') {
$hosted = $hostedsession->{'hosted'};
}
- my $loncaparev = $clientversion;
- if ($loncaparev eq '') {
- $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
- }
$canhost = &Apache::lonnet::can_host_session($udom,$clientname,
- $loncaparev,
+ $clientversion,
$remote,$hosted);
}
}
@@ -2101,14 +1975,15 @@ sub change_password_handler {
my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
if ($howpwd eq 'internal') {
&Debug("internal auth");
- my $ncpass = &hash_passwd($udom,$npass);
+ my $salt=time;
+ $salt=substr($salt,6,2);
+ my $ncpass=crypt($npass,$salt);
if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
my $msg="Result of password change for $uname: pwchange_success";
if ($lonhost) {
$msg .= " - request originated from: $lonhost";
}
&logthis($msg);
- &update_passwd_history($uname,$udom,$howpwd,$context);
&Reply($client, "ok\n", $userinput);
} else {
&logthis("Unable to open $uname passwd "
@@ -2117,9 +1992,6 @@ sub change_password_handler {
}
} elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') {
my $result = &change_unix_password($uname, $npass);
- if ($result eq 'ok') {
- &update_passwd_history($uname,$udom,$howpwd,$context);
- }
&logthis("Result of password change for $uname: ".
$result);
&Reply($client, \$result, $userinput);
@@ -2142,42 +2014,6 @@ sub change_password_handler {
}
®ister_handler("passwd", \&change_password_handler, 1, 1, 0);
-sub hash_passwd {
- my ($domain,$plainpass,@rest) = @_;
- my ($salt,$cost);
- if (@rest) {
- $cost = $rest[0];
- # salt is first 22 characters, base-64 encoded by bcrypt
- my $plainsalt = substr($rest[1],0,22);
- $salt = Crypt::Eksblowfish::Bcrypt::de_base64($plainsalt);
- } else {
- my $defaultcost;
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['password'],$domain);
- if (ref($domconfig{'password'}) eq 'HASH') {
- $defaultcost = $domconfig{'password'}{'cost'};
- }
- if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
- $cost = 10;
- } else {
- $cost = $defaultcost;
- }
- # Generate random 16-octet base64 salt
- $salt = "";
- $salt .= pack("C", int rand(256)) for 1..16;
- }
- my $hash = &Crypt::Eksblowfish::Bcrypt::bcrypt_hash({
- key_nul => 1,
- cost => $cost,
- salt => $salt,
- }, Digest::SHA::sha512(Encode::encode('UTF-8',$plainpass)));
-
- my $result = join("!", "", "bcrypt", sprintf("%02d",$cost),
- &Crypt::Eksblowfish::Bcrypt::en_base64($salt).
- &Crypt::Eksblowfish::Bcrypt::en_base64($hash));
- return $result;
-}
-
#
# Create a new user. User in this case means a lon-capa user.
# The user must either already exist in some authentication realm
@@ -2221,8 +2057,7 @@ sub add_user_handler {
."makeuser";
}
unless ($fperror) {
- my $result=&make_passwd_file($uname,$udom,$umode,$npass,
- $passfilename,'makeuser');
+ my $result=&make_passwd_file($uname,$udom,$umode,$npass, $passfilename);
&Reply($client,\$result, $userinput); #BUGBUG - could be fail
} else {
&Failure($client, \$fperror, $userinput);
@@ -2291,14 +2126,12 @@ sub change_authentication_handler {
my $result = &change_unix_password($uname, $npass);
&logthis("Result of password change for $uname: ".$result);
if ($result eq "ok") {
- &update_passwd_history($uname,$udom,$umode,'changeuserauth');
&Reply($client, \$result);
} else {
&Failure($client, \$result);
}
} else {
- my $result=&make_passwd_file($uname,$udom,$umode,$npass,
- $passfilename,'changeuserauth');
+ my $result=&make_passwd_file($uname,$udom,$umode,$npass,$passfilename);
#
# If the current auth mode is internal, and the old auth mode was
# unix, or krb*, and the user is an author for this domain,
@@ -2319,17 +2152,6 @@ sub change_authentication_handler {
}
®ister_handler("changeuserauth", \&change_authentication_handler, 1,1, 0);
-sub update_passwd_history {
- my ($uname,$udom,$umode,$context) = @_;
- my $proname=&propath($udom,$uname);
- my $now = time;
- if (open(my $fh,">>$proname/passwd.log")) {
- print $fh "$now:$umode:$context\n";
- close($fh);
- }
- return;
-}
-
#
# Determines if this is the home server for a user. The home server
# for a user will have his/her lon-capa passwd file. Therefore all we need
@@ -2581,20 +2403,11 @@ sub remove_user_file_handler {
if (-e $file) {
#
# If the file is a regular file unlink is fine...
- # However it's possible the client wants a dir
- # removed, in which case rmdir is more appropriate
- # Note: rmdir will only remove an empty directory.
+ # However it's possible the client wants a dir.
+ # removed, in which case rmdir is more approprate:
#
if (-f $file){
unlink($file);
- # for html files remove the associated .bak file
- # which may have been created by the editor.
- if ($ufile =~ m{^((docs|supplemental)/(?:\d+|default)/\d+(?:|/.+)/)[^/]+\.x?html?$}i) {
- my $path = $1;
- if (-e $file.'.bak') {
- unlink($file.'.bak');
- }
- }
} elsif(-d $file) {
rmdir($file);
}
@@ -2957,10 +2770,6 @@ sub newput_user_profile_entry {
foreach my $pair (@pairs) {
my ($key,$value)=split(/=/,$pair);
if (exists($hashref->{$key})) {
- if (!&untie_user_hash($hashref)) {
- &logthis("error: ".($!+0)." untie (GDBM) failed ".
- "while attempting newput - early out as key exists");
- }
&Failure($client, "key_exists: ".$key."\n",$userinput);
return 1;
}
@@ -3364,6 +3173,17 @@ sub get_profile_keys {
sub dump_profile_database {
my ($cmd, $tail, $client) = @_;
+ my $res = LONCAPA::Lond::dump_profile_database($tail);
+
+ if ($res =~ /^error:/) {
+ Failure($client, \$res, "$cmd:$tail");
+ } else {
+ Reply($client, \$res, "$cmd:$tail");
+ }
+
+ return 1;
+
+ #TODO remove
my $userinput = "$cmd:$tail";
my ($udom,$uname,$namespace) = split(/:/,$tail);
@@ -3443,11 +3263,11 @@ sub dump_with_regexp {
my ($cmd, $tail, $client) = @_;
my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);
-
+
if ($res =~ /^error:/) {
- &Failure($client, \$res, "$cmd:$tail");
+ Failure($client, \$res, "$cmd:$tail");
} else {
- &Reply($client, \$res, "$cmd:$tail");
+ Reply($client, \$res, "$cmd:$tail");
}
return 1;
@@ -3464,9 +3284,6 @@ sub dump_with_regexp {
# namespace - Name of the database being modified
# rid - Resource keyword to modify.
# what - new value associated with rid.
-# laststore - (optional) version=timestamp
-# for most recent transaction for rid
-# in namespace, when cstore was called
#
# $client - Socket open on the client.
#
@@ -3475,47 +3292,23 @@ sub dump_with_regexp {
# 1 (keep on processing).
# Side-Effects:
# Writes to the client
-# Successful storage will cause either 'ok', or, if $laststore was included
-# in the tail of the request, and the version number for the last transaction
-# is larger than the version in $laststore, delay:$numtrans , where $numtrans
-# is the number of store evevnts recorded for rid in namespace since
-# lonnet::store() was called by the client.
-#
sub store_handler {
my ($cmd, $tail, $client) = @_;
my $userinput = "$cmd:$tail";
- chomp($tail);
- my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail);
+ my ($udom,$uname,$namespace,$rid,$what) =split(/:/,$tail);
if ($namespace ne 'roles') {
+ chomp($what);
my @pairs=split(/\&/,$what);
my $hashref = &tie_user_hash($udom, $uname, $namespace,
&GDBM_WRCREAT(), "S",
"$rid:$what");
if ($hashref) {
my $now = time;
- my $numtrans;
- if ($laststore) {
- my ($previousversion,$previoustime) = split(/\=/,$laststore);
- my ($lastversion,$lasttime) = (0,0);
- $lastversion = $hashref->{"version:$rid"};
- if ($lastversion) {
- $lasttime = $hashref->{"$lastversion:$rid:timestamp"};
- }
- if (($previousversion) && ($previousversion !~ /\D/)) {
- if (($lastversion > $previousversion) && ($lasttime >= $previoustime)) {
- $numtrans = $lastversion - $previousversion;
- }
- } elsif ($lastversion) {
- $numtrans = $lastversion;
- }
- if ($numtrans) {
- $numtrans =~ s/D//g;
- }
- }
-
+ my @previouskeys=split(/&/,$hashref->{"keys:$rid"});
+ my $key;
$hashref->{"version:$rid"}++;
my $version=$hashref->{"version:$rid"};
my $allkeys='';
@@ -3528,11 +3321,7 @@ sub store_handler {
$allkeys.='timestamp';
$hashref->{"$version:keys:$rid"}=$allkeys;
if (&untie_user_hash($hashref)) {
- my $msg = 'ok';
- if ($numtrans) {
- $msg = 'delay:'.$numtrans;
- }
- &Reply($client, "$msg\n", $userinput);
+ &Reply($client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting store\n", $userinput);
@@ -4048,9 +3837,7 @@ sub put_course_id_hash_handler {
# creationcontext - include courses created in specified context
#
# domcloner - flag to indicate if user can create CCs in course's domain.
-# If so, ability to clone course is automatic.
-# hasuniquecode - filter by courses for which a six character unique code has
-# been set.
+# If so, ability to clone course is automatic.
#
# $client - The socket open on the client.
# Returns:
@@ -4059,12 +3846,23 @@ sub put_course_id_hash_handler {
# a reply is written to $client.
sub dump_course_id_handler {
my ($cmd, $tail, $client) = @_;
+
+ my $res = LONCAPA::Lond::dump_course_id_handler($tail);
+ if ($res =~ /^error:/) {
+ Failure($client, \$res, "$cmd:$tail");
+ } else {
+ Reply($client, \$res, "$cmd:$tail");
+ }
+
+ return 1;
+
+ #TODO remove
my $userinput = "$cmd:$tail";
my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
$typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden,
$caller,$cloner,$cc_clone_list,$cloneonly,$createdbefore,$createdafter,
- $creationcontext,$domcloner,$hasuniquecode) =split(/:/,$tail);
+ $creationcontext,$domcloner) =split(/:/,$tail);
my $now = time;
my ($cloneruname,$clonerudom,%cc_clone);
if (defined($description)) {
@@ -4137,9 +3935,6 @@ sub dump_course_id_handler {
} else {
$creationcontext = '.';
}
- unless ($hasuniquecode) {
- $hasuniquecode = '.';
- }
my $unpack = 1;
if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' &&
$typefilter eq '.') {
@@ -4228,9 +4023,6 @@ sub dump_course_id_handler {
$selfenroll_end = $items->{'selfenroll_end_date'};
$created = $items->{'created'};
$context = $items->{'context'};
- if ($hasuniquecode ne '.') {
- next unless ($items->{'uniquecode'});
- }
if ($selfenrollonly) {
next if (!$selfenroll_types);
if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
@@ -4665,7 +4457,7 @@ sub get_id_handler {
# Returns:
# 1 - Continue processing
# 0 - Exit server.
-#
+#
#
sub del_id_handler {
@@ -5411,59 +5203,13 @@ sub create_auto_enroll_password_handler
®ister_handler("autocreatepassword", \&create_auto_enroll_password_handler,
0, 1, 0);
-sub auto_export_grades_handler {
- my ($cmd, $tail, $client) = @_;
- my $userinput = "$cmd:$tail";
- my ($cdom,$cnum,$info,$data) = split(/:/,$tail);
- my $inforef = &Apache::lonnet::thaw_unescape($info);
- my $dataref = &Apache::lonnet::thaw_unescape($data);
- my ($outcome,$result);;
- eval {
- local($SIG{__DIE__})='DEFAULT';
- my %rtnhash;
- $outcome=&localenroll::export_grades($cdom,$cnum,$inforef,$dataref,\%rtnhash);
- if ($outcome eq 'ok') {
- foreach my $key (keys(%rtnhash)) {
- $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
- }
- $result =~ s/\&$//;
- }
- };
- if (!$@) {
- if ($outcome eq 'ok') {
- if ($cipher) {
- my $cmdlength=length($result);
- $result.=" ";
- my $encresult='';
- for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
- $encresult.= unpack("H16",
- $cipher->encrypt(substr($result,
- $encidx,
- 8)));
- }
- &Reply( $client, "enc:$cmdlength:$encresult\n", $userinput);
- } else {
- &Failure( $client, "error:no_key\n", $userinput);
- }
- } else {
- &Reply($client, "$outcome\n", $userinput);
- }
- } else {
- &Failure($client,"export_error\n",$userinput);
- }
- return 1;
-}
-®ister_handler("autoexportgrades", \&auto_export_grades_handler,
- 0, 1, 0);
-
-
# Retrieve and remove temporary files created by/during autoenrollment.
#
# Formal Parameters:
# $cmd - The command that got us dispatched.
# $tail - The tail of the command. In our case this is a colon
# separated list that will be split into:
-# $filename - The name of the file to retrieve.
+# $filename - The name of the file to remove.
# The filename is given as a path relative to
# the LonCAPA temp file directory.
# $client - Socket open on the client.
@@ -5477,11 +5223,7 @@ sub retrieve_auto_file_handler {
my ($filename) = split(/:/, $tail);
my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
- if ($filename =~m{/\.\./}) {
- &Failure($client, "refused\n", $userinput);
- } elsif ($filename !~ /^$LONCAPA::match_domain\_$LONCAPA::match_courseid\_.+_classlist\.xml$/) {
- &Failure($client, "refused\n", $userinput);
- } elsif ( (-e $source) && ($filename ne '') ) {
+ if ( (-e $source) && ($filename ne '') ) {
my $reply = '';
if (open(my $fh,$source)) {
while (<$fh>) {
@@ -5513,7 +5255,7 @@ sub crsreq_checks_handler {
my $userinput = "$cmd:$tail";
my $dom = $tail;
my $result;
- my @reqtypes = ('official','unofficial','community','textbook');
+ my @reqtypes = ('official','unofficial','community');
eval {
local($SIG{__DIE__})='DEFAULT';
my %validations;
@@ -5540,20 +5282,19 @@ sub crsreq_checks_handler {
sub validate_crsreq_handler {
my ($cmd, $tail, $client) = @_;
my $userinput = "$cmd:$tail";
- my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$customdata) = split(/:/, $tail);
+ my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = split(/:/, $tail);
$instcode = &unescape($instcode);
$owner = &unescape($owner);
$crstype = &unescape($crstype);
$inststatuslist = &unescape($inststatuslist);
$instcode = &unescape($instcode);
$instseclist = &unescape($instseclist);
- my $custominfo = &Apache::lonnet::thaw_unescape($customdata);
my $outcome;
eval {
local($SIG{__DIE__})='DEFAULT';
$outcome = &localenroll::validate_crsreq($dom,$owner,$crstype,
$inststatuslist,$instcode,
- $instseclist,$custominfo);
+ $instseclist);
};
if (!$@) {
&Reply($client, \$outcome, $userinput);
@@ -5564,53 +5305,6 @@ sub validate_crsreq_handler {
}
®ister_handler("autocrsreqvalidation", \&validate_crsreq_handler, 0, 1, 0);
-sub crsreq_update_handler {
- my ($cmd, $tail, $client) = @_;
- my $userinput = "$cmd:$tail";
- my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,$code,
- $accessstart,$accessend,$infohashref) =
- split(/:/, $tail);
- $crstype = &unescape($crstype);
- $action = &unescape($action);
- $ownername = &unescape($ownername);
- $ownerdomain = &unescape($ownerdomain);
- $fullname = &unescape($fullname);
- $title = &unescape($title);
- $code = &unescape($code);
- $accessstart = &unescape($accessstart);
- $accessend = &unescape($accessend);
- my $incoming = &Apache::lonnet::thaw_unescape($infohashref);
- my ($result,$outcome);
- eval {
- local($SIG{__DIE__})='DEFAULT';
- my %rtnhash;
- $outcome = &localenroll::crsreq_updates($cdom,$cnum,$crstype,$action,
- $ownername,$ownerdomain,$fullname,
- $title,$code,$accessstart,$accessend,
- $incoming,\%rtnhash);
- if ($outcome eq 'ok') {
- my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript);
- foreach my $key (keys(%rtnhash)) {
- if (grep(/^\Q$key\E/,@posskeys)) {
- $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
- }
- }
- $result =~ s/\&$//;
- }
- };
- if (!$@) {
- if ($outcome eq 'ok') {
- &Reply($client, \$result, $userinput);
- } else {
- &Reply($client, "format_error\n", $userinput);
- }
- } else {
- &Failure($client,"unknown_cmd\n",$userinput);
- }
- return 1;
-}
-®ister_handler("autocrsrequpdate", \&crsreq_update_handler, 0, 1, 0);
-
#
# Read and retrieve institutional code format (for support form).
# Formal Parameters:
@@ -6558,6 +6252,9 @@ sub Debug {
# reply - Text to send to client.
# request - Original request from client.
#
+#NOTE $reply must be terminated by exactly *one* \n. If $reply is a reference
+#this is done automatically ($$reply must not contain any \n in this case).
+#If $reply is a string the caller has to ensure this.
sub Reply {
my ($fd, $reply, $request) = @_;
if (ref($reply)) {
@@ -6803,28 +6500,11 @@ sub make_new_child {
# my $tmpsnum=0; # Now global
#---------------------------------------------------- kerberos 5 initialization
&Authen::Krb5::init_context();
-
- my $no_ets;
- if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {
- if ($1 >= 7) {
- $no_ets = 1;
- }
- } elsif ($dist =~ /^suse(\d+\.\d+)$/) {
- if (($1 eq '9.3') || ($1 >= 12.2)) {
- $no_ets = 1;
- }
- } elsif ($dist =~ /^sles(\d+)$/) {
- if ($1 > 11) {
- $no_ets = 1;
- }
- } elsif ($dist =~ /^fedora(\d+)$/) {
- if ($1 < 7) {
- $no_ets = 1;
- }
- }
- unless ($no_ets) {
- &Authen::Krb5::init_ets();
- }
+ unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||
+ ($dist eq 'fedora6') || ($dist eq 'suse9.3') ||
+ ($dist eq 'suse12.2') || ($dist eq 'suse12.3')) {
+ &Authen::Krb5::init_ets();
+ }
&status('Accepted connection');
# =============================================================================
@@ -6867,13 +6547,14 @@ sub make_new_child {
#
# If the remote is attempting a local init... give that a try:
#
+ logthis("remotereq: $remotereq");
(my $i, my $inittype, $clientversion) = split(/:/, $remotereq);
- # For LON-CAPA 2.9, the client session will have sent its LON-CAPA
- # version when initiating the connection. For LON-CAPA 2.8 and older,
- # the version is retrieved from the global %loncaparevs in lonnet.pm.
- # $clientversion contains path to keyfile if $inittype eq 'local'
- # it's overridden below in this case
- $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};
+ # For LON-CAPA 2.9, the client session will have sent its LON-CAPA
+ # version when initiating the connection. For LON-CAPA 2.8 and older,
+ # the version is retrieved from the global %loncaparevs in lonnet.pm.
+ # $clientversion contains path to keyfile if $inittype eq 'local'
+ # it's overridden below in this case
+ $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};
# If the connection type is ssl, but I didn't get my
# certificate files yet, then I'll drop back to
@@ -7207,18 +6888,7 @@ sub validate_user {
}
if ($howpwd ne 'nouser') {
if($howpwd eq "internal") { # Encrypted is in local password file.
- if (length($contentpwd) == 13) {
- $validated = (crypt($password,$contentpwd) eq $contentpwd);
- if ($validated) {
- my $ncpass = &hash_passwd($domain,$password);
- if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass")) {
- &update_passwd_history($user,$domain,$howpwd,'conversion');
- &logthis("Validated password hashed with bcrypt for $user:$domain");
- }
- }
- } else {
- $validated = &check_internal_passwd($password,$contentpwd,$domain);
- }
+ $validated = (crypt($password, $contentpwd) eq $contentpwd);
}
elsif ($howpwd eq "unix") { # User is a normal unix user.
$contentpwd = (getpwnam($user))[1];
@@ -7286,39 +6956,6 @@ sub validate_user {
return $validated;
}
-sub check_internal_passwd {
- my ($plainpass,$stored,$domain) = @_;
- my (undef,$method,@rest) = split(/!/,$stored);
- if ($method eq "bcrypt") {
- my $result = &hash_passwd($domain,$plainpass,@rest);
- if ($result ne $stored) {
- return 0;
- }
- # Upgrade to a larger number of rounds if necessary
- my $defaultcost;
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['password'],$domain);
- if (ref($domconfig{'password'}) eq 'HASH') {
- $defaultcost = $domconfig{'password'}{'cost'};
- }
- if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
- $defaultcost = 10;
- }
- return 1 unless($rest[0]<$defaultcost);
- }
- return 0;
-}
-
-sub get_last_authchg {
- my ($domain,$user) = @_;
- my $lastmod;
- my $logname = &propath($domain,$user).'/passwd.log';
- if (-e "$logname") {
- $lastmod = (stat("$logname"))[9];
- }
- return $lastmod;
-}
-
sub krb4_authen {
my ($password,$null,$user,$contentpwd) = @_;
my $validated = 0;
@@ -7634,26 +7271,26 @@ sub change_unix_password {
sub make_passwd_file {
- my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;
+ my ($uname,$udom,$umode,$npass,$passfilename)=@_;
my $result="ok";
if ($umode eq 'krb4' or $umode eq 'krb5') {
{
my $pf = IO::File->new(">$passfilename");
if ($pf) {
print $pf "$umode:$npass\n";
- &update_passwd_history($uname,$udom,$umode,$action);
} else {
$result = "pass_file_failed_error";
}
}
} elsif ($umode eq 'internal') {
- my $ncpass = &hash_passwd($udom,$npass);
+ my $salt=time;
+ $salt=substr($salt,6,2);
+ my $ncpass=crypt($npass,$salt);
{
&Debug("Creating internal auth");
my $pf = IO::File->new(">$passfilename");
if($pf) {
print $pf "internal:$ncpass\n";
- &update_passwd_history($uname,$udom,$umode,$action);
} else {
$result = "pass_file_failed_error";
}
@@ -7663,7 +7300,6 @@ sub make_passwd_file {
my $pf = IO::File->new(">$passfilename");
if($pf) {
print $pf "localauth:$npass\n";
- &update_passwd_history($uname,$udom,$umode,$action);
} else {
$result = "pass_file_failed_error";
}
@@ -7735,6 +7371,8 @@ sub get_usersession_config {
}
+
+
sub distro_and_arch {
return $dist.':'.$arch;
}
@@ -8063,6 +7701,8 @@ Authen::Krb5
=head1 COREQUISITES
+none
+
=head1 OSNAMES
linux
@@ -8150,9 +7790,9 @@ or the CA's certificate in the call to l
<error> is the textual reason this failed. Usual reasons:
=over 2
-
+
=item Apache config file for loncapa incorrect:
-
+
one of the variables
lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate
undefined or incorrect
@@ -8271,7 +7911,7 @@ Could not rewrite the
internal password file for a user
=item Result of password change for <user> : <result>
-
+
A unix password change for <user> was attempted
and the pipe returned <result>
@@ -8300,7 +7940,7 @@ lond has been asked to exit by its clien
client systemand <input> is the full exit command sent to the server.
=item Red CRITICAL: ABNORMAL EXIT. child <pid> for server <hostname> died through a crass with this error->[<message>].
-
+
A lond child terminated. NOte that this termination can also occur when the
child receives the QUIT or DIE signals. <pid> is the process id of the child,
<hostname> the host lond is working for, and <message> the reason the child died
@@ -8384,7 +8024,7 @@ file when sent it's USR1 signal. That p
assumed to be hung in some un-fixable way.
=item Finished checking children
-
+
Master processs's USR1 processing is cojmplete.
=item (Red) CRITICAL: ------- Starting ------
@@ -8398,7 +8038,7 @@ Started a new child process for <client>
connected to the child. This was as a result of a TCP/IP connection from a client.
=item Unable to determine who caller was, getpeername returned nothing
-
+
In child process initialization. either getpeername returned undef or
a zero sized object was returned. Processing continues, but in my opinion,
this should be cause for the child to exit.
@@ -8409,7 +8049,7 @@ In child process initialization. The pe
The client address is stored as "Unavailable" and processing continues.
=item (Yellow) INFO: Connection <ip> <name> connection type = <type>
-
+
In child initialization. A good connectionw as received from <ip>.
=over 2
@@ -8459,7 +8099,7 @@ The client (<client> is the peer's name
negotiated an SSL connection with this child process.
=item (Green) Successful insecure authentication with <client>
-
+
The client has successfully negotiated an insecure connection withthe child process.