--- loncom/lond 2004/08/29 04:12:18 1.245
+++ loncom/lond 2009/07/25 15:25:10 1.417
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.245 2004/08/29 04:12:18 albertel Exp $
+# $Id: lond,v 1.417 2009/07/25 15:25:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,44 +31,44 @@
use strict;
use lib '/home/httpd/lib/perl/';
+use LONCAPA;
use LONCAPA::Configuration;
use IO::Socket;
use IO::File;
#use Apache::File;
-use Symbol;
use POSIX;
use Crypt::IDEA;
use LWP::UserAgent();
+use Digest::MD5 qw(md5_hex);
use GDBM_File;
use Authen::Krb4;
use Authen::Krb5;
-use lib '/home/httpd/lib/perl/';
use localauth;
use localenroll;
+use localstudentphoto;
use File::Copy;
-use LONCAPA::ConfigFileEdit;
+use File::Find;
use LONCAPA::lonlocal;
use LONCAPA::lonssl;
use Fcntl qw(:flock);
+use Apache::lonnet;
my $DEBUG = 0; # Non zero to enable debug log entries.
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.245 $'; #' stupid emacs
+my $VERSION='$Revision: 1.417 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
my $client;
my $clientip; # IP address of client.
-my $clientdns; # DNS name of client.
my $clientname; # LonCAPA name of client.
my $server;
-my $thisserver; # DNS of us.
my $keymode;
@@ -84,11 +84,6 @@ my $tmpsnum = 0; # Id of tmpputs.
my $ConnectionType;
-my %hostid; # ID's for hosts in cluster by ip.
-my %hostdom; # LonCAPA domain for hosts in cluster.
-my %hostip; # IPs for hosts in cluster.
-my %hostdns; # ID's of hosts looked up by DNS name.
-
my %managers; # Ip -> manager names
my %perlvar; # Will have the apache conf defined perl vars.
@@ -112,20 +107,20 @@ my %Dispatcher;
#
my $lastpwderror = 13; # Largest error number from lcpasswd.
my @passwderrors = ("ok",
- "lcpasswd must be run as user 'www'",
- "lcpasswd got incorrect number of arguments",
- "lcpasswd did not get the right nubmer of input text lines",
- "lcpasswd too many simultaneous pwd changes in progress",
- "lcpasswd User does not exist.",
- "lcpasswd Incorrect current passwd",
- "lcpasswd Unable to su to root.",
- "lcpasswd Cannot set new passwd.",
- "lcpasswd Username has invalid characters",
- "lcpasswd Invalid characters in password",
- "lcpasswd User already exists",
- "lcpasswd Something went wrong with user addition.",
- "lcpasswd Password mismatch",
- "lcpasswd Error filename is invalid");
+ "pwchange_failure - lcpasswd must be run as user 'www'",
+ "pwchange_failure - lcpasswd got incorrect number of arguments",
+ "pwchange_failure - lcpasswd did not get the right nubmer of input text lines",
+ "pwchange_failure - lcpasswd too many simultaneous pwd changes in progress",
+ "pwchange_failure - lcpasswd User does not exist.",
+ "pwchange_failure - lcpasswd Incorrect current passwd",
+ "pwchange_failure - lcpasswd Unable to su to root.",
+ "pwchange_failure - lcpasswd Cannot set new passwd.",
+ "pwchange_failure - lcpasswd Username has invalid characters",
+ "pwchange_failure - lcpasswd Invalid characters in password",
+ "pwchange_failure - lcpasswd User already exists",
+ "pwchange_failure - lcpasswd Something went wrong with user addition.",
+ "pwchange_failure - lcpasswd Password mismatch",
+ "pwchange_failure - lcpasswd Error filename is invalid");
# The array below are lcuseradd error strings.:
@@ -140,13 +135,23 @@ my @adderrors = ("ok",
"lcuseradd Unable to make www member of users's group",
"lcuseradd Unable to su to root",
"lcuseradd Unable to set password",
- "lcuseradd Usrname has invalid characters",
+ "lcuseradd Username has invalid characters",
"lcuseradd Password has an invalid character",
"lcuseradd User already exists",
"lcuseradd Could not add user.",
"lcuseradd Password mismatch");
+# This array are the errors from lcinstallfile:
+
+my @installerrors = ("ok",
+ "Initial user id of client not that of www",
+ "Usage error, not enough command line arguments",
+ "Source file name does not exist",
+ "Destination file name does not exist",
+ "Some file operation failed",
+ "Invalid table filename."
+ );
#
# Statistics that are maintained and dislayed in the status line.
@@ -176,20 +181,16 @@ sub ResetStatistics {
# $Socket - Socket open on client.
# $initcmd - The full text of the init command.
#
-# Implicit inputs:
-# $clientdns - The DNS name of the remote client.
-# $thisserver - Our DNS name.
-#
# Returns:
# IDEA session key on success.
# undef on failure.
#
sub LocalConnection {
my ($Socket, $initcmd) = @_;
- Debug("Attempting local connection: $initcmd client: $clientdns me: $thisserver");
- if($clientdns ne $thisserver) {
+ Debug("Attempting local connection: $initcmd client: $clientip");
+ if($clientip ne "127.0.0.1") {
&logthis(' LocalConnection rejecting non local: '
- ."$clientdns ne $thisserver ");
+ ."$clientip ne 127.0.0.1 ");
close $Socket;
return undef;
} else {
@@ -331,8 +332,43 @@ sub InsecureConnection {
}
-
#
+# Safely execute a command (as long as it's not a shel command and doesn
+# not require/rely on shell escapes. The function operates by doing a
+# a pipe based fork and capturing stdout and stderr from the pipe.
+#
+# Formal Parameters:
+# $line - A line of text to be executed as a command.
+# Returns:
+# The output from that command. If the output is multiline the caller
+# must know how to split up the output.
+#
+#
+sub execute_command {
+ my ($line) = @_;
+ my @words = split(/\s/, $line); # Bust the command up into words.
+ my $output = "";
+
+ my $pid = open(CHILD, "-|");
+
+ if($pid) { # Parent process
+ Debug("In parent process for execute_command");
+ my @data = ; # Read the child's outupt...
+ close CHILD;
+ foreach my $output_line (@data) {
+ Debug("Adding $output_line");
+ $output .= $output_line; # Presumably has a \n on it.
+ }
+
+ } else { # Child process
+ close (STDERR);
+ open (STDERR, ">&STDOUT");# Combine stderr, and stdout...
+ exec(@words); # won't return.
+ }
+ return $output;
+}
+
+
# GetCertificate: Given a transaction that requires a certificate,
# this function will extract the certificate from the transaction
# request. Note that at this point, the only concept of a certificate
@@ -372,6 +408,7 @@ sub isClient {
#
sub ReadManagerTable {
+ &Debug("Reading manager table");
# Clean out the old table first..
foreach my $key (keys %managers) {
@@ -388,7 +425,7 @@ sub ReadManagerTable {
if ($host =~ "^#") { # Comment line.
next;
}
- if (!defined $hostip{$host}) { # This is a non cluster member
+ if (!defined &Apache::lonnet::get_host_ip($host)) { # This is a non cluster member
# The entry is of the form:
# cluname:hostname
# cluname - A 'cluster hostname' is needed in order to negotiate
@@ -406,7 +443,7 @@ sub ReadManagerTable {
}
} else {
logthis(' existing host'." $host\n");
- $managers{$hostip{$host}} = $host; # Use info from cluster tab if clumemeber
+ $managers{&Apache::lonnet::get_host_ip($host)} = $host; # Use info from cluster tab if clumemeber
}
}
}
@@ -438,39 +475,11 @@ sub CopyFile {
my ($oldfile, $newfile) = @_;
- # The file must exist:
-
- if(-e $oldfile) {
-
- # Read the old file.
-
- my $oldfh = IO::File->new("< $oldfile");
- if(!$oldfh) {
- return 0;
- }
- my @contents = <$oldfh>; # Suck in the entire file.
-
- # write the backup file:
-
- my $newfh = IO::File->new("> $newfile");
- if(!(defined $newfh)){
- return 0;
- }
- my $lines = scalar @contents;
- for (my $i =0; $i < $lines; $i++) {
- print $newfh ($contents[$i]);
- }
-
- $oldfh->close;
- $newfh->close;
-
- chmod(0660, $newfile);
-
- return 1;
-
- } else {
- return 0;
+ if (! copy($oldfile,$newfile)) {
+ return 0;
}
+ chmod(0660, $newfile);
+ return 1;
}
#
# Host files are passed out with externally visible host IPs.
@@ -495,38 +504,36 @@ sub AdjustHostContents {
my $adjusted;
my $me = $perlvar{'lonHostID'};
- foreach my $line (split(/\n/,$contents)) {
+ foreach my $line (split(/\n/,$contents)) {
if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/))) {
chomp($line);
my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line);
if ($id eq $me) {
- my $ip = gethostbyname($name);
- my $ipnew = inet_ntoa($ip);
- $ip = $ipnew;
+ my $ip = gethostbyname($name);
+ my $ipnew = inet_ntoa($ip);
+ $ip = $ipnew;
# Reconstruct the host line and append to adjusted:
- my $newline = "$id:$domain:$role:$name:$ip";
- if($maxcon ne "") { # Not all hosts have loncnew tuning params
- $newline .= ":$maxcon:$idleto:$mincon";
- }
- $adjusted .= $newline."\n";
+ my $newline = "$id:$domain:$role:$name:$ip";
+ if($maxcon ne "") { # Not all hosts have loncnew tuning params
+ $newline .= ":$maxcon:$idleto:$mincon";
+ }
+ $adjusted .= $newline."\n";
- } else { # Not me, pass unmodified.
- $adjusted .= $line."\n";
- }
+ } else { # Not me, pass unmodified.
+ $adjusted .= $line."\n";
+ }
} else { # Blank or comment never re-written.
$adjusted .= $line."\n"; # Pass blanks and comments as is.
}
- }
- return $adjusted;
+ }
+ return $adjusted;
}
#
# InstallFile: Called to install an administrative file:
-# - The file is created with .tmp
-# - The .tmp file is then mv'd to
-# This lugubrious procedure is done to ensure that we are never without
-# a valid, even if dated, version of the file regardless of who crashes
-# and when the crash occurs.
+# - The file is created int a temp directory called .tmp
+# - lcinstall file is called to install the file.
+# since the web app has no direct write access to the table directory
#
# Parameters:
# Name of the file
@@ -534,11 +541,16 @@ sub AdjustHostContents {
# Return:
# nonzero - success.
# 0 - failure and $! has an errno.
+# Assumptions:
+# File installtion is a relatively infrequent
#
sub InstallFile {
my ($Filename, $Contents) = @_;
- my $TempFile = $Filename.".tmp";
+# my $TempFile = $Filename.".tmp";
+ my $exedir = $perlvar{'lonDaemons'};
+ my $tmpdir = $exedir.'/tmp/';
+ my $TempFile = $tmpdir."TempTableFile.tmp";
# Open the file for write:
@@ -552,11 +564,27 @@ sub InstallFile {
print $fh ($Contents);
$fh->close; # In case we ever have a filesystem w. locking
- chmod(0660, $TempFile);
+ chmod(0664, $TempFile); # Everyone can write it.
- # Now we can move install the file in position.
-
- move($TempFile, $Filename);
+ # Use lcinstall file to put the file in the table directory...
+
+ &Debug("Opening pipe to $exedir/lcinstallfile $TempFile $Filename");
+ my $pf = IO::File->new("| $exedir/lcinstallfile $TempFile $Filename > $exedir/logs/lcinstallfile.log");
+ close $pf;
+ my $err = $?;
+ &Debug("Status is $err");
+ if ($err != 0) {
+ my $msg = $err;
+ if ($err < @installerrors) {
+ $msg = $installerrors[$err];
+ }
+ &logthis("Install failed for table file $Filename : $msg");
+ return 0;
+ }
+
+ # Remove the temp file:
+
+ unlink($TempFile);
return 1;
}
@@ -564,8 +592,13 @@ sub InstallFile {
#
# ConfigFileFromSelector: converts a configuration file selector
-# (one of host or domain at this point) into a
-# configuration file pathname.
+# into a configuration file pathname.
+# It's probably no longer necessary to preserve
+# special handling of hosts or domain as those
+# files have been superceded by dns_hosts, dns_domain.
+# The default action is just to prepend the directory
+# and append .tab
+#
#
# Parameters:
# selector - Configuration file selector.
@@ -582,7 +615,7 @@ sub ConfigFileFromSelector {
} elsif ($selector eq "domain") {
$tablefile = $tabledir."domain.tab";
} else {
- return undef;
+ $tablefile = $tabledir.$selector.'.tab';
}
return $tablefile;
@@ -605,6 +638,7 @@ sub ConfigFileFromSelector {
sub PushFile {
my $request = shift;
my ($command, $filename, $contents) = split(":", $request, 3);
+ &Debug("PushFile");
# At this point in time, pushes for only the following tables are
# supported:
@@ -621,20 +655,7 @@ sub PushFile {
if(! (defined $tablefile)) {
return "refused";
}
- #
- # >copy< the old table to the backup table
- # don't rename in case system crashes/reboots etc. in the time
- # window between a rename and write.
- #
- my $backupfile = $tablefile;
- $backupfile =~ s/\.tab$/.old/;
- if(!CopyFile($tablefile, $backupfile)) {
- &logthis(' CopyFile from '.$tablefile." to ".$backupfile." failed ");
- return "error:$!";
- }
- &logthis(' Pushfile: backed up '
- .$tablefile." to $backupfile");
-
+
# If the file being pushed is the host file, we adjust the entry for ourself so that the
# IP will be our current IP as looked up in dns. Note this is only 99% good as it's possible
# to conceive of conditions where we don't have a DNS entry locally. This is possible in a
@@ -647,6 +668,7 @@ sub PushFile {
# Install the new file:
+ &logthis("Installing new $tablefile contents:\n$contents");
if(!InstallFile($tablefile, $contents)) {
&logthis(' Pushfile: unable to install '
.$tablefile." $! ");
@@ -827,16 +849,14 @@ sub AdjustOurHost {
# Use the config line to get my hostname.
# Use gethostbyname to translate that into an IP address.
#
- my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon) = split(/:/,$ConfigLine);
- my $BinaryIp = gethostbyname($name);
- my $ip = inet_ntoa($ip);
+ my ($id,$domain,$role,$name,$maxcon,$idleto,$mincon) = split(/:/,$ConfigLine);
#
# Reassemble the config line from the elements in the list.
# Note that if the loncnew items were not present before, they will
# be now even if they would be empty
#
my $newConfigLine = $id;
- foreach my $item ($domain, $role, $name, $ip, $maxcon, $idleto, $mincon) {
+ foreach my $item ($domain, $role, $name, $maxcon, $idleto, $mincon) {
$newConfigLine .= ":".$item;
}
# Replace the line:
@@ -882,11 +902,11 @@ sub EditFile {
# Split the command into it's pieces: edit:filetype:script
- my ($request, $filetype, $script) = split(/:/, $request,3); # : in script
+ my ($cmd, $filetype, $script) = split(/:/, $request,3); # : in script
# Check the pre-coditions for success:
- if($request != "edit") { # Something is amiss afoot alack.
+ if($cmd != "edit") { # Something is amiss afoot alack.
return "error:edit request detected, but request != 'edit'\n";
}
if( ($filetype ne "hosts") &&
@@ -931,105 +951,50 @@ sub EditFile {
return "ok\n";
}
-#---------------------------------------------------------------
-#
-# Manipulation of hash based databases (factoring out common code
-# for later use as we refactor.
+# read_profile
#
-# Ties a domain level resource file to a hash.
-# If requested a history entry is created in the associated hist file.
+# Returns a set of specific entries from a user's profile file.
+# this is a utility function that is used by both get_profile_entry and
+# get_profile_entry_encrypted.
#
-# Parameters:
-# domain - Name of the domain in which the resource file lives.
-# namespace - Name of the hash within that domain.
-# how - How to tie the hash (e.g. GDBM_WRCREAT()).
-# loghead - Optional parameter, if present a log entry is created
-# in the associated history file and this is the first part
-# of that entry.
-# logtail - Goes along with loghead, The actual logentry is of the
-# form $loghead::logtail.
-# Returns:
-# Reference to a hash bound to the db file or alternatively undef
-# if the tie failed.
-#
-sub tie_domain_hash {
- my ($domain,$namespace,$how,$loghead,$logtail) = @_;
-
- # Filter out any whitespace in the domain name:
-
- $domain =~ s/\W//g;
-
- # We have enough to go on to tie the hash:
-
- my $user_top_dir = $perlvar{'lonUsersDir'};
- my $domain_dir = $user_top_dir."/$domain";
- my $resource_file = $domain_dir."/$namespace.db";
- my %hash;
- if(tie(%hash, 'GDBM_File', $resource_file, $how, 0640)) {
- if (defined($loghead)) { # Need to log the operation.
- my $logFh = IO::File->new(">>$domain_dir/$namespace.hist");
- if($logFh) {
- my $timestamp = time;
- print $logFh "$loghead:$timestamp:$logtail\n";
- }
- $logFh->close;
- }
- return \%hash; # Return the tied hash.
- } else {
- return undef; # Tie failed.
- }
-}
-
-#
-# Ties a user's resource file to a hash.
-# If necessary, an appropriate history
-# log file entry is made as well.
-# This sub factors out common code from the subs that manipulate
-# the various gdbm files that keep keyword value pairs.
# Parameters:
-# domain - Name of the domain the user is in.
-# user - Name of the 'current user'.
-# namespace - Namespace representing the file to tie.
-# how - What the tie is done to (e.g. GDBM_WRCREAT().
-# loghead - Optional first part of log entry if there may be a
-# history file.
-# what - Optional tail of log entry if there may be a history
-# file.
+# udom - Domain in which the user exists.
+# uname - User's account name (loncapa account)
+# namespace - The profile namespace to open.
+# what - A set of & separated queries.
# Returns:
-# hash to which the database is tied. It's up to the caller to untie.
-# undef if the has could not be tied.
+# If all ok: - The string that needs to be shipped back to the user.
+# If failure - A string that starts with error: followed by the failure
+# reason.. note that this probabyl gets shipped back to the
+# user as well.
#
-sub tie_user_hash {
- my ($domain,$user,$namespace,$how,$loghead,$what) = @_;
-
- $namespace=~s/\//\_/g; # / -> _
- $namespace=~s/\W//g; # whitespace eliminated.
- my $proname = propath($domain, $user);
-
- # Tie the database.
+sub read_profile {
+ my ($udom, $uname, $namespace, $what) = @_;
- my %hash;
- if(tie(%hash, 'GDBM_File', "$proname/$namespace.db",
- $how, 0640)) {
- # If this is a namespace for which a history is kept,
- # make the history log entry:
- if (($namespace =~/^nohist\_/) && (defined($loghead))) {
- my $args = scalar @_;
- Debug(" Opening history: $namespace $args");
- my $hfh = IO::File->new(">>$proname/$namespace.hist");
- if($hfh) {
- my $now = time;
- print $hfh "$loghead:$now:$what\n";
- }
- $hfh->close;
+ my $hashref = &tie_user_hash($udom, $uname, $namespace,
+ &GDBM_READER());
+ if ($hashref) {
+ my @queries=split(/\&/,$what);
+ my $qresult='';
+
+ for (my $i=0;$i<=$#queries;$i++) {
+ $qresult.="$hashref->{$queries[$i]}&"; # Presumably failure gives empty string.
+ }
+ $qresult=~s/\&$//; # Remove trailing & from last lookup.
+ if (&untie_user_hash($hashref)) {
+ return $qresult;
+ } else {
+ return "error: ".($!+0)." untie (GDBM) Failed";
}
- return \%hash;
} else {
- return undef;
+ if ($!+0 == 2) {
+ return "error:No such file or GDBM reported bad block error";
+ } else {
+ return "error: ".($!+0)." tie (GDBM) Failed";
+ }
}
-
-}
+}
#--------------------- Request Handlers --------------------------------------------
#
# By convention each request handler registers itself prior to the sub
@@ -1051,12 +1016,11 @@ sub tie_user_hash {
# 0 - Program should exit.
# Side effects:
# Reply information is sent to the client.
-
sub ping_handler {
my ($cmd, $tail, $client) = @_;
Debug("$cmd $tail $client .. $currenthostid:");
- Reply( $client,"$currenthostid\n","$cmd:$tail");
+ Reply( $client,\$currenthostid,"$cmd:$tail");
return 1;
}
@@ -1079,11 +1043,10 @@ sub ping_handler {
# 0 - Program should exit.
# Side effects:
# Reply information is sent to the client.
-
sub pong_handler {
my ($cmd, $tail, $replyfd) = @_;
- my $reply=&reply("ping",$clientname);
+ my $reply=&Apache::lonnet::reply("ping",$clientname);
&Reply( $replyfd, "$currenthostid:$reply\n", "$cmd:$tail");
return 1;
}
@@ -1127,14 +1090,13 @@ sub establish_key_handler {
$key=substr($key,0,32);
my $cipherkey=pack("H32",$key);
$cipher=new IDEA $cipherkey;
- &Reply($replyfd, "$buildkey\n", "$cmd:$tail");
+ &Reply($replyfd, \$buildkey, "$cmd:$tail");
return 1;
}
®ister_handler("ekey", \&establish_key_handler, 0, 1,1);
-
# Handler for the load command. Returns the current system load average
# to the requestor.
#
@@ -1165,11 +1127,11 @@ sub load_handler {
my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
- &Reply( $replyfd, "$loadpercent\n", "$cmd:$tail");
+ &Reply( $replyfd, \$loadpercent, "$cmd:$tail");
return 1;
}
-register_handler("load", \&load_handler, 0, 1, 0);
+®ister_handler("load", \&load_handler, 0, 1, 0);
#
# Process the userload request. This sub returns to the client the current
@@ -1194,12 +1156,12 @@ register_handler("load", \&load_handler,
sub user_load_handler {
my ($cmd, $tail, $replyfd) = @_;
- my $userloadpercent=&userload();
- &Reply($replyfd, "$userloadpercent\n", "$cmd:$tail");
+ my $userloadpercent=&Apache::lonnet::userload();
+ &Reply($replyfd, \$userloadpercent, "$cmd:$tail");
return 1;
}
-register_handler("userload", \&user_load_handler, 0, 1, 0);
+®ister_handler("userload", \&user_load_handler, 0, 1, 0);
# Process a request for the authorization type of a user:
# (userauth).
@@ -1235,8 +1197,10 @@ sub user_authorization_type {
my ($type,$otherinfo) = split(/:/,$result);
if($type =~ /^krb/) {
$type = $result;
- }
- &Reply( $replyfd, "$type:\n", $userinput);
+ } else {
+ $type .= ':';
+ }
+ &Reply( $replyfd, \$type, $userinput);
}
return 1;
@@ -1256,10 +1220,9 @@ sub user_authorization_type {
# 0 - Program should exit
# Implicit Output:
# a reply is written to the client.
-
sub push_file_handler {
my ($cmd, $tail, $client) = @_;
-
+ &Debug("In push file handler");
my $userinput = "$cmd:$tail";
# At this time we only know that the IP of our partner is a valid manager
@@ -1267,23 +1230,27 @@ sub push_file_handler {
# spoofing).
my $cert = &GetCertificate($userinput);
- if(&ValidManager($cert)) {
+ if(&ValidManager($cert)) {
+ &Debug("Valid manager: $client");
# Now presumably we have the bona fides of both the peer host and the
# process making the request.
my $reply = &PushFile($userinput);
- &Reply($client, "$reply\n", $userinput);
+ &Reply($client, \$reply, $userinput);
} else {
+ &logthis("push_file_handler $client is not valid");
&Failure( $client, "refused\n", $userinput);
}
return 1;
}
®ister_handler("pushfile", \&push_file_handler, 1, 0, 1);
+# The du_handler routine should be considered obsolete and is retained
+# for communication with legacy servers. Please see the du2_handler.
#
-# du - list the disk usuage of a directory recursively.
+# du - list the disk usage of a directory recursively.
#
# note: stolen code from the ls file handler
# under construction by Rick Banghart
@@ -1299,22 +1266,108 @@ sub push_file_handler {
# Side Effects:
# The reply is written to $client.
#
-
sub du_handler {
my ($cmd, $ududir, $client) = @_;
+ ($ududir) = split(/:/,$ududir); # Make 'telnet' testing easier.
+ my $userinput = "$cmd:$ududir";
+
if ($ududir=~/\.\./ || $ududir!~m|^/home/httpd/|) {
&Failure($client,"refused\n","$cmd:$ududir");
return 1;
}
- my $duout = `du -ks $ududir 2>/dev/null`;
- $duout=~s/[^\d]//g; #preserve only the numbers
- &Reply($client,"$duout\n","$cmd:$ududir");
+ # Since $ududir could have some nasties in it,
+ # we will require that ududir is a valid
+ # directory. Just in case someone tries to
+ # slip us a line like .;(cd /home/httpd rm -rf*)
+ # etc.
+ #
+ if (-d $ududir) {
+ my $total_size=0;
+ my $code=sub {
+ if ($_=~/\.\d+\./) { return;}
+ if ($_=~/\.meta$/) { return;}
+ if (-d $_) { return;}
+ $total_size+=(stat($_))[7];
+ };
+ chdir($ududir);
+ find($code,$ududir);
+ $total_size=int($total_size/1024);
+ &Reply($client,\$total_size,"$cmd:$ududir");
+ } else {
+ &Failure($client, "bad_directory:$ududir\n","$cmd:$ududir");
+ }
return 1;
}
®ister_handler("du", \&du_handler, 0, 1, 0);
+# Please also see the du_handler, which is obsoleted by du2.
+# du2_handler differs from du_handler in that required path to directory
+# provided by &propath() is prepended in the handler instead of on the
+# client side.
+#
+# du2 - list the disk usage of a directory recursively.
+#
+# Parameters:
+# $cmd - The command that dispatched us (du).
+# $tail - The tail of the request that invoked us.
+# $tail is a : separated list of the following:
+# - $ududir - directory path to list (before prepending)
+# - $getpropath = 1 if &propath() should prepend
+# - $uname - username to use for &propath or user dir
+# - $udom - domain to use for &propath or user dir
+# All are escaped.
+# $client - Socket open on the client.
+# Returns:
+# 1 - indicating that the daemon should not disconnect.
+# Side Effects:
+# The reply is written to $client.
+#
+
+sub du2_handler {
+ my ($cmd, $tail, $client) = @_;
+ my ($ududir,$getpropath,$uname,$udom) = map { &unescape($_) } (split(/:/, $tail));
+ my $userinput = "$cmd:$tail";
+ if (($ududir=~/\.\./) || (($ududir!~m|^/home/httpd/|) && (!$getpropath))) {
+ &Failure($client,"refused\n","$cmd:$tail");
+ return 1;
+ }
+ if ($getpropath) {
+ if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
+ $ududir = &propath($udom,$uname).'/'.$ududir;
+ } else {
+ &Failure($client,"refused\n","$cmd:$tail");
+ return 1;
+ }
+ }
+ # Since $ududir could have some nasties in it,
+ # we will require that ududir is a valid
+ # directory. Just in case someone tries to
+ # slip us a line like .;(cd /home/httpd rm -rf*)
+ # etc.
+ #
+ if (-d $ududir) {
+ my $total_size=0;
+ my $code=sub {
+ if ($_=~/\.\d+\./) { return;}
+ if ($_=~/\.meta$/) { return;}
+ if (-d $_) { return;}
+ $total_size+=(stat($_))[7];
+ };
+ chdir($ududir);
+ find($code,$ududir);
+ $total_size=int($total_size/1024);
+ &Reply($client,\$total_size,"$cmd:$ududir");
+ } else {
+ &Failure($client, "bad_directory:$ududir\n","$cmd:$tail");
+ }
+ return 1;
+}
+®ister_handler("du2", \&du2_handler, 0, 1, 0);
#
+# The ls_handler routine should be considered obsolete and is retained
+# for communication with legacy servers. Please see the ls3_handler.
+#
# ls - list the contents of a directory. For each file in the
# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each
@@ -1331,6 +1384,7 @@ sub du_handler {
# The reply is written to $client.
#
sub ls_handler {
+ # obsoleted by ls2_handler
my ($cmd, $ulsdir, $client) = @_;
my $userinput = "$cmd:$ulsdir";
@@ -1343,14 +1397,15 @@ sub ls_handler {
if(-d $ulsdir) {
if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {
- undef $obs, $rights;
+ undef($obs);
+ undef($rights);
my @ulsstats=stat($ulsdir.'/'.$ulsfn);
#We do some obsolete checking here
if(-e $ulsdir.'/'.$ulsfn.".meta") {
open(FILE, $ulsdir.'/'.$ulsfn.".meta");
my @obsolete=;
foreach my $obsolete (@obsolete) {
- if($obsolete =~ m|()(on)|) { $obs = 1; }
+ if($obsolete =~ m/()(on|1)/) { $obs = 1; }
if($obsolete =~ m|()(default)|) { $rights = 1; }
}
}
@@ -1370,15 +1425,233 @@ sub ls_handler {
$ulsout='no_such_dir';
}
if ($ulsout eq '') { $ulsout='empty'; }
- print $client "$ulsout\n";
+ &Reply($client, \$ulsout, $userinput); # This supports debug logging.
return 1;
}
®ister_handler("ls", \&ls_handler, 0, 1, 0);
+# The ls2_handler routine should be considered obsolete and is retained
+# for communication with legacy servers. Please see the ls3_handler.
+# Please also see the ls_handler, which was itself obsoleted by ls2.
+# ls2_handler differs from ls_handler in that it escapes its return
+# values before concatenating them together with ':'s.
+#
+# ls2 - list the contents of a directory. For each file in the
+# 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.
+# Parameters:
+# $cmd - The command that dispatched us (ls).
+# $ulsdir - The directory path to list... I'm not sure what this
+# is relative as things like ls:. return e.g.
+# no_such_dir.
+# $client - Socket open on the client.
+# Returns:
+# 1 - indicating that the daemon should not disconnect.
+# Side Effects:
+# The reply is written to $client.
+#
+sub ls2_handler {
+ my ($cmd, $ulsdir, $client) = @_;
+ my $userinput = "$cmd:$ulsdir";
+ my $obs;
+ my $rights;
+ my $ulsout='';
+ my $ulsfn;
+ if (-e $ulsdir) {
+ if(-d $ulsdir) {
+ if (opendir(LSDIR,$ulsdir)) {
+ while ($ulsfn=readdir(LSDIR)) {
+ undef($obs);
+ undef($rights);
+ my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+ #We do some obsolete checking here
+ if(-e $ulsdir.'/'.$ulsfn.".meta") {
+ open(FILE, $ulsdir.'/'.$ulsfn.".meta");
+ my @obsolete=;
+ foreach my $obsolete (@obsolete) {
+ if($obsolete =~ m/()(on|1)/) { $obs = 1; }
+ if($obsolete =~ m|()(default)|) {
+ $rights = 1;
+ }
+ }
+ }
+ my $tmp = $ulsfn.'&'.join('&',@ulsstats);
+ if ($obs eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+ if ($rights eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+ $ulsout.= &escape($tmp).':';
+ }
+ closedir(LSDIR);
+ }
+ } else {
+ my @ulsstats=stat($ulsdir);
+ $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+ }
+ } else {
+ $ulsout='no_such_dir';
+ }
+ if ($ulsout eq '') { $ulsout='empty'; }
+ &Reply($client, \$ulsout, $userinput); # This supports debug logging.
+ return 1;
+}
+®ister_handler("ls2", \&ls2_handler, 0, 1, 0);
+#
+# ls3 - list the contents of a directory. For each file in the
+# 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.
+# Parameters:
+# $cmd - The command that dispatched us (ls).
+# $tail - The tail of the request that invoked us.
+# $tail is a : separated list of the following:
+# - $ulsdir - directory path to list (before prepending)
+# - $getpropath = 1 if &propath() should prepend
+# - $getuserdir = 1 if path to user dir in lonUsers should
+# prepend
+# - $alternate_root - path to prepend
+# - $uname - username to use for &propath or user dir
+# - $udom - domain to use for &propath or user dir
+# All of these except $getpropath and &getuserdir are escaped.
+# no_such_dir.
+# $client - Socket open on the client.
+# Returns:
+# 1 - indicating that the daemon should not disconnect.
+# Side Effects:
+# The reply is written to $client.
+#
+
+sub ls3_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($ulsdir,$getpropath,$getuserdir,$alternate_root,$uname,$udom) =
+ split(/:/,$tail);
+ if (defined($ulsdir)) {
+ $ulsdir = &unescape($ulsdir);
+ }
+ if (defined($alternate_root)) {
+ $alternate_root = &unescape($alternate_root);
+ }
+ if (defined($uname)) {
+ $uname = &unescape($uname);
+ }
+ if (defined($udom)) {
+ $udom = &unescape($udom);
+ }
+
+ my $dir_root = $perlvar{'lonDocRoot'};
+ if ($getpropath) {
+ if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
+ $dir_root = &propath($udom,$uname);
+ $dir_root =~ s/\/$//;
+ } else {
+ &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 '') {
+ $dir_root = $alternate_root;
+ }
+ if (($dir_root ne '') && ($dir_root ne '/')) {
+ if ($ulsdir =~ /^\//) {
+ $ulsdir = $dir_root.$ulsdir;
+ } else {
+ $ulsdir = $dir_root.'/'.$ulsdir;
+ }
+ }
+ my $obs;
+ my $rights;
+ my $ulsout='';
+ my $ulsfn;
+ if (-e $ulsdir) {
+ if(-d $ulsdir) {
+ if (opendir(LSDIR,$ulsdir)) {
+ while ($ulsfn=readdir(LSDIR)) {
+ undef($obs);
+ undef($rights);
+ my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+ #We do some obsolete checking here
+ if(-e $ulsdir.'/'.$ulsfn.".meta") {
+ open(FILE, $ulsdir.'/'.$ulsfn.".meta");
+ my @obsolete=;
+ foreach my $obsolete (@obsolete) {
+ if($obsolete =~ m/()(on|1)/) { $obs = 1; }
+ if($obsolete =~ m|()(default)|) {
+ $rights = 1;
+ }
+ }
+ }
+ my $tmp = $ulsfn.'&'.join('&',@ulsstats);
+ if ($obs eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+ if ($rights eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+ $ulsout.= &escape($tmp).':';
+ }
+ closedir(LSDIR);
+ }
+ } else {
+ my @ulsstats=stat($ulsdir);
+ $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+ }
+ } else {
+ $ulsout='no_such_dir';
+ }
+ if ($ulsout eq '') { $ulsout='empty'; }
+ &Reply($client, \$ulsout, $userinput); # This supports debug logging.
+ return 1;
+}
+®ister_handler("ls3", \&ls3_handler, 0, 1, 0);
+
+sub server_timezone_handler {
+ my ($cmd,$tail,$client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $timezone;
+ my $clockfile = '/etc/sysconfig/clock'; # Fedora/CentOS/SuSE
+ my $tzfile = '/etc/timezone'; # Debian/Ubuntu
+ if (-e $clockfile) {
+ if (open(my $fh,"<$clockfile")) {
+ while (<$fh>) {
+ next if (/^[\#\s]/);
+ if (/^(?:TIME)?ZONE\s*=\s*['"]?\s*([\w\/]+)/) {
+ $timezone = $1;
+ last;
+ }
+ }
+ close($fh);
+ }
+ } elsif (-e $tzfile) {
+ if (open(my $fh,"<$tzfile")) {
+ $timezone = <$fh>;
+ close($fh);
+ chomp($timezone);
+ if ($timezone =~ m{^Etc/(\w+)$}) {
+ $timezone = $1;
+ }
+ }
+ }
+ &Reply($client,\$timezone,$userinput); # This supports debug logging.
+ return 1;
+}
+®ister_handler("servertimezone", \&server_timezone_handler, 0, 1, 0);
+
+sub server_loncaparev_handler {
+ my ($cmd,$tail,$client) = @_;
+ my $userinput = "$cmd:$tail";
+ &Reply($client,\$perlvar{'lonVersion'},$userinput);
+ return 1;
+}
+®ister_handler("serverloncaparev", \&server_loncaparev_handler, 0, 1, 0);
# Process a reinit request. Reinit requests that either
# lonc or lond be reinitialized so that an updated
@@ -1403,13 +1676,12 @@ sub reinit_process_handler {
if(&ValidManager($cert)) {
chomp($userinput);
my $reply = &ReinitProcess($userinput);
- &Reply( $client, "$reply\n", $userinput);
+ &Reply( $client, \$reply, $userinput);
} else {
&Failure( $client, "refused\n", $userinput);
}
return 1;
}
-
®ister_handler("reinit", \&reinit_process_handler, 1, 0, 1);
# Process the editing script for a table edit operation.
@@ -1451,8 +1723,7 @@ sub edit_table_handler {
}
return 1;
}
-register_handler("edit", \&edit_table_handler, 1, 0, 1);
-
+®ister_handler("edit", \&edit_table_handler, 1, 0, 1);
#
# Authenticate a user against the LonCAPA authentication
@@ -1489,13 +1760,15 @@ sub authenticate_handler {
# udom - User's domain.
# uname - Username.
# upass - User's password.
+ # checkdefauth - Pass to validate_user() to try authentication
+ # with default auth type(s) if no user account.
- my ($udom,$uname,$upass)=split(/:/,$tail);
- &Debug(" Authenticate domain = $udom, user = $uname, password = $upass");
+ my ($udom, $uname, $upass, $checkdefauth)=split(/:/,$tail);
+ &Debug(" Authenticate domain = $udom, user = $uname, password = $upass, checkdefauth = $checkdefauth");
chomp($upass);
$upass=&unescape($upass);
- my $pwdcorrect = &validate_user($udom, $uname, $upass);
+ my $pwdcorrect = &validate_user($udom,$uname,$upass,$checkdefauth);
if($pwdcorrect) {
&Reply( $client, "authorized\n", $userinput);
#
@@ -1507,8 +1780,7 @@ sub authenticate_handler {
return 1;
}
-
-register_handler("auth", \&authenticate_handler, 1, 1, 0);
+®ister_handler("auth", \&authenticate_handler, 1, 1, 0);
#
# Change a user's password. Note that this function is complicated by
@@ -1541,17 +1813,24 @@ sub change_password_handler {
# uname - Username.
# upass - Current password.
# npass - New password.
+ # context - Context in which this was called
+ # (preferences or reset_by_email).
- my ($udom,$uname,$upass,$npass)=split(/:/,$tail);
+ my ($udom,$uname,$upass,$npass,$context)=split(/:/,$tail);
$upass=&unescape($upass);
$npass=&unescape($npass);
&Debug("Trying to change password for $uname");
# First require that the user can be authenticated with their
- # old password:
-
- my $validated = &validate_user($udom, $uname, $upass);
+ # old password unless context was 'reset_by_email':
+
+ my $validated;
+ if ($context eq 'reset_by_email') {
+ $validated = 1;
+ } else {
+ $validated = &validate_user($udom, $uname, $upass);
+ }
if($validated) {
my $realpasswd = &get_auth_type($udom, $uname); # Defined since authd.
@@ -1570,21 +1849,11 @@ sub change_password_handler {
."to change password");
&Failure( $client, "non_authorized\n",$userinput);
}
- } elsif ($howpwd eq 'unix') {
- # Unix means we have to access /etc/password
- &Debug("auth is unix");
- my $execdir=$perlvar{'lonDaemons'};
- &Debug("Opening lcpasswd pipeline");
- my $pf = IO::File->new("|$execdir/lcpasswd > "
- ."$perlvar{'lonDaemons'}"
- ."/logs/lcpasswd.log");
- print $pf "$uname\n$npass\n$npass\n";
- close $pf;
- my $err = $?;
- my $result = ($err>0 ? 'pwchange_failure' : 'ok');
+ } elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') {
+ my $result = &change_unix_password($uname, $npass);
&logthis("Result of password change for $uname: ".
- &lcpasswdstrerror($?));
- &Reply($client, "$result\n", $userinput);
+ $result);
+ &Reply($client, \$result, $userinput);
} else {
# this just means that the current password mode is not
# one we know how to change (e.g the kerberos auth modes or
@@ -1599,8 +1868,7 @@ sub change_password_handler {
return 1;
}
-register_handler("passwd", \&change_password_handler, 1, 1, 0);
-
+®ister_handler("passwd", \&change_password_handler, 1, 1, 0);
#
# Create a new user. User in this case means a lon-capa user.
@@ -1639,24 +1907,16 @@ sub add_user_handler {
if (-e $passfilename) {
&Failure( $client, "already_exists\n", $userinput);
} else {
- my @fpparts=split(/\//,$passfilename);
- my $fpnow=$fpparts[0].'/'.$fpparts[1].'/'.$fpparts[2];
my $fperror='';
- for (my $i=3;$i<= ($#fpparts-1);$i++) {
- $fpnow.='/'.$fpparts[$i];
- unless (-e $fpnow) {
- &logthis("mkdir $fpnow");
- unless (mkdir($fpnow,0777)) {
- $fperror="error: ".($!+0)." mkdir failed while attempting "
- ."makeuser";
- }
- }
+ if (!&mkpath($passfilename)) {
+ $fperror="error: ".($!+0)." mkdir failed while attempting "
+ ."makeuser";
}
unless ($fperror) {
my $result=&make_passwd_file($uname, $umode,$npass, $passfilename);
- &Reply($client, $result, $userinput); #BUGBUG - could be fail
+ &Reply($client,\$result, $userinput); #BUGBUG - could be fail
} else {
- &Failure($client, "$fperror\n", $userinput);
+ &Failure($client, \$fperror, $userinput);
}
}
umask($oldumask);
@@ -1691,6 +1951,9 @@ sub add_user_handler {
# Implicit inputs:
# The authentication systems describe above have their own forms of implicit
# input into the authentication process that are described above.
+# NOTE:
+# This is also used to change the authentication credential values (e.g. passwd).
+#
#
sub change_authentication_handler {
@@ -1707,12 +1970,46 @@ sub change_authentication_handler {
chomp($npass);
$npass=&unescape($npass);
+ my $oldauth = &get_auth_type($udom, $uname); # Get old auth info.
my $passfilename = &password_path($udom, $uname);
if ($passfilename) { # Not allowed to create a new user!!
- my $result=&make_passwd_file($uname, $umode,$npass,$passfilename);
- &Reply($client, $result, $userinput);
+ # If just changing the unix passwd. need to arrange to run
+ # passwd since otherwise make_passwd_file will run
+ # lcuseradd which fails if an account already exists
+ # (to prevent an unscrupulous LONCAPA admin from stealing
+ # an existing account by overwriting it as a LonCAPA account).
+
+ if(($oldauth =~/^unix/) && ($umode eq "unix")) {
+ my $result = &change_unix_password($uname, $npass);
+ &logthis("Result of password change for $uname: ".$result);
+ if ($result eq "ok") {
+ &Reply($client, \$result);
+ } else {
+ &Failure($client, \$result);
+ }
+ } else {
+ my $result=&make_passwd_file($uname, $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,
+ # re-run manage_permissions for that role in order to be able
+ # to take ownership of the construction space back to www:www
+ #
+
+
+ if( (($oldauth =~ /^unix/) && ($umode eq "internal")) ||
+ (($oldauth =~ /^internal/) && ($umode eq "unix")) ) {
+ if(&is_author($udom, $uname)) {
+ &Debug(" Need to manage author permissions...");
+ &manage_permissions("/$udom/_au", $udom, $uname, "$umode:");
+ }
+ }
+ &Reply($client, \$result, $userinput);
+ }
+
+
} else {
- &Failure($client, "non_authorized", $userinput); # Fail the user now.
+ &Failure($client, "non_authorized\n", $userinput); # Fail the user now.
}
}
return 1;
@@ -1791,11 +2088,13 @@ sub update_resource_handler {
my $now=time;
my $since=$now-$atime;
if ($since>$perlvar{'lonExpire'}) {
- my $reply=&reply("unsub:$fname","$clientname");
+ my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname");
+ &devalidate_meta_cache($fname);
unlink("$fname");
+ unlink("$fname.meta");
} else {
my $transname="$fname.in.transfer";
- my $remoteurl=&reply("sub:$fname","$clientname");
+ my $remoteurl=&Apache::lonnet::reply("sub:$fname","$clientname");
my $response;
alarm(120);
{
@@ -1822,6 +2121,7 @@ sub update_resource_handler {
alarm(0);
}
rename($transname,$fname);
+ &devalidate_meta_cache($fname);
}
}
&Reply( $client, "ok\n", $userinput);
@@ -1835,6 +2135,16 @@ sub update_resource_handler {
}
®ister_handler("update", \&update_resource_handler, 0 ,1, 0);
+sub devalidate_meta_cache {
+ my ($url) = @_;
+ use Cache::Memcached;
+ my $memcache = new Cache::Memcached({'servers'=>['127.0.0.1:11211']});
+ $url = &Apache::lonnet::declutter($url);
+ $url =~ s-\.meta$--;
+ my $id = &escape('meta:'.$url);
+ $memcache->delete($id);
+}
+
#
# Fetch a user file from a remote server to the user's home directory
# userfiles subdir.
@@ -1865,21 +2175,10 @@ sub fetch_user_file_handler {
# Note that any regular files in the way of this path are
# wiped out to deal with some earlier folly of mine.
- my $path = $udir;
- if ($ufile =~m|(.+)/([^/]+)$|) {
- my @parts=split('/',$1);
- foreach my $part (@parts) {
- $path .= '/'.$part;
- if( -f $path) {
- unlink($path);
- }
- if ((-e $path)!=1) {
- mkdir($path,0770);
- }
- }
+ if (!&mkpath($udir.'/'.$ufile)) {
+ &Failure($client, "unable_to_create\n", $userinput);
}
-
my $destname=$udir.'/'.$ufile;
my $transname=$udir.'/'.$ufile.'.in.transit';
my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
@@ -1923,7 +2222,6 @@ sub fetch_user_file_handler {
#
# Returns:
# 1 - Continue processing.
-
sub remove_user_file_handler {
my ($cmd, $tail, $client) = @_;
@@ -1939,12 +2237,19 @@ sub remove_user_file_handler {
if (-e $udir) {
my $file=$udir.'/userfiles/'.$ufile;
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 approprate:
+ #
if (-f $file){
unlink($file);
} elsif(-d $file) {
rmdir($file);
}
if (-e $file) {
+ # File is still there after we deleted it ?!?
+
&Failure($client, "failed\n", "$cmd:$tail");
} else {
&Reply($client, "ok\n", "$cmd:$tail");
@@ -1969,7 +2274,6 @@ sub remove_user_file_handler {
#
# Returns:
# 1 - Continue processing.
-
sub mkdir_user_file_handler {
my ($cmd, $tail, $client) = @_;
@@ -1983,17 +2287,11 @@ sub mkdir_user_file_handler {
} else {
my $udir = &propath($udom,$uname);
if (-e $udir) {
- my $newdir=$udir.'/userfiles/'.$ufile;
- if (!-e $newdir) {
- mkdir($newdir);
- if (!-e $newdir) {
- &Failure($client, "failed\n", "$cmd:$tail");
- } else {
- &Reply($client, "ok\n", "$cmd:$tail");
- }
- } else {
- &Failure($client, "not_found\n", "$cmd:$tail");
+ my $newdir=$udir.'/userfiles/'.$ufile.'/';
+ if (!&mkpath($newdir)) {
+ &Failure($client, "failed\n", "$cmd:$tail");
}
+ &Reply($client, "ok\n", "$cmd:$tail");
} else {
&Failure($client, "not_home\n", "$cmd:$tail");
}
@@ -2011,7 +2309,6 @@ sub mkdir_user_file_handler {
#
# Returns:
# 1 - Continue processing.
-
sub rename_user_file_handler {
my ($cmd, $tail, $client) = @_;
@@ -2045,10 +2342,9 @@ sub rename_user_file_handler {
}
®ister_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);
-
#
-# Authenticate access to a user file by checking the user's
-# session token(?)
+# Checks if the specified user has an active session on the server
+# return ok if so, not_found if not
#
# Parameters:
# cmd - The request keyword that dispatched to tus.
@@ -2056,31 +2352,69 @@ sub rename_user_file_handler {
# client - Filehandle open on the client.
# Return:
# 1.
+sub user_has_session_handler {
+ my ($cmd, $tail, $client) = @_;
+ my ($udom, $uname) = map { &unescape($_) } (split(/:/, $tail));
+
+ &logthis("Looking for $udom $uname");
+ opendir(DIR,$perlvar{'lonIDsDir'});
+ my $filename;
+ while ($filename=readdir(DIR)) {
+ last if ($filename=~/^\Q$uname\E_\d+_\Q$udom\E_/);
+ }
+ if ($filename) {
+ &Reply($client, "ok\n", "$cmd:$tail");
+ } else {
+ &Failure($client, "not_found\n", "$cmd:$tail");
+ }
+ return 1;
+
+}
+®ister_handler("userhassession", \&user_has_session_handler, 0,1,0);
+
+#
+# Authenticate access to a user file by checking that the token the user's
+# passed also exists in their session file
+#
+# Parameters:
+# cmd - The request keyword that dispatched to tus.
+# tail - The tail of the request (colon separated parameters).
+# client - Filehandle open on the client.
+# Return:
+# 1.
sub token_auth_user_file_handler {
my ($cmd, $tail, $client) = @_;
my ($fname, $session) = split(/:/, $tail);
chomp($session);
- my $reply='non_auth';
- if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
- $session.'.id')) {
- while (my $line=) {
- if ($line=~ m|userfile\.\Q$fname\E\=|) { $reply='ok'; }
+ my $reply="non_auth";
+ my $file = $perlvar{'lonIDsDir'}.'/'.$session.'.id';
+ if (open(ENVIN,"$file")) {
+ flock(ENVIN,LOCK_SH);
+ tie(my %disk_env,'GDBM_File',"$file",&GDBM_READER(),0640);
+ if (exists($disk_env{"userfile.$fname"})) {
+ $reply="ok";
+ } else {
+ foreach my $envname (keys(%disk_env)) {
+ if ($envname=~ m|^userfile\.\Q$fname\E|) {
+ $reply="ok";
+ last;
+ }
+ }
}
+ untie(%disk_env);
close(ENVIN);
- &Reply($client, $reply);
+ &Reply($client, \$reply, "$cmd:$tail");
} else {
&Failure($client, "invalid_token\n", "$cmd:$tail");
}
return 1;
}
-
®ister_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);
-
#
# Unsubscribe from a resource.
#
@@ -2109,6 +2443,7 @@ sub unsubscribe_handler {
return 1;
}
®ister_handler("unsub", \&unsubscribe_handler, 0, 1, 0);
+
# Subscribe to a resource
#
# Parameters:
@@ -2131,13 +2466,13 @@ sub subscribe_handler {
®ister_handler("sub", \&subscribe_handler, 0, 1, 0);
#
-# Determine the version of a resource (?) Or is it return
-# the top version of the resource? Not yet clear from the
-# code in currentversion.
+# Determine the latest version of a resource (it looks for the highest
+# past version and then returns that +1)
#
# Parameters:
# $cmd - The command that got us here.
# $tail - Tail of the command (remaining parameters).
+# (Should consist of an absolute path to a file)
# $client - File descriptor connected to client.
# Returns
# 0 - Requested to exit, caller should shut down.
@@ -2187,7 +2522,7 @@ sub activity_log_handler {
return 1;
}
-register_handler("log", \&activity_log_handler, 0, 1, 0);
+®ister_handler("log", \&activity_log_handler, 0, 1, 0);
#
# Put a namespace entry in a user profile hash.
@@ -2219,7 +2554,7 @@ sub put_user_profile_entry {
my ($key,$value)=split(/=/,$pair);
$hashref->{$key}=$value;
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply( $client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
@@ -2227,7 +2562,7 @@ sub put_user_profile_entry {
$userinput);
}
} else {
- &Failure( $client, "error: ".($!)." tie(GDBM) Failed ".
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
"while attempting put\n", $userinput);
}
} else {
@@ -2238,6 +2573,61 @@ sub put_user_profile_entry {
}
®ister_handler("put", \&put_user_profile_entry, 0, 1, 0);
+# Put a piece of new data in hash, returns error if entry already exists
+# Parameters:
+# $cmd - The command that got us here.
+# $tail - Tail of the command (remaining parameters).
+# $client - File descriptor connected to client.
+# Returns
+# 0 - Requested to exit, caller should shut down.
+# 1 - Continue processing.
+#
+sub newput_user_profile_entry {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$cmd:$tail";
+
+ my ($udom,$uname,$namespace,$what) =split(/:/,$tail,4);
+ if ($namespace eq 'roles') {
+ &Failure( $client, "refused\n", $userinput);
+ return 1;
+ }
+
+ chomp($what);
+
+ my $hashref = &tie_user_hash($udom, $uname, $namespace,
+ &GDBM_WRCREAT(),"N",$what);
+ if(!$hashref) {
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting put\n", $userinput);
+ return 1;
+ }
+
+ my @pairs=split(/\&/,$what);
+ foreach my $pair (@pairs) {
+ my ($key,$value)=split(/=/,$pair);
+ if (exists($hashref->{$key})) {
+ &Failure($client, "key_exists: ".$key."\n",$userinput);
+ return 1;
+ }
+ }
+
+ foreach my $pair (@pairs) {
+ my ($key,$value)=split(/=/,$pair);
+ $hashref->{$key}=$value;
+ }
+
+ if (&untie_user_hash($hashref)) {
+ &Reply( $client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
+ "while attempting put\n",
+ $userinput);
+ }
+ return 1;
+}
+®ister_handler("newput", \&newput_user_profile_entry, 0, 1, 0);
+
#
# Increment a profile entry in the user history file.
# The history contains keyword value pairs. In this case,
@@ -2268,13 +2658,19 @@ sub increment_user_value_handler {
my @pairs=split(/\&/,$what);
foreach my $pair (@pairs) {
my ($key,$value)=split(/=/,$pair);
+ $value = &unescape($value);
# We could check that we have a number...
if (! defined($value) || $value eq '') {
$value = 1;
}
$hashref->{$key}+=$value;
+ if ($namespace eq 'nohist_resourcetracker') {
+ if ($hashref->{$key} < 0) {
+ $hashref->{$key} = 0;
+ }
+ }
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply( $client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
@@ -2292,7 +2688,6 @@ sub increment_user_value_handler {
}
®ister_handler("inc", \&increment_user_value_handler, 0, 1, 0);
-
#
# Put a new role for a user. Roles are LonCAPA's packaging of permissions.
# Each 'role' a user has implies a set of permissions. Adding a new role
@@ -2332,14 +2727,17 @@ sub roles_put_handler {
# is done on close this improves the chances the log will be an un-
# corrupted ordered thing.
if ($hashref) {
+ my $pass_entry = &get_auth_type($udom, $uname);
+ my ($auth_type,$pwd) = split(/:/, $pass_entry);
+ $auth_type = $auth_type.":";
my @pairs=split(/\&/,$what);
foreach my $pair (@pairs) {
my ($key,$value)=split(/=/,$pair);
&manage_permissions($key, $udom, $uname,
- &get_auth_type( $udom, $uname));
+ $auth_type);
$hashref->{$key}=$value;
}
- if (untie($hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply($client, "ok\n", $userinput);
} else {
&Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
@@ -2390,7 +2788,7 @@ sub roles_delete_handler {
foreach my $key (@rolekeys) {
delete $hashref->{$key};
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply($client, "ok\n", $userinput);
} else {
&Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
@@ -2431,32 +2829,18 @@ sub get_profile_entry {
my ($udom,$uname,$namespace,$what) = split(/:/,$tail);
chomp($what);
- my $hashref = &tie_user_hash($udom, $uname, $namespace,
- &GDBM_READER());
- if ($hashref) {
- my @queries=split(/\&/,$what);
- my $qresult='';
-
- for (my $i=0;$i<=$#queries;$i++) {
- $qresult.="$hashref->{$queries[$i]}&"; # Presumably failure gives empty string.
- }
- $qresult=~s/\&$//; # Remove trailing & from last lookup.
- if (untie(%$hashref)) {
- &Reply($client, "$qresult\n", $userinput);
- } else {
- &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
- "while attempting get\n", $userinput);
- }
+
+
+ my $replystring = read_profile($udom, $uname, $namespace, $what);
+ my ($first) = split(/:/,$replystring);
+ if($first ne "error") {
+ &Reply($client, \$replystring, $userinput);
} else {
- if ($!+0 == 2) { # +0 coerces errno -> number 2 is ENOENT
- &Failure($client, "error:No such file or ".
- "GDBM reported bad block error\n", $userinput);
- } else { # Some other undifferentiated err.
- &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
- "while attempting get\n", $userinput);
- }
+ &Failure($client, $replystring." while attempting get\n", $userinput);
}
return 1;
+
+
}
®ister_handler("get", \&get_profile_entry, 0,1,0);
@@ -2484,44 +2868,35 @@ sub get_profile_entry_encrypted {
my $userinput = "$cmd:$tail";
- my ($cmd,$udom,$uname,$namespace,$what) = split(/:/,$userinput);
+ my ($udom,$uname,$namespace,$what) = split(/:/,$tail);
chomp($what);
- my $hashref = &tie_user_hash($udom, $uname, $namespace,
- &GDBM_READER());
- if ($hashref) {
- my @queries=split(/\&/,$what);
- my $qresult='';
- for (my $i=0;$i<=$#queries;$i++) {
- $qresult.="$hashref->{$queries[$i]}&";
- }
- if (untie(%$hashref)) {
- $qresult=~s/\&$//;
- if ($cipher) {
- my $cmdlength=length($qresult);
- $qresult.=" ";
- my $encqresult='';
- for(my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
- $encqresult.= unpack("H16",
- $cipher->encrypt(substr($qresult,
- $encidx,
- 8)));
- }
- &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
- } else {
- &Failure( $client, "error:no_key\n", $userinput);
+ my $qresult = read_profile($udom, $uname, $namespace, $what);
+ my ($first) = split(/:/, $qresult);
+ if($first ne "error") {
+
+ if ($cipher) {
+ my $cmdlength=length($qresult);
+ $qresult.=" ";
+ my $encqresult='';
+ for(my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+ $encqresult.= unpack("H16",
+ $cipher->encrypt(substr($qresult,
+ $encidx,
+ 8)));
}
+ &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
} else {
- &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
- "while attempting eget\n", $userinput);
- }
+ &Failure( $client, "error:no_key\n", $userinput);
+ }
} else {
- &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
- "while attempting eget\n", $userinput);
+ &Failure($client, "$qresult while attempting eget\n", $userinput);
+
}
return 1;
}
-®ister_handler("eget", \&GetProfileEntryEncrypted, 0, 1, 0);
+®ister_handler("eget", \&get_profile_entry_encrypted, 0, 1, 0);
+
#
# Deletes a key in a user profile database.
#
@@ -2540,7 +2915,6 @@ sub get_profile_entry_encrypted {
# 0 - Exit server.
#
#
-
sub delete_profile_entry {
my ($cmd, $tail, $client) = @_;
@@ -2556,7 +2930,7 @@ sub delete_profile_entry {
foreach my $key (@keys) {
delete($hashref->{$key});
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply($client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
@@ -2569,6 +2943,7 @@ sub delete_profile_entry {
return 1;
}
®ister_handler("del", \&delete_profile_entry, 0, 1, 0);
+
#
# List the set of keys that are defined in a profile database file.
# A successful reply from this will contain an & separated list of
@@ -2597,9 +2972,9 @@ sub get_profile_keys {
foreach my $key (keys %$hashref) {
$qresult.="$key&";
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
$qresult=~s/\&$//;
- &Reply($client, "$qresult\n", $userinput);
+ &Reply($client, \$qresult, $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting keys\n", $userinput);
@@ -2658,7 +3033,7 @@ sub dump_profile_database {
$data{$symb}->{$param}=$value;
$data{$symb}->{'v.'.$param}=$v;
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
while (my ($symb,$param_hash) = each(%data)) {
while(my ($param,$value) = each (%$param_hash)){
next if ($param =~ /^v\./); # Ignore versions...
@@ -2669,7 +3044,7 @@ sub dump_profile_database {
}
}
chop($qresult);
- &Reply($client , "$qresult\n", $userinput);
+ &Reply($client , \$qresult, $userinput);
} else {
&Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting currentdump\n", $userinput);
@@ -2713,29 +3088,46 @@ sub dump_with_regexp {
my $userinput = "$cmd:$tail";
- my ($udom,$uname,$namespace,$regexp)=split(/:/,$tail);
+ my ($udom,$uname,$namespace,$regexp,$range)=split(/:/,$tail);
if (defined($regexp)) {
$regexp=&unescape($regexp);
} else {
$regexp='.';
}
+ my ($start,$end);
+ if (defined($range)) {
+ if ($range =~/^(\d+)\-(\d+)$/) {
+ ($start,$end) = ($1,$2);
+ } elsif ($range =~/^(\d+)$/) {
+ ($start,$end) = (0,$1);
+ } else {
+ undef($range);
+ }
+ }
my $hashref = &tie_user_hash($udom, $uname, $namespace,
&GDBM_READER());
if ($hashref) {
my $qresult='';
+ my $count=0;
while (my ($key,$value) = each(%$hashref)) {
if ($regexp eq '.') {
+ $count++;
+ if (defined($range) && $count >= $end) { last; }
+ if (defined($range) && $count < $start) { next; }
$qresult.=$key.'='.$value.'&';
} else {
my $unescapeKey = &unescape($key);
if (eval('$unescapeKey=~/$regexp/')) {
+ $count++;
+ if (defined($range) && $count >= $end) { last; }
+ if (defined($range) && $count < $start) { next; }
$qresult.="$key=$value&";
}
}
}
- if (untie(%$hashref)) {
+ if (&untie_user_hash($hashref)) {
chop($qresult);
- &Reply($client, "$qresult\n", $userinput);
+ &Reply($client, \$qresult, $userinput);
} else {
&Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting dump\n", $userinput);
@@ -2747,7 +3139,6 @@ sub dump_with_regexp {
return 1;
}
-
®ister_handler("dump", \&dump_with_regexp, 0, 1, 0);
# Store a set of key=value pairs associated with a versioned name.
@@ -2779,7 +3170,7 @@ sub store_handler {
chomp($what);
my @pairs=split(/\&/,$what);
my $hashref = &tie_user_hash($udom, $uname, $namespace,
- &GDBM_WRCREAT(), "P",
+ &GDBM_WRCREAT(), "S",
"$rid:$what");
if ($hashref) {
my $now = time;
@@ -2796,7 +3187,7 @@ sub store_handler {
$hashref->{"$version:$rid:timestamp"}=$now;
$allkeys.='timestamp';
$hashref->{"$version:keys:$rid"}=$allkeys;
- if (untie($hashref)) {
+ if (&untie_user_hash($hashref)) {
&Reply($client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
@@ -2813,6 +3204,86 @@ sub store_handler {
return 1;
}
®ister_handler("store", \&store_handler, 0, 1, 0);
+
+# Modify a set of key=value pairs associated with a versioned name.
+#
+# Parameters:
+# $cmd - Request command keyword.
+# $tail - Tail of the request. This is a colon
+# separated list containing:
+# domain/user - User and authentication domain.
+# namespace - Name of the database being modified
+# rid - Resource keyword to modify.
+# v - Version item to modify
+# what - new value associated with rid.
+#
+# $client - Socket open on the client.
+#
+#
+# Returns:
+# 1 (keep on processing).
+# Side-Effects:
+# Writes to the client
+sub putstore_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$cmd:$tail";
+
+ my ($udom,$uname,$namespace,$rid,$v,$what) =split(/:/,$tail);
+ if ($namespace ne 'roles') {
+
+ chomp($what);
+ my $hashref = &tie_user_hash($udom, $uname, $namespace,
+ &GDBM_WRCREAT(), "M",
+ "$rid:$v:$what");
+ if ($hashref) {
+ my $now = time;
+ my %data = &hash_extract($what);
+ my @allkeys;
+ while (my($key,$value) = each(%data)) {
+ push(@allkeys,$key);
+ $hashref->{"$v:$rid:$key"} = $value;
+ }
+ my $allkeys = join(':',@allkeys);
+ $hashref->{"$v:keys:$rid"}=$allkeys;
+
+ if (&untie_user_hash($hashref)) {
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting store\n", $userinput);
+ }
+ } else {
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting store\n", $userinput);
+ }
+ } else {
+ &Failure($client, "refused\n", $userinput);
+ }
+
+ return 1;
+}
+®ister_handler("putstore", \&putstore_handler, 0, 1, 0);
+
+sub hash_extract {
+ my ($str)=@_;
+ my %hash;
+ foreach my $pair (split(/\&/,$str)) {
+ my ($key,$value)=split(/=/,$pair);
+ $hash{$key}=$value;
+ }
+ return (%hash);
+}
+sub hash_to_str {
+ my ($hash_ref)=@_;
+ my $str;
+ foreach my $key (keys(%$hash_ref)) {
+ $str.=$key.'='.$hash_ref->{$key}.'&';
+ }
+ $str=~s/\&$//;
+ return $str;
+}
+
#
# Dump out all versions of a resource that has key=value pairs associated
# with it for each version. These resources are built up via the store
@@ -2842,31 +3313,29 @@ sub restore_handler {
my ($cmd, $tail, $client) = @_;
my $userinput = "$cmd:$tail"; # Only used for logging purposes.
-
- my ($cmd,$udom,$uname,$namespace,$rid) = split(/:/,$userinput);
+ my ($udom,$uname,$namespace,$rid) = split(/:/,$tail);
$namespace=~s/\//\_/g;
- $namespace=~s/\W//g;
+ $namespace = &LONCAPA::clean_username($namespace);
+
chomp($rid);
- my $proname=&propath($udom,$uname);
my $qresult='';
- my %hash;
- if (tie(%hash,'GDBM_File',"$proname/$namespace.db",
- &GDBM_READER(),0640)) {
- my $version=$hash{"version:$rid"};
+ my $hashref = &tie_user_hash($udom, $uname, $namespace, &GDBM_READER());
+ if ($hashref) {
+ my $version=$hashref->{"version:$rid"};
$qresult.="version=$version&";
my $scope;
for ($scope=1;$scope<=$version;$scope++) {
- my $vkeys=$hash{"$scope:keys:$rid"};
+ my $vkeys=$hashref->{"$scope:keys:$rid"};
my @keys=split(/:/,$vkeys);
my $key;
$qresult.="$scope:keys=$vkeys&";
foreach $key (@keys) {
- $qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
+ $qresult.="$scope:$key=".$hashref->{"$scope:$rid:$key"}."&";
}
}
- if (untie(%hash)) {
+ if (&untie_user_hash($hashref)) {
$qresult=~s/\&$//;
- &Reply( $client, "$qresult\n", $userinput);
+ &Reply( $client, \$qresult, $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting restore\n", $userinput);
@@ -2883,15 +3352,17 @@ sub restore_handler {
®ister_handler("restore", \&restore_handler, 0,1,0);
#
-# Add a chat message to to a discussion board.
+# Add a chat message to a synchronous discussion board.
#
# Parameters:
# $cmd - Request keyword.
# $tail - Tail of the command. A colon separated list
# containing:
# cdom - Domain on which the chat board lives
-# cnum - Identifier of the discussion group.
-# post - Body of the posting.
+# cnum - Course containing the chat board.
+# newpost - Body of the posting.
+# group - Optional group, if chat board is only
+# accessible in a group within the course
# $client - Socket open on the client.
# Returns:
# 1 - Indicating caller should keep on processing.
@@ -2906,15 +3377,16 @@ sub send_chat_handler {
my $userinput = "$cmd:$tail";
- my ($cdom,$cnum,$newpost)=split(/\:/,$tail);
- &chat_add($cdom,$cnum,$newpost);
+ my ($cdom,$cnum,$newpost,$group)=split(/\:/,$tail);
+ &chat_add($cdom,$cnum,$newpost,$group);
&Reply($client, "ok\n", $userinput);
return 1;
}
®ister_handler("chatsend", \&send_chat_handler, 0, 1, 0);
+
#
-# Retrieve the set of chat messagss from a discussion board.
+# Retrieve the set of chat messages from a discussion board.
#
# Parameters:
# $cmd - Command keyword that initiated the request.
@@ -2924,6 +3396,8 @@ sub send_chat_handler {
# chat id - Discussion thread(?)
# domain/user - Authentication domain and username
# of the requesting person.
+# group - Optional course group containing
+# the board.
# $client - Socket open on the client program.
# Returns:
# 1 - continue processing
@@ -2936,13 +3410,13 @@ sub retrieve_chat_handler {
my $userinput = "$cmd:$tail";
- my ($cdom,$cnum,$udom,$uname)=split(/\:/,$tail);
+ my ($cdom,$cnum,$udom,$uname,$group)=split(/\:/,$tail);
my $reply='';
- foreach (&get_chat($cdom,$cnum,$udom,$uname)) {
+ foreach (&get_chat($cdom,$cnum,$udom,$uname,$group)) {
$reply.=&escape($_).':';
}
$reply=~s/\:$//;
- &Reply($client, $reply."\n", $userinput);
+ &Reply($client, \$reply, $userinput);
return 1;
@@ -3015,7 +3489,7 @@ sub reply_query_handler {
my $userinput = "$cmd:$tail";
- my ($cmd,$id,$reply)=split(/:/,$userinput);
+ my ($id,$reply)=split(/:/,$tail);
my $store;
my $execdir=$perlvar{'lonDaemons'};
if ($store=IO::File->new(">$execdir/tmp/$id")) {
@@ -3048,6 +3522,14 @@ sub reply_query_handler {
# $tail - Tail of the command. In this case consists of a colon
# separated list contaning the domain to apply this to and
# an ampersand separated list of keyword=value pairs.
+# Each value is a colon separated list that includes:
+# description, institutional code and course owner.
+# For backward compatibility with versions included
+# in LON-CAPA 1.1.X (and earlier) and 1.2.X, institutional
+# code and/or course owner are preserved from the existing
+# record when writing a new record in response to 1.1 or
+# 1.2 implementations of lonnet::flushcourselogs().
+#
# $client - Socket open on the client.
# Returns:
# 1 - indicating that processing should continue
@@ -3061,7 +3543,7 @@ sub put_course_id_handler {
my $userinput = "$cmd:$tail";
- my ($udom, $what) = split(/:/, $tail);
+ my ($udom, $what) = split(/:/, $tail,2);
chomp($what);
my $now=time;
my @pairs=split(/\&/,$what);
@@ -3069,18 +3551,51 @@ sub put_course_id_handler {
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {
foreach my $pair (@pairs) {
- my ($key,$value)=split(/=/,$pair);
- $hashref->{$key}=$value.':'.$now;
+ my ($key,$courseinfo) = split(/=/,$pair,2);
+ $courseinfo =~ s/=/:/g;
+ if (defined($hashref->{$key})) {
+ my $value = &Apache::lonnet::thaw_unescape($hashref->{$key});
+ if (ref($value) eq 'HASH') {
+ my @items = ('description','inst_code','owner','type');
+ my @new_items = split(/:/,$courseinfo,-1);
+ my %storehash;
+ for (my $i=0; $i<@new_items; $i++) {
+ $storehash{$items[$i]} = &unescape($new_items[$i]);
+ }
+ $hashref->{$key} =
+ &Apache::lonnet::freeze_escape(\%storehash);
+ my $unesc_key = &unescape($key);
+ $hashref->{&escape('lasttime:'.$unesc_key)} = $now;
+ next;
+ }
+ }
+ my @current_items = split(/:/,$hashref->{$key},-1);
+ shift(@current_items); # remove description
+ pop(@current_items); # remove last access
+ my $numcurrent = scalar(@current_items);
+ if ($numcurrent > 3) {
+ $numcurrent = 3;
+ }
+ my @new_items = split(/:/,$courseinfo,-1);
+ my $numnew = scalar(@new_items);
+ if ($numcurrent > 0) {
+ if ($numnew <= $numcurrent) { # flushcourselogs() from pre 2.2
+ for (my $j=$numcurrent-$numnew; $j>=0; $j--) {
+ $courseinfo .= ':'.$current_items[$numcurrent-$j-1];
+ }
+ }
+ }
+ $hashref->{$key}=$courseinfo.':'.$now;
}
- if (untie(%$hashref)) {
- &Reply($client, "ok\n", $userinput);
+ if (&untie_domain_hash($hashref)) {
+ &Reply( $client, "ok\n", $userinput);
} else {
- &Failure( $client, "error: ".($!+0)
+ &Failure($client, "error: ".($!+0)
." untie(GDBM) Failed ".
"while attempting courseidput\n", $userinput);
}
} else {
- &Failure( $client, "error: ".($!+0)
+ &Failure($client, "error: ".($!+0)
." tie(GDBM) Failed ".
"while attempting courseidput\n", $userinput);
}
@@ -3089,6 +3604,49 @@ sub put_course_id_handler {
}
®ister_handler("courseidput", \&put_course_id_handler, 0, 1, 0);
+sub put_course_id_hash_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($udom,$mode,$what) = split(/:/, $tail,3);
+ chomp($what);
+ my $now=time;
+ my @pairs=split(/\&/,$what);
+ my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
+ if ($hashref) {
+ foreach my $pair (@pairs) {
+ my ($key,$value)=split(/=/,$pair);
+ my $unesc_key = &unescape($key);
+ if ($mode ne 'timeonly') {
+ if (!defined($hashref->{&escape('lasttime:'.$unesc_key)})) {
+ my $curritems = &Apache::lonnet::thaw_unescape($key);
+ if (ref($curritems) ne 'HASH') {
+ my @current_items = split(/:/,$hashref->{$key},-1);
+ my $lasttime = pop(@current_items);
+ $hashref->{&escape('lasttime:'.$unesc_key)} = $lasttime;
+ } else {
+ $hashref->{&escape('lasttime:'.$unesc_key)} = '';
+ }
+ }
+ $hashref->{$key} = $value;
+ }
+ if ($mode ne 'notime') {
+ $hashref->{&escape('lasttime:'.$unesc_key)} = $now;
+ }
+ }
+ if (&untie_domain_hash($hashref)) {
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting courseidputhash\n", $userinput);
+ }
+ } else {
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting courseidputhash\n", $userinput);
+ }
+ return 1;
+}
+®ister_handler("courseidputhash", \&put_course_id_hash_handler, 0, 1, 0);
+
# Retrieves the value of a course id resource keyword pattern
# defined since a starting date. Both the starting date and the
# keyword pattern are optional. If the starting date is not supplied it
@@ -3107,6 +3665,33 @@ sub put_course_id_handler {
# description - regular expression that is used to filter
# the dump. Only keywords matching this regexp
# will be used.
+# institutional code - optional supplied code to filter
+# the dump. Only courses with an institutional code
+# that match the supplied code will be returned.
+# owner - optional supplied username and domain of owner to
+# filter the dump. Only courses for which the course
+# owner matches the supplied username and/or domain
+# will be returned. Pre-2.2.0 legacy entries from
+# nohist_courseiddump will only contain usernames.
+# type - optional parameter for selection
+# regexp_ok - if true, allow the supplied institutional code
+# filter to behave as a regular expression.
+# rtn_as_hash - whether to return the information available for
+# each matched item as a frozen hash of all
+# key, value pairs in the item's hash, or as a
+# colon-separated list of (in order) description,
+# institutional code, and course owner.
+# selfenrollonly - filter by courses allowing self-enrollment
+# now or in the future (selfenrollonly = 1).
+# catfilter - filter by course category, assigned to a course
+# using manually defined categories (i.e., not
+# self-cataloging based on on institutional code).
+# showhidden - include course in results even if course
+# was set to be excluded from course catalog (DC only).
+# caller - if set to 'coursecatalog', courses set to be hidden
+# from course catalog will be excluded from results (unless
+# overridden by "showhidden".
+#
# $client - The socket open on the client.
# Returns:
# 1 - Continue processing.
@@ -3114,39 +3699,230 @@ sub put_course_id_handler {
# a reply is written to $client.
sub dump_course_id_handler {
my ($cmd, $tail, $client) = @_;
-
my $userinput = "$cmd:$tail";
- my ($udom,$since,$description) =split(/:/,$tail);
+ my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
+ $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden,
+ $caller) =split(/:/,$tail);
+ my $now = time;
if (defined($description)) {
$description=&unescape($description);
} else {
$description='.';
}
- unless (defined($since)) { $since=0; }
+ if (defined($instcodefilter)) {
+ $instcodefilter=&unescape($instcodefilter);
+ } else {
+ $instcodefilter='.';
+ }
+ my ($ownerunamefilter,$ownerdomfilter);
+ if (defined($ownerfilter)) {
+ $ownerfilter=&unescape($ownerfilter);
+ if ($ownerfilter ne '.' && defined($ownerfilter)) {
+ if ($ownerfilter =~ /^([^:]*):([^:]*)$/) {
+ $ownerunamefilter = $1;
+ $ownerdomfilter = $2;
+ } else {
+ $ownerunamefilter = $ownerfilter;
+ $ownerdomfilter = '';
+ }
+ }
+ } else {
+ $ownerfilter='.';
+ }
+
+ if (defined($coursefilter)) {
+ $coursefilter=&unescape($coursefilter);
+ } else {
+ $coursefilter='.';
+ }
+ if (defined($typefilter)) {
+ $typefilter=&unescape($typefilter);
+ } else {
+ $typefilter='.';
+ }
+ if (defined($regexp_ok)) {
+ $regexp_ok=&unescape($regexp_ok);
+ }
+ if (defined($catfilter)) {
+ $catfilter=&unescape($catfilter);
+ }
+ my $unpack = 1;
+ if ($description eq '.' && $instcodefilter eq '.' && $coursefilter eq '.' &&
+ $typefilter eq '.') {
+ $unpack = 0;
+ }
+ if (!defined($since)) { $since=0; }
my $qresult='';
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {
while (my ($key,$value) = each(%$hashref)) {
- my ($descr,$lasttime,$inst_code);
- if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
- ($descr,$inst_code,$lasttime)=($1,$2,$3);
- } else {
- ($descr,$lasttime) = split(/\:/,$value);
- }
- if ($lasttime<$since) { next; }
- if ($description eq '.') {
- $qresult.=$key.'='.$descr.':'.$inst_code.'&';
- } else {
- my $unescapeVal = &unescape($descr);
- if (eval('$unescapeVal=~/\Q$description\E/i')) {
- $qresult.=$key.'='.$descr.':'.$inst_code.'&';
- }
+ my ($unesc_key,$lasttime_key,$lasttime,$is_hash,%val,
+ %unesc_val,$selfenroll_end,$selfenroll_types);
+ $unesc_key = &unescape($key);
+ if ($unesc_key =~ /^lasttime:/) {
+ next;
+ } else {
+ $lasttime_key = &escape('lasttime:'.$unesc_key);
+ }
+ if ($hashref->{$lasttime_key} ne '') {
+ $lasttime = $hashref->{$lasttime_key};
+ next if ($lasttime<$since);
+ }
+ my $items = &Apache::lonnet::thaw_unescape($value);
+ if (ref($items) eq 'HASH') {
+ $is_hash = 1;
+ if ($unpack || !$rtn_as_hash) {
+ $unesc_val{'descr'} = $items->{'description'};
+ $unesc_val{'inst_code'} = $items->{'inst_code'};
+ $unesc_val{'owner'} = $items->{'owner'};
+ $unesc_val{'type'} = $items->{'type'};
+ }
+ $selfenroll_types = $items->{'selfenroll_types'};
+ $selfenroll_end = $items->{'selfenroll_end_date'};
+ if ($selfenrollonly) {
+ next if (!$selfenroll_types);
+ if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
+ next;
+ }
+ }
+ if ($catfilter ne '') {
+ next if ($items->{'categories'} eq '');
+ my @categories = split('&',$items->{'categories'});
+ next if (@categories == 0);
+ my @subcats = split('&',$catfilter);
+ my $matchcat = 0;
+ foreach my $cat (@categories) {
+ if (grep(/^\Q$cat\E$/,@subcats)) {
+ $matchcat = 1;
+ last;
+ }
+ }
+ next if (!$matchcat);
+ }
+ if ($caller eq 'coursecatalog') {
+ if ($items->{'hidefromcat'} eq 'yes') {
+ next if !$showhidden;
+ }
+ }
+ } else {
+ next if ($catfilter ne '');
+ next if ($selfenrollonly);
+ $is_hash = 0;
+ my @courseitems = split(/:/,$value);
+ $lasttime = pop(@courseitems);
+ if ($hashref->{$lasttime_key} eq '') {
+ next if ($lasttime<$since);
+ }
+ ($val{'descr'},$val{'inst_code'},$val{'owner'},$val{'type'}) = @courseitems;
+ }
+ my $match = 1;
+ if ($description ne '.') {
+ if (!$is_hash) {
+ $unesc_val{'descr'} = &unescape($val{'descr'});
+ }
+ if (eval{$unesc_val{'descr'} !~ /\Q$description\E/i}) {
+ $match = 0;
+ }
+ }
+ if ($instcodefilter ne '.') {
+ if (!$is_hash) {
+ $unesc_val{'inst_code'} = &unescape($val{'inst_code'});
+ }
+ if ($regexp_ok) {
+ if (eval{$unesc_val{'inst_code'} !~ /$instcodefilter/}) {
+ $match = 0;
+ }
+ } else {
+ if (eval{$unesc_val{'inst_code'} !~ /\Q$instcodefilter\E/i}) {
+ $match = 0;
+ }
+ }
}
+ if ($ownerfilter ne '.') {
+ if (!$is_hash) {
+ $unesc_val{'owner'} = &unescape($val{'owner'});
+ }
+ if (($ownerunamefilter ne '') && ($ownerdomfilter ne '')) {
+ if ($unesc_val{'owner'} =~ /:/) {
+ if (eval{$unesc_val{'owner'} !~
+ /\Q$ownerunamefilter\E:\Q$ownerdomfilter\E$/i}) {
+ $match = 0;
+ }
+ } else {
+ if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E/i}) {
+ $match = 0;
+ }
+ }
+ } elsif ($ownerunamefilter ne '') {
+ if ($unesc_val{'owner'} =~ /:/) {
+ if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E:[^:]+$/i}) {
+ $match = 0;
+ }
+ } else {
+ if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E/i}) {
+ $match = 0;
+ }
+ }
+ } elsif ($ownerdomfilter ne '') {
+ if ($unesc_val{'owner'} =~ /:/) {
+ if (eval{$unesc_val{'owner'} !~ /^[^:]+:\Q$ownerdomfilter\E/}) {
+ $match = 0;
+ }
+ } else {
+ if ($ownerdomfilter ne $udom) {
+ $match = 0;
+ }
+ }
+ }
+ }
+ if ($coursefilter ne '.') {
+ if (eval{$unesc_key !~ /^$udom(_)\Q$coursefilter\E$/}) {
+ $match = 0;
+ }
+ }
+ if ($typefilter ne '.') {
+ if (!$is_hash) {
+ $unesc_val{'type'} = &unescape($val{'type'});
+ }
+ if ($unesc_val{'type'} eq '') {
+ if ($typefilter ne 'Course') {
+ $match = 0;
+ }
+ } else {
+ if (eval{$unesc_val{'type'} !~ /^\Q$typefilter\E$/}) {
+ $match = 0;
+ }
+ }
+ }
+ if ($match == 1) {
+ if ($rtn_as_hash) {
+ if ($is_hash) {
+ $qresult.=$key.'='.$value.'&';
+ } else {
+ my %rtnhash = ( 'description' => &unescape($val{'descr'}),
+ 'inst_code' => &unescape($val{'inst_code'}),
+ 'owner' => &unescape($val{'owner'}),
+ 'type' => &unescape($val{'type'}),
+ );
+ my $items = &Apache::lonnet::freeze_escape(\%rtnhash);
+ $qresult.=$key.'='.$items.'&';
+ }
+ } else {
+ if ($is_hash) {
+ $qresult .= $key.'='.&escape($unesc_val{'descr'}).':'.
+ &escape($unesc_val{'inst_code'}).':'.
+ &escape($unesc_val{'owner'}).'&';
+ } else {
+ $qresult .= $key.'='.$val{'descr'}.':'.$val{'inst_code'}.
+ ':'.$val{'owner'}.'&';
+ }
+ }
+ }
}
- if (untie(%$hashref)) {
+ if (&untie_domain_hash($hashref)) {
chop($qresult);
- &Reply($client, "$qresult\n", $userinput);
+ &Reply($client, \$qresult, $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting courseiddump\n", $userinput);
@@ -3155,11 +3931,102 @@ sub dump_course_id_handler {
&Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
"while attempting courseiddump\n", $userinput);
}
+ return 1;
+}
+®ister_handler("courseiddump", \&dump_course_id_handler, 0, 1, 0);
+
+#
+# Puts an unencrypted entry in a namespace db file at the domain level
+#
+# Parameters:
+# $cmd - The command that got us here.
+# $tail - Tail of the command (remaining parameters).
+# $client - File descriptor connected to client.
+# Returns
+# 0 - Requested to exit, caller should shut down.
+# 1 - Continue processing.
+# Side effects:
+# reply is written to $client.
+#
+sub put_domain_handler {
+ my ($cmd,$tail,$client) = @_;
+
+ my $userinput = "$cmd:$tail";
+ my ($udom,$namespace,$what) =split(/:/,$tail,3);
+ chomp($what);
+ my @pairs=split(/\&/,$what);
+ my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_WRCREAT(),
+ "P", $what);
+ if ($hashref) {
+ foreach my $pair (@pairs) {
+ my ($key,$value)=split(/=/,$pair);
+ $hashref->{$key}=$value;
+ }
+ if (&untie_domain_hash($hashref)) {
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting putdom\n", $userinput);
+ }
+ } else {
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting putdom\n", $userinput);
+ }
return 1;
}
-®ister_handler("courseiddump", \&dump_course_id_handler, 0, 1, 0);
+®ister_handler("putdom", \&put_domain_handler, 0, 1, 0);
+
+# Unencrypted get from the namespace database file at the domain level.
+# This function retrieves a keyed item from a specific named database in the
+# domain directory.
+#
+# Parameters:
+# $cmd - Command request keyword (get).
+# $tail - Tail of the command. This is a colon separated list
+# consisting of the domain and the 'namespace'
+# which selects the gdbm file to do the lookup in,
+# & separated list of keys to lookup. Note that
+# the values are returned as an & separated list too.
+# $client - File descriptor open on the client.
+# Returns:
+# 1 - Continue processing.
+# 0 - Exit.
+# Side effects:
+# reply is written to $client.
+#
+
+sub get_domain_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$client:$tail";
+
+ my ($udom,$namespace,$what)=split(/:/,$tail,3);
+ chomp($what);
+ my @queries=split(/\&/,$what);
+ my $qresult='';
+ my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
+ if ($hashref) {
+ for (my $i=0;$i<=$#queries;$i++) {
+ $qresult.="$hashref->{$queries[$i]}&";
+ }
+ if (&untie_domain_hash($hashref)) {
+ $qresult=~s/\&$//;
+ &Reply($client, \$qresult, $userinput);
+ } else {
+ &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting getdom\n",$userinput);
+ }
+ } else {
+ &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting getdom\n",$userinput);
+ }
+
+ return 1;
+}
+®ister_handler("getdom", \&get_domain_handler, 0, 1, 0);
+
#
# Puts an id to a domains id database.
@@ -3193,7 +4060,7 @@ sub put_id_handler {
my ($key,$value)=split(/=/,$pair);
$hashref->{$key}=$value;
}
- if (untie(%$hashref)) {
+ if (&untie_domain_hash($hashref)) {
&Reply($client, "ok\n", $userinput);
} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
@@ -3206,8 +4073,8 @@ sub put_id_handler {
return 1;
}
-
®ister_handler("idput", \&put_id_handler, 0, 1, 0);
+
#
# Retrieves a set of id values from the id database.
# Returns an & separated list of results, one for each requested id to the
@@ -3242,9 +4109,9 @@ sub get_id_handler {
for (my $i=0;$i<=$#queries;$i++) {
$qresult.="$hashref->{$queries[$i]}&";
}
- if (untie(%$hashref)) {
+ if (&untie_domain_hash($hashref)) {
$qresult=~s/\&$//;
- &Reply($client, "$qresult\n", $userinput);
+ &Reply($client, \$qresult, $userinput);
} else {
&Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting idget\n",$userinput);
@@ -3256,10 +4123,261 @@ sub get_id_handler {
return 1;
}
+®ister_handler("idget", \&get_id_handler, 0, 1, 0);
-register_handler("idget", \&get_id_handler, 0, 1, 0);
+#
+# Puts broadcast e-mail sent by Domain Coordinator in nohist_dcmail database
+#
+# Parameters
+# $cmd - Command keyword that caused us to be dispatched.
+# $tail - Tail of the command. Consists of a colon separated:
+# domain - the domain whose dcmail we are recording
+# email Consists of key=value pair
+# where key is unique msgid
+# and value is message (in XML)
+# $client - Socket open on the client.
+#
+# Returns:
+# 1 - indicating processing should continue.
+# Side effects
+# reply is written to $client.
+#
+sub put_dcmail_handler {
+ my ($cmd,$tail,$client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my ($udom,$what)=split(/:/,$tail);
+ chomp($what);
+ my $hashref = &tie_domain_hash($udom, "nohist_dcmail", &GDBM_WRCREAT());
+ if ($hashref) {
+ my ($key,$value)=split(/=/,$what);
+ $hashref->{$key}=$value;
+ }
+ if (&untie_domain_hash($hashref)) {
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting dcmailput\n", $userinput);
+ }
+ return 1;
+}
+®ister_handler("dcmailput", \&put_dcmail_handler, 0, 1, 0);
+
+#
+# Retrieves broadcast e-mail from nohist_dcmail database
+# Returns to client an & separated list of key=value pairs,
+# where key is msgid and value is message information.
+#
+# Parameters
+# $cmd - Command keyword that caused us to be dispatched.
+# $tail - Tail of the command. Consists of a colon separated:
+# domain - the domain whose dcmail table we dump
+# startfilter - beginning of time window
+# endfilter - end of time window
+# sendersfilter - & separated list of username:domain
+# for senders to search for.
+# $client - Socket open on the client.
+#
+# Returns:
+# 1 - indicating processing should continue.
+# Side effects
+# reply (& separated list of msgid=messageinfo pairs) is
+# written to $client.
+#
+sub dump_dcmail_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$cmd:$tail";
+ my ($udom,$startfilter,$endfilter,$sendersfilter) = split(/:/,$tail);
+ chomp($sendersfilter);
+ my @senders = ();
+ if (defined($startfilter)) {
+ $startfilter=&unescape($startfilter);
+ } else {
+ $startfilter='.';
+ }
+ if (defined($endfilter)) {
+ $endfilter=&unescape($endfilter);
+ } else {
+ $endfilter='.';
+ }
+ if (defined($sendersfilter)) {
+ $sendersfilter=&unescape($sendersfilter);
+ @senders = map { &unescape($_) } split(/\&/,$sendersfilter);
+ }
+
+ my $qresult='';
+ my $hashref = &tie_domain_hash($udom, "nohist_dcmail", &GDBM_WRCREAT());
+ if ($hashref) {
+ while (my ($key,$value) = each(%$hashref)) {
+ my $match = 1;
+ my ($timestamp,$subj,$uname,$udom) =
+ split(/:/,&unescape(&unescape($key)),5); # yes, twice really
+ $subj = &unescape($subj);
+ unless ($startfilter eq '.' || !defined($startfilter)) {
+ if ($timestamp < $startfilter) {
+ $match = 0;
+ }
+ }
+ unless ($endfilter eq '.' || !defined($endfilter)) {
+ if ($timestamp > $endfilter) {
+ $match = 0;
+ }
+ }
+ unless (@senders < 1) {
+ unless (grep/^$uname:$udom$/,@senders) {
+ $match = 0;
+ }
+ }
+ if ($match == 1) {
+ $qresult.=$key.'='.$value.'&';
+ }
+ }
+ if (&untie_domain_hash($hashref)) {
+ chop($qresult);
+ &Reply($client, \$qresult, $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting dcmaildump\n", $userinput);
+ }
+ } else {
+ &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting dcmaildump\n", $userinput);
+ }
+ return 1;
+}
+
+®ister_handler("dcmaildump", \&dump_dcmail_handler, 0, 1, 0);
+
+#
+# Puts domain roles in nohist_domainroles database
+#
+# Parameters
+# $cmd - Command keyword that caused us to be dispatched.
+# $tail - Tail of the command. Consists of a colon separated:
+# domain - the domain whose roles we are recording
+# role - Consists of key=value pair
+# where key is unique role
+# and value is start/end date information
+# $client - Socket open on the client.
+#
+# Returns:
+# 1 - indicating processing should continue.
+# Side effects
+# reply is written to $client.
+#
+sub put_domainroles_handler {
+ my ($cmd,$tail,$client) = @_;
+
+ my $userinput = "$cmd:$tail";
+ my ($udom,$what)=split(/:/,$tail);
+ chomp($what);
+ my @pairs=split(/\&/,$what);
+ my $hashref = &tie_domain_hash($udom, "nohist_domainroles", &GDBM_WRCREAT());
+ if ($hashref) {
+ foreach my $pair (@pairs) {
+ my ($key,$value)=split(/=/,$pair);
+ $hashref->{$key}=$value;
+ }
+ if (&untie_domain_hash($hashref)) {
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting domroleput\n", $userinput);
+ }
+ } else {
+ &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting domroleput\n", $userinput);
+ }
+
+ return 1;
+}
+
+®ister_handler("domroleput", \&put_domainroles_handler, 0, 1, 0);
+
+#
+# Retrieves domain roles from nohist_domainroles database
+# Returns to client an & separated list of key=value pairs,
+# where key is role and value is start and end date information.
+#
+# Parameters
+# $cmd - Command keyword that caused us to be dispatched.
+# $tail - Tail of the command. Consists of a colon separated:
+# domain - the domain whose domain roles table we dump
+# $client - Socket open on the client.
#
+# Returns:
+# 1 - indicating processing should continue.
+# Side effects
+# reply (& separated list of role=start/end info pairs) is
+# written to $client.
+#
+sub dump_domainroles_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$cmd:$tail";
+ my ($udom,$startfilter,$endfilter,$rolesfilter) = split(/:/,$tail);
+ chomp($rolesfilter);
+ my @roles = ();
+ if (defined($startfilter)) {
+ $startfilter=&unescape($startfilter);
+ } else {
+ $startfilter='.';
+ }
+ if (defined($endfilter)) {
+ $endfilter=&unescape($endfilter);
+ } else {
+ $endfilter='.';
+ }
+ if (defined($rolesfilter)) {
+ $rolesfilter=&unescape($rolesfilter);
+ @roles = split(/\&/,$rolesfilter);
+ }
+
+ my $hashref = &tie_domain_hash($udom, "nohist_domainroles", &GDBM_WRCREAT());
+ if ($hashref) {
+ my $qresult = '';
+ while (my ($key,$value) = each(%$hashref)) {
+ my $match = 1;
+ my ($start,$end) = split(/:/,&unescape($value));
+ my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,&unescape($key));
+ unless ($startfilter eq '.' || !defined($startfilter)) {
+ if ((defined($start)) && ($start >= $startfilter)) {
+ $match = 0;
+ }
+ }
+ unless ($endfilter eq '.' || !defined($endfilter)) {
+ if ((defined($end)) && ($end <= $endfilter)) {
+ $match = 0;
+ }
+ }
+ unless (@roles < 1) {
+ unless (grep/^\Q$trole\E$/,@roles) {
+ $match = 0;
+ }
+ }
+ if ($match == 1) {
+ $qresult.=$key.'='.$value.'&';
+ }
+ }
+ if (&untie_domain_hash($hashref)) {
+ chop($qresult);
+ &Reply($client, \$qresult, $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+ "while attempting domrolesdump\n", $userinput);
+ }
+ } else {
+ &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+ "while attempting domrolesdump\n", $userinput);
+ }
+ return 1;
+}
+
+®ister_handler("domrolesdump", \&dump_domainroles_handler, 0, 1, 0);
+
+
# Process the tmpput command I'm not sure what this does.. Seems to
# create a file in the lonDaemons/tmp directory of the form $id.tmp
# where Id is the client's ip concatenated with a sequence number.
@@ -3281,17 +4399,25 @@ sub tmp_put_handler {
my $userinput = "$cmd:$what"; # Reconstruct for logging.
-
- my $store;
+ my ($record,$context) = split(/:/,$what);
+ if ($context ne '') {
+ chomp($context);
+ $context = &unescape($context);
+ }
+ my ($id,$store);
$tmpsnum++;
- my $id=$$.'_'.$clientip.'_'.$tmpsnum;
+ if ($context eq 'resetpw') {
+ $id = &md5_hex(&md5_hex(time.{}.rand().$$));
+ } else {
+ $id = $$.'_'.$clientip.'_'.$tmpsnum;
+ }
$id=~s/\W/\_/g;
- $what=~s/\n//g;
+ $record=~s/\n//g;
my $execdir=$perlvar{'lonDaemons'};
if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
- print $store $what;
+ print $store $record;
close $store;
- &Reply($client, "$id\n", $userinput);
+ &Reply($client, \$id, $userinput);
} else {
&Failure( $client, "error: ".($!+0)."IO::File->new Failed ".
"while attempting tmpput\n", $userinput);
@@ -3300,6 +4426,7 @@ sub tmp_put_handler {
}
®ister_handler("tmpput", \&tmp_put_handler, 0, 1, 0);
+
# Processes the tmpget command. This command returns the contents
# of a temporary resource file(?) created via tmpput.
#
@@ -3312,7 +4439,6 @@ sub tmp_put_handler {
# 1 - Inidcating processing can continue.
# Side effects:
# A reply is sent to the client.
-
#
sub tmp_get_handler {
my ($cmd, $id, $client) = @_;
@@ -3325,7 +4451,7 @@ sub tmp_get_handler {
my $execdir=$perlvar{'lonDaemons'};
if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
my $reply=<$store>;
- &Reply( $client, "$reply\n", $userinput);
+ &Reply( $client, \$reply, $userinput);
close $store;
} else {
&Failure( $client, "error: ".($!+0)."IO::File->new Failed ".
@@ -3335,6 +4461,7 @@ sub tmp_get_handler {
return 1;
}
®ister_handler("tmpget", \&tmp_get_handler, 0, 1, 0);
+
#
# Process the tmpdel command. This command deletes a temp resource
# created by the tmpput command.
@@ -3368,15 +4495,865 @@ sub tmp_del_handler {
}
®ister_handler("tmpdel", \&tmp_del_handler, 0, 1, 0);
+
+#
+# Processes the setannounce command. This command
+# creates a file named announce.txt in the top directory of
+# the documentn root and sets its contents. The announce.txt file is
+# printed in its entirety at the LonCAPA login page. Note:
+# once the announcement.txt fileis created it cannot be deleted.
+# However, setting the contents of the file to empty removes the
+# announcement from the login page of loncapa so who cares.
+#
+# Parameters:
+# $cmd - The command that got us dispatched.
+# $announcement - The text of the announcement.
+# $client - Socket open on the client process.
+# Retunrns:
+# 1 - Indicating request processing should continue
+# Side Effects:
+# The file {DocRoot}/announcement.txt is created.
+# A reply is sent to $client.
+#
+sub set_announce_handler {
+ my ($cmd, $announcement, $client) = @_;
+
+ my $userinput = "$cmd:$announcement";
+
+ chomp($announcement);
+ $announcement=&unescape($announcement);
+ if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
+ '/announcement.txt')) {
+ print $store $announcement;
+ close $store;
+ &Reply($client, "ok\n", $userinput);
+ } else {
+ &Failure($client, "error: ".($!+0)."\n", $userinput);
+ }
+
+ return 1;
+}
+®ister_handler("setannounce", \&set_announce_handler, 0, 1, 0);
+
+#
+# Return the version of the daemon. This can be used to determine
+# the compatibility of cross version installations or, alternatively to
+# simply know who's out of date and who isn't. Note that the version
+# is returned concatenated with the tail.
+# Parameters:
+# $cmd - the request that dispatched to us.
+# $tail - Tail of the request (client's version?).
+# $client - Socket open on the client.
+#Returns:
+# 1 - continue processing requests.
+# Side Effects:
+# Replies with version to $client.
+sub get_version_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = $cmd.$tail;
+
+ &Reply($client, &version($userinput)."\n", $userinput);
+
+
+ return 1;
+}
+®ister_handler("version", \&get_version_handler, 0, 1, 0);
+
+# Set the current host and domain. This is used to support
+# multihomed systems. Each IP of the system, or even separate daemons
+# on the same IP can be treated as handling a separate lonCAPA virtual
+# machine. This command selects the virtual lonCAPA. The client always
+# knows the right one since it is lonc and it is selecting the domain/system
+# from the hosts.tab file.
+# Parameters:
+# $cmd - Command that dispatched us.
+# $tail - Tail of the command (domain/host requested).
+# $socket - Socket open on the client.
+#
+# Returns:
+# 1 - Indicates the program should continue to process requests.
+# Side-effects:
+# The default domain/system context is modified for this daemon.
+# a reply is sent to the client.
+#
+sub set_virtual_host_handler {
+ my ($cmd, $tail, $socket) = @_;
+
+ my $userinput ="$cmd:$tail";
+
+ &Reply($client, &sethost($userinput)."\n", $userinput);
+
+
+ return 1;
+}
+®ister_handler("sethost", \&set_virtual_host_handler, 0, 1, 0);
+
+# Process a request to exit:
+# - "bye" is sent to the client.
+# - The client socket is shutdown and closed.
+# - We indicate to the caller that we should exit.
+# Formal Parameters:
+# $cmd - The command that got us here.
+# $tail - Tail of the command (empty).
+# $client - Socket open on the tail.
+# Returns:
+# 0 - Indicating the program should exit!!
+#
+sub exit_handler {
+ my ($cmd, $tail, $client) = @_;
+
+ my $userinput = "$cmd:$tail";
+
+ &logthis("Client $clientip ($clientname) hanging up: $userinput");
+ &Reply($client, "bye\n", $userinput);
+ $client->shutdown(2); # shutdown the socket forcibly.
+ $client->close();
+
+ return 0;
+}
+®ister_handler("exit", \&exit_handler, 0,1,1);
+®ister_handler("init", \&exit_handler, 0,1,1);
+®ister_handler("quit", \&exit_handler, 0,1,1);
+
+# Determine if auto-enrollment is enabled.
+# Note that the original had what I believe to be a defect.
+# The original returned 0 if the requestor was not a registerd client.
+# It should return "refused".
+# Formal Parameters:
+# $cmd - The command that invoked us.
+# $tail - The tail of the command (Extra command parameters.
+# $client - The socket open on the client that issued the request.
+# Returns:
+# 1 - Indicating processing should continue.
+#
+sub enrollment_enabled_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = $cmd.":".$tail; # For logging purposes.
+
+
+ my ($cdom) = split(/:/, $tail, 2); # Domain we're asking about.
+
+ my $outcome = &localenroll::run($cdom);
+ &Reply($client, \$outcome, $userinput);
+
+ return 1;
+}
+®ister_handler("autorun", \&enrollment_enabled_handler, 0, 1, 0);
+
+#
+# Validate an institutional code use for a LON-CAPA course.
+#
+# Formal Parameters:
+# $cmd - The command request that got us dispatched.
+# $tail - The tail of the command. In this case,
+# this is a colon separated set of words that will be split
+# into:
+# $inst_course_id - The institutional cod3 from the
+# institutions point of view.
+# $cdom - The domain from the institutions
+# point of view.
+# $client - Socket open on the client.
+# Returns:
+# 1 - Indicating processing should continue.
+#
+sub validate_instcode_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($dom,$instcode,$owner) = split(/:/, $tail);
+ my $outcome=&localenroll::validate_instcode($dom,$instcode,$owner);
+ &Reply($client, \$outcome, $userinput);
+
+ return 1;
+}
+®ister_handler("autovalidateinstcode", \&validate_instcode_handler, 0, 1, 0);
+
+# Get the official sections for which auto-enrollment is possible.
+# Since the admin people won't know about 'unofficial sections'
+# we cannot auto-enroll on them.
+# Formal Parameters:
+# $cmd - The command request that got us dispatched here.
+# $tail - The remainder of the request. In our case this
+# will be split into:
+# $coursecode - The course name from the admin point of view.
+# $cdom - The course's domain(?).
+# $client - Socket open on the client.
+# Returns:
+# 1 - Indiciting processing should continue.
#
+sub get_sections_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my ($coursecode, $cdom) = split(/:/, $tail);
+ my @secs = &localenroll::get_sections($coursecode,$cdom);
+ my $seclist = &escape(join(':',@secs));
+
+ &Reply($client, \$seclist, $userinput);
+
+
+ return 1;
+}
+®ister_handler("autogetsections", \&get_sections_handler, 0, 1, 0);
+
+# Validate the owner of a new course section.
#
+# Formal Parameters:
+# $cmd - Command that got us dispatched.
+# $tail - the remainder of the command. For us this consists of a
+# colon separated string containing:
+# $inst - Course Id from the institutions point of view.
+# $owner - Proposed owner of the course.
+# $cdom - Domain of the course (from the institutions
+# point of view?)..
+# $client - Socket open on the client.
#
+# Returns:
+# 1 - Processing should continue.
#
+sub validate_course_owner_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($inst_course_id, $owner, $cdom) = split(/:/, $tail);
+
+ $owner = &unescape($owner);
+ my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
+ &Reply($client, \$outcome, $userinput);
+
+
+
+ return 1;
+}
+®ister_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);
+
+#
+# Validate a course section in the official schedule of classes
+# from the institutions point of view (part of autoenrollment).
+#
+# Formal Parameters:
+# $cmd - The command request that got us dispatched.
+# $tail - The tail of the command. In this case,
+# this is a colon separated set of words that will be split
+# into:
+# $inst_course_id - The course/section id from the
+# institutions point of view.
+# $cdom - The domain from the institutions
+# point of view.
+# $client - Socket open on the client.
+# Returns:
+# 1 - Indicating processing should continue.
+#
+sub validate_course_section_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($inst_course_id, $cdom) = split(/:/, $tail);
+
+ my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
+ &Reply($client, \$outcome, $userinput);
+
+
+ return 1;
+}
+®ister_handler("autovalidatecourse", \&validate_course_section_handler, 0, 1, 0);
+
+#
+# Validate course owner's access to enrollment data for specific class section.
+#
+#
+# Formal Parameters:
+# $cmd - The command request that got us dispatched.
+# $tail - The tail of the command. In this case this is a colon separated
+# set of words that will be split into:
+# $inst_class - Institutional code for the specific class section
+# $courseowner - The escaped username:domain of the course owner
+# $cdom - The domain of the course from the institution's
+# point of view.
+# $client - The socket open on the client.
+# Returns:
+# 1 - continue processing.
+#
+
+sub validate_class_access_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($inst_class,$ownerlist,$cdom) = split(/:/, $tail);
+ my $owners = &unescape($ownerlist);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome=&localenroll::check_section($inst_class,$owners,$cdom);
+ };
+ &Reply($client,\$outcome, $userinput);
+
+ return 1;
+}
+®ister_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);
+
+#
+# Create a password for a new LON-CAPA user added by auto-enrollment.
+# Only used for case where authentication method for new user is localauth
+#
+# Formal Parameters:
+# $cmd - The command request that got us dispatched.
+# $tail - The tail of the command. In this case this is a colon separated
+# set of words that will be split into:
+# $authparam - An authentication parameter (localauth parameter).
+# $cdom - The domain of the course from the institution's
+# point of view.
+# $client - The socket open on the client.
+# Returns:
+# 1 - continue processing.
+#
+sub create_auto_enroll_password_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my ($authparam, $cdom) = split(/:/, $userinput);
+
+ my ($create_passwd,$authchk);
+ ($authparam,
+ $create_passwd,
+ $authchk) = &localenroll::create_password($authparam,$cdom);
+
+ &Reply($client, &escape($authparam.':'.$create_passwd.':'.$authchk)."\n",
+ $userinput);
+
+
+ return 1;
+}
+®ister_handler("autocreatepassword", \&create_auto_enroll_password_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 remove.
+# The filename is given as a path relative to
+# the LonCAPA temp file directory.
+# $client - Socket open on the client.
+#
+# Returns:
+# 1 - Continue processing.
+sub retrieve_auto_file_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "cmd:$tail";
+
+ my ($filename) = split(/:/, $tail);
+
+ my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
+ if ( (-e $source) && ($filename ne '') ) {
+ my $reply = '';
+ if (open(my $fh,$source)) {
+ while (<$fh>) {
+ chomp($_);
+ $_ =~ s/^\s+//g;
+ $_ =~ s/\s+$//g;
+ $reply .= $_;
+ }
+ close($fh);
+ &Reply($client, &escape($reply)."\n", $userinput);
+
+# Does this have to be uncommented??!? (RF).
+#
+# unlink($source);
+ } else {
+ &Failure($client, "error\n", $userinput);
+ }
+ } else {
+ &Failure($client, "error\n", $userinput);
+ }
+
+
+ return 1;
+}
+®ister_handler("autoretrieve", \&retrieve_auto_file_handler, 0,1,0);
+
+#
+# Read and retrieve institutional code format (for support form).
+# Formal Parameters:
+# $cmd - Command that dispatched us.
+# $tail - Tail of the command. In this case it conatins
+# the course domain and the coursename.
+# $client - Socket open on the client.
+# Returns:
+# 1 - Continue processing.
+#
+sub get_institutional_code_format_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my $reply;
+ my($cdom,$course) = split(/:/,$tail);
+ my @pairs = split/\&/,$course;
+ my %instcodes = ();
+ my %codes = ();
+ my @codetitles = ();
+ my %cat_titles = ();
+ my %cat_order = ();
+ foreach (@pairs) {
+ my ($key,$value) = split/=/,$_;
+ $instcodes{&unescape($key)} = &unescape($value);
+ }
+ my $formatreply = &localenroll::instcode_format($cdom,
+ \%instcodes,
+ \%codes,
+ \@codetitles,
+ \%cat_titles,
+ \%cat_order);
+ if ($formatreply eq 'ok') {
+ my $codes_str = &Apache::lonnet::hash2str(%codes);
+ my $codetitles_str = &Apache::lonnet::array2str(@codetitles);
+ my $cat_titles_str = &Apache::lonnet::hash2str(%cat_titles);
+ my $cat_order_str = &Apache::lonnet::hash2str(%cat_order);
+ &Reply($client,
+ $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'
+ .$cat_order_str."\n",
+ $userinput);
+ } else {
+ # this else branch added by RF since if not ok, lonc will
+ # hang waiting on reply until timeout.
+ #
+ &Reply($client, "format_error\n", $userinput);
+ }
+
+ return 1;
+}
+®ister_handler("autoinstcodeformat",
+ \&get_institutional_code_format_handler,0,1,0);
+
+sub get_institutional_defaults_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my $dom = $tail;
+ my %defaults_hash;
+ my @code_order;
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::instcode_defaults($dom,\%defaults_hash,
+ \@code_order);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result='';
+ while (my ($key,$value) = each(%defaults_hash)) {
+ $result.=&escape($key).'='.&escape($value).'&';
+ }
+ $result .= 'code_order='.&escape(join('&',@code_order));
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("autoinstcodedefaults",
+ \&get_institutional_defaults_handler,0,1,0);
+
+sub get_possible_instcodes_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+
+ my $reply;
+ my $cdom = $tail;
+ my (@codetitles,%cat_titles,%cat_order,@code_order);
+ my $formatreply = &localenroll::possible_instcodes($cdom,
+ \@codetitles,
+ \%cat_titles,
+ \%cat_order,
+ \@code_order);
+ if ($formatreply eq 'ok') {
+ my $result = join('&',map {&escape($_);} (@codetitles)).':';
+ $result .= join('&',map {&escape($_);} (@code_order)).':';
+ foreach my $key (keys(%cat_titles)) {
+ $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($cat_titles{$key}).'&';
+ }
+ $result =~ s/\&$//;
+ $result .= ':';
+ foreach my $key (keys(%cat_order)) {
+ $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($cat_order{$key}).'&';
+ }
+ $result =~ s/\&$//;
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client, "format_error\n", $userinput);
+ }
+ return 1;
+}
+®ister_handler("autopossibleinstcodes",
+ \&get_possible_instcodes_handler,0,1,0);
+
+sub get_institutional_user_rules {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $dom = &unescape($tail);
+ my (%rules_hash,@rules_order);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::username_rules($dom,\%rules_hash,\@rules_order);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result;
+ foreach my $key (keys(%rules_hash)) {
+ $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+ }
+ $result =~ s/\&$//;
+ $result .= ':';
+ if (@rules_order > 0) {
+ foreach my $item (@rules_order) {
+ $result .= &escape($item).'&';
+ }
+ }
+ $result =~ s/\&$//;
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instuserrules",\&get_institutional_user_rules,0,1,0);
+
+sub get_institutional_id_rules {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $dom = &unescape($tail);
+ my (%rules_hash,@rules_order);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::id_rules($dom,\%rules_hash,\@rules_order);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result;
+ foreach my $key (keys(%rules_hash)) {
+ $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+ }
+ $result =~ s/\&$//;
+ $result .= ':';
+ if (@rules_order > 0) {
+ foreach my $item (@rules_order) {
+ $result .= &escape($item).'&';
+ }
+ }
+ $result =~ s/\&$//;
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instidrules",\&get_institutional_id_rules,0,1,0);
+
+sub get_institutional_selfcreate_rules {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $dom = &unescape($tail);
+ my (%rules_hash,@rules_order);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::selfcreate_rules($dom,\%rules_hash,\@rules_order);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result;
+ foreach my $key (keys(%rules_hash)) {
+ $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+ }
+ $result =~ s/\&$//;
+ $result .= ':';
+ if (@rules_order > 0) {
+ foreach my $item (@rules_order) {
+ $result .= &escape($item).'&';
+ }
+ }
+ $result =~ s/\&$//;
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instemailrules",\&get_institutional_selfcreate_rules,0,1,0);
+
+
+sub institutional_username_check {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my %rulecheck;
+ my $outcome;
+ my ($udom,$uname,@rules) = split(/:/,$tail);
+ $udom = &unescape($udom);
+ $uname = &unescape($uname);
+ @rules = map {&unescape($_);} (@rules);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::username_check($udom,$uname,\@rules,\%rulecheck);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result='';
+ foreach my $key (keys(%rulecheck)) {
+ $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+ }
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instrulecheck",\&institutional_username_check,0,1,0);
+
+sub institutional_id_check {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my %rulecheck;
+ my $outcome;
+ my ($udom,$id,@rules) = split(/:/,$tail);
+ $udom = &unescape($udom);
+ $id = &unescape($id);
+ @rules = map {&unescape($_);} (@rules);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::id_check($udom,$id,\@rules,\%rulecheck);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result='';
+ foreach my $key (keys(%rulecheck)) {
+ $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+ }
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instidrulecheck",\&institutional_id_check,0,1,0);
+
+sub institutional_selfcreate_check {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my %rulecheck;
+ my $outcome;
+ my ($udom,$email,@rules) = split(/:/,$tail);
+ $udom = &unescape($udom);
+ $email = &unescape($email);
+ @rules = map {&unescape($_);} (@rules);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::selfcreate_check($udom,$email,\@rules,\%rulecheck);
+ };
+ if (!$@) {
+ if ($outcome eq 'ok') {
+ my $result='';
+ foreach my $key (keys(%rulecheck)) {
+ $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+ }
+ &Reply($client,\$result,$userinput);
+ } else {
+ &Reply($client,"error\n", $userinput);
+ }
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+}
+®ister_handler("instselfcreatecheck",\&institutional_selfcreate_check,0,1,0);
+
+# Get domain specific conditions for import of student photographs to a course
+#
+# Retrieves information from photo_permission subroutine in localenroll.
+# Returns outcome (ok) if no processing errors, and whether course owner is
+# required to accept conditions of use (yes/no).
+#
+#
+sub photo_permission_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $cdom = $tail;
+ my ($perm_reqd,$conditions);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::photo_permission($cdom,\$perm_reqd,
+ \$conditions);
+ };
+ if (!$@) {
+ &Reply($client, &escape($outcome.':'.$perm_reqd.':'. $conditions)."\n",
+ $userinput);
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+ return 1;
+}
+®ister_handler("autophotopermission",\&photo_permission_handler,0,1,0);
+
+#
+# Checks if student photo is available for a user in the domain, in the user's
+# directory (in /userfiles/internal/studentphoto.jpg).
+# Uses localstudentphoto:fetch() to ensure there is an up to date copy of
+# the student's photo.
+
+sub photo_check_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my ($udom,$uname,$pid) = split(/:/,$tail);
+ $udom = &unescape($udom);
+ $uname = &unescape($uname);
+ $pid = &unescape($pid);
+ my $path=&propath($udom,$uname).'/userfiles/internal/';
+ if (!-e $path) {
+ &mkpath($path);
+ }
+ my $response;
+ my $result = &localstudentphoto::fetch($udom,$uname,$pid,\$response);
+ $result .= ':'.$response;
+ &Reply($client, &escape($result)."\n",$userinput);
+ return 1;
+}
+®ister_handler("autophotocheck",\&photo_check_handler,0,1,0);
+
+#
+# Retrieve information from localenroll about whether to provide a button
+# for users who have enbled import of student photos to initiate an
+# update of photo files for registered students. Also include
+# comment to display alongside button.
+
+sub photo_choice_handler {
+ my ($cmd, $tail, $client) = @_;
+ my $userinput = "$cmd:$tail";
+ my $cdom = &unescape($tail);
+ my ($update,$comment);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ ($update,$comment) = &localenroll::manager_photo_update($cdom);
+ };
+ if (!$@) {
+ &Reply($client,&escape($update).':'.&escape($comment)."\n",$userinput);
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+ return 1;
+}
+®ister_handler("autophotochoice",\&photo_choice_handler,0,1,0);
+
+#
+# Gets a student's photo to exist (in the correct image type) in the user's
+# directory.
+# Formal Parameters:
+# $cmd - The command request that got us dispatched.
+# $tail - A colon separated set of words that will be split into:
+# $domain - student's domain
+# $uname - student username
+# $type - image type desired
+# $client - The socket open on the client.
+# Returns:
+# 1 - continue processing.
+
+sub student_photo_handler {
+ my ($cmd, $tail, $client) = @_;
+ my ($domain,$uname,$ext,$type) = split(/:/, $tail);
+
+ my $path=&propath($domain,$uname). '/userfiles/internal/';
+ my $filename = 'studentphoto.'.$ext;
+ if ($type eq 'thumbnail') {
+ $filename = 'studentphoto_tn.'.$ext;
+ }
+ if (-e $path.$filename) {
+ &Reply($client,"ok\n","$cmd:$tail");
+ return 1;
+ }
+ &mkpath($path);
+ my $file;
+ if ($type eq 'thumbnail') {
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $file=&localstudentphoto::fetch_thumbnail($domain,$uname);
+ };
+ } else {
+ $file=&localstudentphoto::fetch($domain,$uname);
+ }
+ if (!$file) {
+ &Failure($client,"unavailable\n","$cmd:$tail");
+ return 1;
+ }
+ if (!-e $path.$filename) { &convert_photo($file,$path.$filename); }
+ if (-e $path.$filename) {
+ &Reply($client,"ok\n","$cmd:$tail");
+ return 1;
+ }
+ &Failure($client,"unable_to_convert\n","$cmd:$tail");
+ return 1;
+}
+®ister_handler("studentphoto", \&student_photo_handler, 0, 1, 0);
+
+sub inst_usertypes_handler {
+ my ($cmd, $domain, $client) = @_;
+ my $res;
+ my $userinput = $cmd.":".$domain; # For logging purposes.
+ my (%typeshash,@order,$result);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $result=&localenroll::inst_usertypes($domain,\%typeshash,\@order);
+ };
+ if ($result eq 'ok') {
+ if (keys(%typeshash) > 0) {
+ foreach my $key (keys(%typeshash)) {
+ $res.=&escape($key).'='.&escape($typeshash{$key}).'&';
+ }
+ }
+ $res=~s/\&$//;
+ $res .= ':';
+ if (@order > 0) {
+ foreach my $item (@order) {
+ $res .= &escape($item).'&';
+ }
+ }
+ $res=~s/\&$//;
+ }
+ &Reply($client, \$res, $userinput);
+ return 1;
+}
+®ister_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);
+
+# mkpath makes all directories for a file, expects an absolute path with a
+# file or a trailing / if just a dir is passed
+# returns 1 on success 0 on failure
+sub mkpath {
+ my ($file)=@_;
+ my @parts=split(/\//,$file,-1);
+ my $now=$parts[0].'/'.$parts[1].'/'.$parts[2];
+ for (my $i=3;$i<= ($#parts-1);$i++) {
+ $now.='/'.$parts[$i];
+ if (!-e $now) {
+ if (!mkdir($now,0770)) { return 0; }
+ }
+ }
+ return 1;
+}
+
#---------------------------------------------------------------
#
# Getting, decoding and dispatching requests:
#
-
#
# Get a Request:
# Gets a Request message from the client. The transaction
@@ -3409,11 +5386,27 @@ sub process_request {
# fix all the userinput -> user_input.
my $wasenc = 0; # True if request was encrypted.
# ------------------------------------------------------------ See if encrypted
+ # for command
+ # sethost:
+ # :
+ # we just send it to the processor
+ # for
+ # sethost:::
+ # we do the implict set host and then do the command
+ if ($userinput =~ /^sethost:/) {
+ (my $cmd,my $newid,$userinput) = split(':',$userinput,3);
+ if (defined($userinput)) {
+ &sethost("$cmd:$newid");
+ } else {
+ $userinput = "$cmd:$newid";
+ }
+ }
+
if ($userinput =~ /^enc/) {
$userinput = decipher($userinput);
$wasenc=1;
if(!$userinput) { # Cipher not defined.
- &Failure($client, "error: Encrypted data without negotated key");
+ &Failure($client, "error: Encrypted data without negotated key\n");
return 0;
}
}
@@ -3483,157 +5476,7 @@ sub process_request {
}
-#------------------- Commands not yet in spearate handlers. --------------
-
-
-
-# ----------------------------------------------------------------- setannounce
- if ($userinput =~ /^setannounce/) {
- if (isClient) {
- my ($cmd,$announcement)=split(/:/,$userinput);
- chomp($announcement);
- $announcement=&unescape($announcement);
- if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
- '/announcement.txt')) {
- print $store $announcement;
- close $store;
- print $client "ok\n";
- } else {
- print $client "error: ".($!+0)."\n";
- }
- } else {
- Reply($client, "refused\n", $userinput);
-
- }
-# ------------------------------------------------------------------ Hanging up
- } elsif (($userinput =~ /^exit/) ||
- ($userinput =~ /^init/)) { # no restrictions.
- &logthis(
- "Client $clientip ($clientname) hanging up: $userinput");
- print $client "bye\n";
- $client->shutdown(2); # shutdown the socket forcibly.
- $client->close();
- return 0;
-
-# ---------------------------------- set current host/domain
- } elsif ($userinput =~ /^sethost/) {
- if (isClient) {
- print $client &sethost($userinput)."\n";
- } else {
- print $client "refused\n";
- }
-#---------------------------------- request file (?) version.
- } elsif ($userinput =~/^version/) {
- if (isClient) {
- print $client &version($userinput)."\n";
- } else {
- print $client "refused\n";
- }
-#------------------------------- is auto-enrollment enabled?
- } elsif ($userinput =~/^autorun/) {
- if (isClient) {
- my ($cmd,$cdom) = split(/:/,$userinput);
- my $outcome = &localenroll::run($cdom);
- print $client "$outcome\n";
- } else {
- print $client "0\n";
- }
-#------------------------------- get official sections (for auto-enrollment).
- } elsif ($userinput =~/^autogetsections/) {
- if (isClient) {
- my ($cmd,$coursecode,$cdom)=split(/:/,$userinput);
- my @secs = &localenroll::get_sections($coursecode,$cdom);
- my $seclist = &escape(join(':',@secs));
- print $client "$seclist\n";
- } else {
- print $client "refused\n";
- }
-#----------------------- validate owner of new course section (for auto-enrollment).
- } elsif ($userinput =~/^autonewcourse/) {
- if (isClient) {
- my ($cmd,$inst_course_id,$owner,$cdom)=split(/:/,$userinput);
- my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
- print $client "$outcome\n";
- } else {
- print $client "refused\n";
- }
-#-------------- validate course section in schedule of classes (for auto-enrollment).
- } elsif ($userinput =~/^autovalidatecourse/) {
- if (isClient) {
- my ($cmd,$inst_course_id,$cdom)=split(/:/,$userinput);
- my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
- print $client "$outcome\n";
- } else {
- print $client "refused\n";
- }
-#--------------------------- create password for new user (for auto-enrollment).
- } elsif ($userinput =~/^autocreatepassword/) {
- if (isClient) {
- my ($cmd,$authparam,$cdom)=split(/:/,$userinput);
- my ($create_passwd,$authchk);
- ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam,$cdom);
- print $client &escape($authparam.':'.$create_passwd.':'.$authchk)."\n";
- } else {
- print $client "refused\n";
- }
-#--------------------------- read and remove temporary files (for auto-enrollment).
- } elsif ($userinput =~/^autoretrieve/) {
- if (isClient) {
- my ($cmd,$filename) = split(/:/,$userinput);
- my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
- if ( (-e $source) && ($filename ne '') ) {
- my $reply = '';
- if (open(my $fh,$source)) {
- while (<$fh>) {
- chomp($_);
- $_ =~ s/^\s+//g;
- $_ =~ s/\s+$//g;
- $reply .= $_;
- }
- close($fh);
- print $client &escape($reply)."\n";
-# unlink($source);
- } else {
- print $client "error\n";
- }
- } else {
- print $client "error\n";
- }
- } else {
- print $client "refused\n";
- }
-#--------------------- read and retrieve institutional code format (for support form).
- } elsif ($userinput =~/^autoinstcodeformat/) {
- if (isClient) {
- my $reply;
- my($cmd,$cdom,$course) = split(/:/,$userinput);
- my @pairs = split/\&/,$course;
- my %instcodes = ();
- my %codes = ();
- my @codetitles = ();
- my %cat_titles = ();
- my %cat_order = ();
- foreach (@pairs) {
- my ($key,$value) = split/=/,$_;
- $instcodes{&unescape($key)} = &unescape($value);
- }
- my $formatreply = &localenroll::instcode_format($cdom,\%instcodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
- if ($formatreply eq 'ok') {
- my $codes_str = &hash2str(%codes);
- my $codetitles_str = &array2str(@codetitles);
- my $cat_titles_str = &hash2str(%cat_titles);
- my $cat_order_str = &hash2str(%cat_order);
- print $client $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'.$cat_order_str."\n";
- }
- } else {
- print $client "refused\n";
- }
-# ------------------------------------------------------------- unknown command
-
- } else {
- # unknown command
- print $client "unknown_cmd\n";
- }
+ print $client "unknown_cmd\n";
# -------------------------------------------------------------------- complete
Debug("process_request - returning 1");
return 1;
@@ -3754,7 +5597,7 @@ sub catchexception {
$SIG{__DIE__}='DEFAULT';
&status("Catching exception");
&logthis("CRITICAL: "
- ."ABNORMAL EXIT. Child $$ for server $thisserver died through "
+ ."ABNORMAL EXIT. Child $$ for server ".$perlvar{'lonHostID'}." died through "
."a crash with this error msg->[$error]");
&logthis('Famous last words: '.$status.' - '.$lastlog);
if ($client) { print $client "error: $error\n"; }
@@ -3865,53 +5708,6 @@ sub HUPSMAN { # sig
}
#
-# Kill off hashes that describe the host table prior to re-reading it.
-# Hashes affected are:
-# %hostid, %hostdom %hostip %hostdns.
-#
-sub KillHostHashes {
- foreach my $key (keys %hostid) {
- delete $hostid{$key};
- }
- foreach my $key (keys %hostdom) {
- delete $hostdom{$key};
- }
- foreach my $key (keys %hostip) {
- delete $hostip{$key};
- }
- foreach my $key (keys %hostdns) {
- delete $hostdns{$key};
- }
-}
-#
-# Read in the host table from file and distribute it into the various hashes:
-#
-# - %hostid - Indexed by IP, the loncapa hostname.
-# - %hostdom - Indexed by loncapa hostname, the domain.
-# - %hostip - Indexed by hostid, the Ip address of the host.
-sub ReadHostTable {
-
- open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
- my $myloncapaname = $perlvar{'lonHostID'};
- Debug("My loncapa name is : $myloncapaname");
- while (my $configline=) {
- if (!($configline =~ /^\s*\#/)) {
- my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
- chomp($ip); $ip=~s/\D+$//;
- $hostid{$ip}=$id; # LonCAPA name of host by IP.
- $hostdom{$id}=$domain; # LonCAPA domain name of host.
- $hostip{$id}=$ip; # IP address of host.
- $hostdns{$name} = $id; # LonCAPA name of host by DNS.
-
- if ($id eq $perlvar{'lonHostID'}) {
- Debug("Found me in the host table: $name");
- $thisserver=$name;
- }
- }
- }
- close(CONFIG);
-}
-#
# Reload the Apache daemon's state.
# This is done by invoking /home/httpd/perl/apachereload
# a setuid perl script that can be root for us to do this job.
@@ -3942,13 +5738,12 @@ sub UpdateHosts {
# either dropped or changed hosts. Note that the re-read of the table
# will take care of new and changed hosts as connections come into being.
+ &Apache::lonnet::reset_hosts_info();
- KillHostHashes;
- ReadHostTable;
-
- foreach my $child (keys %children) {
+ foreach my $child (keys(%children)) {
my $childip = $children{$child};
- if(!$hostid{$childip}) {
+ if ($childip ne '127.0.0.1'
+ && !defined(&Apache::lonnet::get_hosts_from_ip($childip))) {
logthis(' UpdateHosts killing child '
." $child for ip $childip ");
kill('INT', $child);
@@ -4033,12 +5828,15 @@ sub Debug {
#
sub Reply {
my ($fd, $reply, $request) = @_;
- print $fd $reply;
- Debug("Request was $request Reply was $reply");
-
+ if (ref($reply)) {
+ print $fd $$reply;
+ print $fd "\n";
+ if ($DEBUG) { Debug("Request was $request Reply was $$reply"); }
+ } else {
+ print $fd $reply;
+ if ($DEBUG) { Debug("Request was $request Reply was $reply"); }
+ }
$Transactions++;
-
-
}
@@ -4081,7 +5879,7 @@ sub logstatus {
flock(LOG,LOCK_EX);
print LOG $$."\t".$clientname."\t".$currenthostid."\t"
.$status."\t".$lastlog."\t $keymode\n";
- flock(DB,LOCK_UN);
+ flock(LOG,LOCK_UN);
close(LOG);
}
&status("Finished logging");
@@ -4110,79 +5908,6 @@ sub status {
$0='lond: '.$what.' '.$local;
}
-# -------------------------------------------------------- Escape Special Chars
-
-sub escape {
- my $str=shift;
- $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
- return $str;
-}
-
-# ----------------------------------------------------- Un-Escape Special Chars
-
-sub unescape {
- my $str=shift;
- $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- return $str;
-}
-
-# ----------------------------------------------------------- Send USR1 to lonc
-
-sub reconlonc {
- my $peerfile=shift;
- &logthis("Trying to reconnect for $peerfile");
- my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid";
- if (my $fh=IO::File->new("$loncfile")) {
- my $loncpid=<$fh>;
- chomp($loncpid);
- if (kill 0 => $loncpid) {
- &logthis("lonc at pid $loncpid responding, sending USR1");
- kill USR1 => $loncpid;
- } else {
- &logthis(
- "CRITICAL: "
- ."lonc at pid $loncpid not responding, giving up");
- }
- } else {
- &logthis('CRITICAL: lonc not running, giving up');
- }
-}
-
-# -------------------------------------------------- Non-critical communication
-
-sub subreply {
- my ($cmd,$server)=@_;
- my $peerfile="$perlvar{'lonSockDir'}/$server";
- my $sclient=IO::Socket::UNIX->new(Peer =>"$peerfile",
- Type => SOCK_STREAM,
- Timeout => 10)
- or return "con_lost";
- print $sclient "$cmd\n";
- my $answer=<$sclient>;
- chomp($answer);
- if (!$answer) { $answer="con_lost"; }
- return $answer;
-}
-
-sub reply {
- my ($cmd,$server)=@_;
- my $answer;
- if ($server ne $currenthostid) {
- $answer=subreply($cmd,$server);
- if ($answer eq 'con_lost') {
- $answer=subreply("ping",$server);
- if ($answer ne $server) {
- &logthis("sub reply: answer != server answer is $answer, server is $server");
- &reconlonc("$perlvar{'lonSockDir'}/$server");
- }
- $answer=subreply($cmd,$server);
- }
- } else {
- $answer='self_reply';
- }
- return $answer;
-}
-
# -------------------------------------------------------------- Talk to lonsql
sub sql_reply {
@@ -4200,25 +5925,13 @@ sub sub_sql_reply {
Type => SOCK_STREAM,
Timeout => 10)
or return "con_lost";
- print $sclient "$cmd\n";
+ print $sclient "$cmd:$currentdomainid\n";
my $answer=<$sclient>;
chomp($answer);
if (!$answer) { $answer="con_lost"; }
return $answer;
}
-# -------------------------------------------- Return path to profile directory
-
-sub propath {
- my ($udom,$uname)=@_;
- $udom=~s/\W//g;
- $uname=~s/\W//g;
- my $subdir=$uname.'__';
- $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
- my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
- return $proname;
-}
-
# --------------------------------------- Is this the home server of an author?
sub ishome {
@@ -4263,8 +5976,9 @@ $SIG{USR1} = \&checkchildren;
$SIG{USR2} = \&UpdateHosts;
# Read the host hashes:
+&Apache::lonnet::load_hosts_tab();
-ReadHostTable;
+my $dist=`$perlvar{'lonDaemons'}/distprobe`;
# --------------------------------------------------------------
# Accept connections. When a connection comes in, it is validated
@@ -4312,8 +6026,6 @@ sub make_new_child {
if (defined($iaddr)) {
$clientip = inet_ntoa($iaddr);
Debug("Connected with $clientip");
- $clientdns = gethostbyaddr($iaddr, AF_INET);
- Debug("Connected with $clientdns by name");
} else {
&logthis("Unable to determine clientip");
$clientip='Unavailable';
@@ -4343,7 +6055,10 @@ sub make_new_child {
# my $tmpsnum=0; # Now global
#---------------------------------------------------- kerberos 5 initialization
&Authen::Krb5::init_context();
- &Authen::Krb5::init_ets();
+ unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||
+ ($dist eq 'fedora6') || ($dist eq 'suse9.3')) {
+ &Authen::Krb5::init_ets();
+ }
&status('Accepted connection');
# =============================================================================
@@ -4351,20 +6066,23 @@ sub make_new_child {
# -----------------------------------------------------------------------------
# see if we know client and 'check' for spoof IP by ineffective challenge
- ReadManagerTable; # May also be a manager!!
-
- my $clientrec=($hostid{$clientip} ne undef);
- my $ismanager=($managers{$clientip} ne undef);
+ my $outsideip=$clientip;
+ if ($clientip eq '127.0.0.1') {
+ $outsideip=&Apache::lonnet::get_host_ip($perlvar{'lonHostID'});
+ }
+ &ReadManagerTable();
+ my $clientrec=defined(&Apache::lonnet::get_hosts_from_ip($outsideip));
+ my $ismanager=($managers{$outsideip} ne undef);
$clientname = "[unknonwn]";
if($clientrec) { # Establish client type.
$ConnectionType = "client";
- $clientname = $hostid{$clientip};
+ $clientname = (&Apache::lonnet::get_hosts_from_ip($outsideip))[-1];
if($ismanager) {
$ConnectionType = "both";
}
} else {
$ConnectionType = "manager";
- $clientname = $managers{$clientip};
+ $clientname = $managers{$outsideip};
}
my $clientok;
@@ -4377,7 +6095,7 @@ sub make_new_child {
my $remotereq=<$client>;
chomp($remotereq);
Debug("Got init: $remotereq");
- my $inikeyword = split(/:/, $remotereq);
+
if ($remotereq =~ /^init/) {
&sethost("sethost:$perlvar{'lonHostID'}");
#
@@ -4465,14 +6183,9 @@ sub make_new_child {
if ($clientok) {
# ---------------- New known client connecting, could mean machine online again
-
- foreach my $id (keys(%hostip)) {
- if ($hostip{$id} ne $clientip ||
- $hostip{$currenthostid} eq $clientip) {
- # no need to try to do recon's to myself
- next;
- }
- &reconlonc("$perlvar{'lonSockDir'}/$id");
+ if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip
+ && $clientip ne '127.0.0.1') {
+ &Apache::lonnet::reconlonc($clientname);
}
&logthis("Established connection: $clientname");
&status('Will listen to '.$clientname);
@@ -4508,8 +6221,38 @@ sub make_new_child {
exit;
}
+#
+# Determine if a user is an author for the indicated domain.
+#
+# Parameters:
+# domain - domain to check in .
+# user - Name of user to check.
+#
+# Return:
+# 1 - User is an author for domain.
+# 0 - User is not an author for domain.
+sub is_author {
+ my ($domain, $user) = @_;
+
+ &Debug("is_author: $user @ $domain");
+ my $hashref = &tie_user_hash($domain, $user, "roles",
+ &GDBM_READER());
+ # Author role should show up as a key /domain/_au
+
+ my $key = "/$domain/_au";
+ my $value;
+ if (defined($hashref)) {
+ $value = $hashref->{$key};
+ }
+
+ if(defined($value)) {
+ &Debug("$user @ $domain is an author");
+ }
+
+ return defined($value);
+}
#
# Checks to see if the input roleput request was to set
# an author role. If so, invokes the lchtmldir script to set
@@ -4521,16 +6264,17 @@ sub make_new_child {
# user - Name of the user for which the role is being put.
# authtype - The authentication type associated with the user.
#
-sub manage_permissions
-{
-
+sub manage_permissions {
my ($request, $domain, $user, $authtype) = @_;
+ &Debug("manage_permissions: $request $domain $user $authtype");
+
# See if the request is of the form /$domain/_au
- if($request =~ /^(\/$domain\/_au)$/) { # It's an author rolesput...
+ if($request =~ /^(\/\Q$domain\E\/_au)$/) { # It's an author rolesput...
my $execdir = $perlvar{'lonDaemons'};
my $userhome= "/home/$user" ;
&logthis("system $execdir/lchtmldir $userhome $user $authtype");
+ &Debug("Setting homedir permissions for $userhome");
system("$execdir/lchtmldir $userhome $user $authtype");
}
}
@@ -4546,12 +6290,7 @@ sub manage_permissions
#
sub password_path {
my ($domain, $user) = @_;
-
-
- my $path = &propath($domain, $user);
- $path .= "/passwd";
-
- return $path;
+ return &propath($domain, $user).'/passwd';
}
# Password Filename
@@ -4626,12 +6365,7 @@ sub get_auth_type
Debug("Password info = $realpassword\n");
my ($authtype, $contentpwd) = split(/:/, $realpassword);
Debug("Authtype = $authtype, content = $contentpwd\n");
- my $availinfo = '';
- if($authtype eq 'krb4' or $authtype eq 'krb5') {
- $availinfo = $contentpwd;
- }
-
- return "$authtype:$availinfo";
+ return "$authtype:$contentpwd";
} else {
Debug("Returning nouser");
return "nouser";
@@ -4654,8 +6388,7 @@ sub get_auth_type
# 0 - The domain,user,password triplet is not a valid user.
#
sub validate_user {
- my ($domain, $user, $password) = @_;
-
+ my ($domain, $user, $password, $checkdefauth) = @_;
# Why negative ~pi you may well ask? Well this function is about
# authentication, and therefore very important to get right.
@@ -4664,7 +6397,8 @@ sub validate_user {
# At the end of this function. I'll ensure that it's not still that
# value so we don't just wind up returning some accidental value
# as a result of executing an unforseen code path that
- # did not set $validated.
+ # did not set $validated. At the end of valid execution paths,
+ # validated shoule be 1 for success or 0 for failuer.
my $validated = -3.14159;
@@ -4677,8 +6411,21 @@ sub validate_user {
my $null = pack("C",0); # Used by kerberos auth types.
+ if ($howpwd eq 'nouser') {
+ if ($checkdefauth) {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+ if ($domdefaults{'auth_def'} eq 'localauth') {
+ $howpwd = $domdefaults{'auth_def'};
+ $contentpwd = $domdefaults{'auth_arg_def'};
+ } elsif ((($domdefaults{'auth_def'} eq 'krb4') ||
+ ($domdefaults{'auth_def'} eq 'krb5')) &&
+ ($domdefaults{'auth_arg_def'} ne '')) {
+ $howpwd = $domdefaults{'auth_def'};
+ $contentpwd = $domdefaults{'auth_arg_def'};
+ }
+ }
+ }
if ($howpwd ne 'nouser') {
-
if($howpwd eq "internal") { # Encrypted is in local password file.
$validated = (crypt($password, $contentpwd) eq $contentpwd);
}
@@ -4727,12 +6474,24 @@ sub validate_user {
my $krbservice = "krbtgt/".$contentpwd."\@".$contentpwd;
my $krbserver = &Authen::Krb5::parse_name($krbservice);
my $credentials= &Authen::Krb5::cc_default();
- $credentials->initialize($krbclient);
- my $krbreturn = &Authen::KRb5::get_in_tkt_with_password($krbclient,
- $krbserver,
- $password,
- $credentials);
- $validated = ($krbreturn == 1);
+ $credentials->initialize(&Authen::Krb5::parse_name($user.'@'
+ .$contentpwd));
+ my $krbreturn;
+ if (exists(&Authen::Krb5::get_init_creds_password)) {
+ $krbreturn =
+ &Authen::Krb5::get_init_creds_password($krbclient,$password,
+ $krbservice);
+ $validated = (ref($krbreturn) eq 'Authen::Krb5::Creds');
+ } else {
+ $krbreturn =
+ &Authen::Krb5::get_in_tkt_with_password($krbclient,$krbserver,
+ $password,$credentials);
+ $validated = ($krbreturn == 1);
+ }
+ if (!$validated) {
+ &logthis('krb5: '.$user.', '.$contentpwd.', '.
+ &Authen::Krb5::error());
+ }
} else {
$validated = 0;
}
@@ -4740,7 +6499,12 @@ sub validate_user {
# Authenticate via installation specific authentcation method:
$validated = &localauth::localauth($user,
$password,
- $contentpwd);
+ $contentpwd,
+ $domain);
+ if ($validated < 0) {
+ &logthis("localauth for $contentpwd $user:$domain returned a $validated");
+ $validated = 0;
+ }
} else { # Unrecognized auth is also bad.
$validated = 0;
}
@@ -4752,7 +6516,11 @@ sub validate_user {
#
unless ($validated != -3.14159) {
- die "ValidateUser - failed to set the value of validated";
+ # I >really really< want to know if this happens.
+ # since it indicates that user authentication is badly
+ # broken in some code path.
+ #
+ die "ValidateUser - failed to set the value of validated $domain, $user $password";
}
return $validated;
}
@@ -4762,8 +6530,7 @@ sub addline {
my ($fname,$hostid,$ip,$newline)=@_;
my $contents;
my $found=0;
- my $expr='^'.$hostid.':'.$ip.':';
- $expr =~ s/\./\\\./g;
+ my $expr='^'.quotemeta($hostid).':'.quotemeta($ip).':';
my $sh;
if ($sh=IO::File->new("$fname.subscription")) {
while (my $subline=<$sh>) {
@@ -4779,39 +6546,51 @@ sub addline {
}
sub get_chat {
- my ($cdom,$cname,$udom,$uname)=@_;
- my %hash;
- my $proname=&propath($cdom,$cname);
+ my ($cdom,$cname,$udom,$uname,$group)=@_;
+
my @entries=();
- if (tie(%hash,'GDBM_File',"$proname/nohist_chatroom.db",
- &GDBM_READER(),0640)) {
- @entries=map { $_.':'.$hash{$_} } sort keys %hash;
- untie %hash;
+ my $namespace = 'nohist_chatroom';
+ my $namespace_inroom = 'nohist_inchatroom';
+ if ($group ne '') {
+ $namespace .= '_'.$group;
+ $namespace_inroom .= '_'.$group;
+ }
+ my $hashref = &tie_user_hash($cdom, $cname, $namespace,
+ &GDBM_READER());
+ if ($hashref) {
+ @entries=map { $_.':'.$hashref->{$_} } sort(keys(%$hashref));
+ &untie_user_hash($hashref);
}
my @participants=();
my $cutoff=time-60;
- if (tie(%hash,'GDBM_File',"$proname/nohist_inchatroom.db",
- &GDBM_WRCREAT(),0640)) {
- $hash{$uname.':'.$udom}=time;
- foreach (sort keys %hash) {
- if ($hash{$_}>$cutoff) {
- $participants[$#participants+1]='active_participant:'.$_;
+ $hashref = &tie_user_hash($cdom, $cname, $namespace_inroom,
+ &GDBM_WRCREAT());
+ if ($hashref) {
+ $hashref->{$uname.':'.$udom}=time;
+ foreach my $user (sort(keys(%$hashref))) {
+ if ($hashref->{$user}>$cutoff) {
+ push(@participants, 'active_participant:'.$user);
}
}
- untie %hash;
+ &untie_user_hash($hashref);
}
return (@participants,@entries);
}
sub chat_add {
- my ($cdom,$cname,$newchat)=@_;
- my %hash;
- my $proname=&propath($cdom,$cname);
+ my ($cdom,$cname,$newchat,$group)=@_;
my @entries=();
my $time=time;
- if (tie(%hash,'GDBM_File',"$proname/nohist_chatroom.db",
- &GDBM_WRCREAT(),0640)) {
- @entries=map { $_.':'.$hash{$_} } sort keys %hash;
+ my $namespace = 'nohist_chatroom';
+ my $logfile = 'chatroom.log';
+ if ($group ne '') {
+ $namespace .= '_'.$group;
+ $logfile = 'chatroom_'.$group.'.log';
+ }
+ my $hashref = &tie_user_hash($cdom, $cname, $namespace,
+ &GDBM_WRCREAT());
+ if ($hashref) {
+ @entries=map { $_.':'.$hashref->{$_} } sort(keys(%$hashref));
my ($lastid)=($entries[$#entries]=~/^(\w+)\:/);
my ($thentime,$idnum)=split(/\_/,$lastid);
my $newid=$time.'_000000';
@@ -4821,21 +6600,22 @@ sub chat_add {
$idnum=substr('000000'.$idnum,-6,6);
$newid=$time.'_'.$idnum;
}
- $hash{$newid}=$newchat;
+ $hashref->{$newid}=$newchat;
my $expired=$time-3600;
- foreach (keys %hash) {
- my ($thistime)=($_=~/(\d+)\_/);
+ foreach my $comment (keys(%$hashref)) {
+ my ($thistime) = ($comment=~/(\d+)\_/);
if ($thistime<$expired) {
- delete $hash{$_};
+ delete $hashref->{$comment};
}
}
- untie %hash;
- }
- {
- my $hfh;
- if ($hfh=IO::File->new(">>$proname/chatroom.log")) {
- print $hfh "$time:".&unescape($newchat)."\n";
+ {
+ my $proname=&propath($cdom,$cname);
+ if (open(CHATLOG,">>$proname/$logfile")) {
+ print CHATLOG ("$time:".&unescape($newchat)."\n");
+ }
+ close(CHATLOG);
}
+ &untie_user_hash($hashref);
}
}
@@ -4924,7 +6704,7 @@ sub thisversion {
sub subscribe {
my ($userinput,$clientip)=@_;
my $result;
- my ($cmd,$fname)=split(/:/,$userinput);
+ my ($cmd,$fname)=split(/:/,$userinput,2);
my $ownership=&ishome($fname);
if ($ownership eq 'owner') {
# explitly asking for the current version?
@@ -4957,7 +6737,7 @@ sub subscribe {
# the metadata
unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
$fname=~s/\/home\/httpd\/html\/res/raw/;
- $fname="http://$thisserver/".$fname;
+ $fname="http://".&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
$result="$fname\n";
}
} else {
@@ -4968,14 +6748,47 @@ sub subscribe {
}
return $result;
}
+# Change the passwd of a unix user. The caller must have
+# first verified that the user is a loncapa user.
+#
+# Parameters:
+# user - Unix user name to change.
+# pass - New password for the user.
+# Returns:
+# ok - if success
+# other - Some meaningfule error message string.
+# NOTE:
+# invokes a setuid script to change the passwd.
+sub change_unix_password {
+ my ($user, $pass) = @_;
+
+ &Debug("change_unix_password");
+ my $execdir=$perlvar{'lonDaemons'};
+ &Debug("Opening lcpasswd pipeline");
+ my $pf = IO::File->new("|$execdir/lcpasswd > "
+ ."$perlvar{'lonDaemons'}"
+ ."/logs/lcpasswd.log");
+ print $pf "$user\n$pass\n$pass\n";
+ close $pf;
+ my $err = $?;
+ return ($err < @passwderrors) ? $passwderrors[$err] :
+ "pwchange_falure - unknown error";
+
+
+}
+
sub make_passwd_file {
my ($uname, $umode,$npass,$passfilename)=@_;
- my $result="ok\n";
+ my $result="ok";
if ($umode eq 'krb4' or $umode eq 'krb5') {
{
my $pf = IO::File->new(">$passfilename");
- print $pf "$umode:$npass\n";
+ if ($pf) {
+ print $pf "$umode:$npass\n";
+ } else {
+ $result = "pass_file_failed_error";
+ }
}
} elsif ($umode eq 'internal') {
my $salt=time;
@@ -4984,12 +6797,20 @@ sub make_passwd_file {
{
&Debug("Creating internal auth");
my $pf = IO::File->new(">$passfilename");
- print $pf "internal:$ncpass\n";
+ if($pf) {
+ print $pf "internal:$ncpass\n";
+ } else {
+ $result = "pass_file_failed_error";
+ }
}
} elsif ($umode eq 'localauth') {
{
my $pf = IO::File->new(">$passfilename");
- print $pf "localauth:$npass\n";
+ if($pf) {
+ print $pf "localauth:$npass\n";
+ } else {
+ $result = "pass_file_failed_error";
+ }
}
} elsif ($umode eq 'unix') {
{
@@ -5015,40 +6836,65 @@ sub make_passwd_file {
print $se "$npass\n";
print $se "$lc_error_file\n"; # Status -> unique file.
}
- my $error = IO::File->new("< $lc_error_file");
- my $useraddok = <$error>;
- $error->close;
- unlink($lc_error_file);
-
- chomp $useraddok;
-
- if($useraddok > 0) {
- my $error_text = &lcuseraddstrerror($useraddok);
- &logthis("Failed lcuseradd: $error_text");
- $result = "lcuseradd_failed:$error_text\n";
+ if (-r $lc_error_file) {
+ &Debug("Opening error file: $lc_error_file");
+ my $error = IO::File->new("< $lc_error_file");
+ my $useraddok = <$error>;
+ $error->close;
+ unlink($lc_error_file);
+
+ chomp $useraddok;
+
+ if($useraddok > 0) {
+ my $error_text = &lcuseraddstrerror($useraddok);
+ &logthis("Failed lcuseradd: $error_text");
+ $result = "lcuseradd_failed:$error_text";
+ } else {
+ my $pf = IO::File->new(">$passfilename");
+ if($pf) {
+ print $pf "unix:\n";
+ } else {
+ $result = "pass_file_failed_error";
+ }
+ }
} else {
- my $pf = IO::File->new(">$passfilename");
- print $pf "unix:\n";
+ &Debug("Could not locate lcuseradd error: $lc_error_file");
+ $result="bug_lcuseradd_no_output_file";
}
}
} elsif ($umode eq 'none') {
{
my $pf = IO::File->new("> $passfilename");
- print $pf "none:\n";
+ if($pf) {
+ print $pf "none:\n";
+ } else {
+ $result = "pass_file_failed_error";
+ }
}
} else {
- $result="auth_mode_error\n";
+ $result="auth_mode_error";
}
return $result;
}
+sub convert_photo {
+ my ($start,$dest)=@_;
+ system("convert $start $dest");
+}
+
sub sethost {
my ($remotereq) = @_;
my (undef,$hostid)=split(/:/,$remotereq);
+ # ignore sethost if we are already correct
+ if ($hostid eq $currenthostid) {
+ return 'ok';
+ }
+
if (!defined($hostid)) { $hostid=$perlvar{'lonHostID'}; }
- if ($hostip{$perlvar{'lonHostID'}} eq $hostip{$hostid}) {
+ if (&Apache::lonnet::get_host_ip($perlvar{'lonHostID'})
+ eq &Apache::lonnet::get_host_ip($hostid)) {
$currenthostid =$hostid;
- $currentdomainid=$hostdom{$hostid};
+ $currentdomainid=&Apache::lonnet::host_domain($hostid);
&logthis("Setting hostid to $hostid, and domain to $currentdomainid");
} else {
&logthis("Requested host id $hostid not an alias of ".
@@ -5064,96 +6910,6 @@ sub version {
return "version:$VERSION";
}
-#There is a copy of this in lonnet.pm
-sub userload {
- my $numusers=0;
- {
- opendir(LONIDS,$perlvar{'lonIDsDir'});
- my $filename;
- my $curtime=time;
- while ($filename=readdir(LONIDS)) {
- if ($filename eq '.' || $filename eq '..') {next;}
- my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
- if ($curtime-$mtime < 1800) { $numusers++; }
- }
- closedir(LONIDS);
- }
- my $userloadpercent=0;
- my $maxuserload=$perlvar{'lonUserLoadLim'};
- if ($maxuserload) {
- $userloadpercent=100*$numusers/$maxuserload;
- }
- $userloadpercent=sprintf("%.2f",$userloadpercent);
- return $userloadpercent;
-}
-
-# Routines for serializing arrays and hashes (copies from lonnet)
-
-sub array2str {
- my (@array) = @_;
- my $result=&arrayref2str(\@array);
- $result=~s/^__ARRAY_REF__//;
- $result=~s/__END_ARRAY_REF__$//;
- return $result;
-}
-
-sub arrayref2str {
- my ($arrayref) = @_;
- my $result='__ARRAY_REF__';
- foreach my $elem (@$arrayref) {
- if(ref($elem) eq 'ARRAY') {
- $result.=&arrayref2str($elem).'&';
- } elsif(ref($elem) eq 'HASH') {
- $result.=&hashref2str($elem).'&';
- } elsif(ref($elem)) {
- #print("Got a ref of ".(ref($elem))." skipping.");
- } else {
- $result.=&escape($elem).'&';
- }
- }
- $result=~s/\&$//;
- $result .= '__END_ARRAY_REF__';
- return $result;
-}
-
-sub hash2str {
- my (%hash) = @_;
- my $result=&hashref2str(\%hash);
- $result=~s/^__HASH_REF__//;
- $result=~s/__END_HASH_REF__$//;
- return $result;
-}
-
-sub hashref2str {
- my ($hashref)=@_;
- my $result='__HASH_REF__';
- foreach (sort(keys(%$hashref))) {
- if (ref($_) eq 'ARRAY') {
- $result.=&arrayref2str($_).'=';
- } elsif (ref($_) eq 'HASH') {
- $result.=&hashref2str($_).'=';
- } elsif (ref($_)) {
- $result.='=';
- #print("Got a ref of ".(ref($_))." skipping.");
- } else {
- if ($_) {$result.=&escape($_).'=';} else { last; }
- }
-
- if(ref($hashref->{$_}) eq 'ARRAY') {
- $result.=&arrayref2str($hashref->{$_}).'&';
- } elsif(ref($hashref->{$_}) eq 'HASH') {
- $result.=&hashref2str($hashref->{$_}).'&';
- } elsif(ref($hashref->{$_})) {
- $result.='&';
- #print("Got a ref of ".(ref($hashref->{$_}))." skipping.");
- } else {
- $result.=&escape($hashref->{$_}).'&';
- }
- }
- $result=~s/\&$//;
- $result .= '__END_HASH_REF__';
- return $result;
-}
# ----------------------------------- POD (plain old documentation, CPAN style)
@@ -5470,7 +7226,6 @@ to the client, and the connection is clo
IO::Socket
IO::File
Apache::File
-Symbol
POSIX
Crypt::IDEA
LWP::UserAgent()
@@ -5489,3 +7244,406 @@ linux
Server/Process
=cut
+
+
+=pod
+
+=head1 LOG MESSAGES
+
+The messages below can be emitted in the lond log. This log is located
+in ~httpd/perl/logs/lond.log Many log messages have HTML encapsulation
+to provide coloring if examined from inside a web page. Some do not.
+Where color is used, the colors are; Red for sometihhng to get excited
+about and to follow up on. Yellow for something to keep an eye on to
+be sure it does not get worse, Green,and Blue for informational items.
+
+In the discussions below, sometimes reference is made to ~httpd
+when describing file locations. There isn't really an httpd
+user, however there is an httpd directory that gets installed in the
+place that user home directories go. On linux, this is usually
+(always?) /home/httpd.
+
+
+Some messages are colorless. These are usually (not always)
+Green/Blue color level messages.
+
+=over 2
+
+=item (Red) LocalConnection rejecting non local: ne 127.0.0.1
+
+A local connection negotiation was attempted by
+a host whose IP address was not 127.0.0.1.
+The socket is closed and the child will exit.
+lond has three ways to establish an encyrption
+key with a client:
+
+=over 2
+
+=item local
+
+The key is written and read from a file.
+This is only valid for connections from localhost.
+
+=item insecure
+
+The key is generated by the server and
+transmitted to the client.
+
+=item ssl (secure)
+
+An ssl connection is negotiated with the client,
+the key is generated by the server and sent to the
+client across this ssl connection before the
+ssl connectionis terminated and clear text
+transmission resumes.
+
+=back
+
+=item (Red) LocalConnection: caller is insane! init = and type =
+
+The client is local but has not sent an initialization
+string that is the literal "init:local" The connection
+is closed and the child exits.
+
+=item Red CRITICAL Can't get key file
+
+SSL key negotiation is being attempted but the call to
+lonssl::KeyFile failed. This usually means that the
+configuration file is not correctly defining or protecting
+the directories/files lonCertificateDirectory or
+lonnetPrivateKey
+ is a string that describes the reason that
+the key file could not be located.
+
+=item (Red) CRITICAL Can't get certificates
+
+SSL key negotiation failed because we were not able to retrives our certificate
+or the CA's certificate in the call to lonssl::CertificateFile
+ 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
+
+=item Permission error:
+
+The directory pointed to by lonCertificateDirectory is not readable by lond
+
+=item Permission error:
+
+Files in the directory pointed to by lonCertificateDirectory are not readable by lond.
+
+=item Installation error:
+
+Either the certificate authority file or the certificate have not
+been installed in lonCertificateDirectory.
+
+=item (Red) CRITICAL SSL Socket promotion failed:
+
+The promotion of the connection from plaintext to SSL failed
+ is the reason for the failure. There are two
+system calls involved in the promotion (one of which failed),
+a dup to produce
+a second fd on the raw socket over which the encrypted data
+will flow and IO::SOcket::SSL->new_from_fd which creates
+the SSL connection on the duped fd.
+
+=item (Blue) WARNING client did not respond to challenge
+
+This occurs on an insecure (non SSL) connection negotiation request.
+lond generates some number from the time, the PID and sends it to
+the client. The client must respond by echoing this information back.
+If the client does not do so, that's a violation of the challenge
+protocols and the connection will be failed.
+
+=item (Red) No manager table. Nobody can manage!!
+
+lond has the concept of privileged hosts that
+can perform remote management function such
+as update the hosts.tab. The manager hosts
+are described in the
+~httpd/lonTabs/managers.tab file.
+this message is logged if this file is missing.
+
+
+=item (Green) Registering manager as with
+
+Reports the successful parse and registration
+of a specific manager.
+
+=item Green existing host
+
+The manager host is already defined in the hosts.tab
+the information in that table, rather than the info in the
+manager table will be used to determine the manager's ip.
+
+=item (Red) Unable to craete
+
+lond has been asked to create new versions of an administrative
+file (by a manager). When this is done, the new file is created
+in a temp file and then renamed into place so that there are always
+usable administrative files, even if the update fails. This failure
+message means that the temp file could not be created.
+The update is abandoned, and the old file is available for use.
+
+=item (Green) CopyFile from to failed
+
+In an update of administrative files, the copy of the existing file to a
+backup file failed. The installation of the new file may still succeed,
+but there will not be a back up file to rever to (this should probably
+be yellow).
+
+=item (Green) Pushfile: backed up to
+
+See above, the backup of the old administrative file succeeded.
+
+=item (Red) Pushfile: Unable to install
+
+The new administrative file could not be installed. In this case,
+the old administrative file is still in use.
+
+=item (Green) Installed new < filename>.
+
+The new administrative file was successfullly installed.
+
+=item (Red) Reinitializing lond pid=
+
+The lonc child process will be sent a USR2
+signal.
+
+=item (Red) Reinitializing self
+
+We've been asked to re-read our administrative files,and
+are doing so.
+
+=item (Yellow) error:Invalid process identifier
+
+A reinit command was received, but the target part of the
+command was not valid. It must be either
+'lond' or 'lonc' but was
+
+=item (Green) isValideditCommand checking: Command = Key = newline =
+
+Checking to see if lond has been handed a valid edit
+command. It is possible the edit command is not valid
+in that case there are no log messages to indicate that.
+
+=item Result of password change for pwchange_success
+
+The password for was
+successfully changed.
+
+=item Unable to open passwd to change password
+
+Could not rewrite the
+internal password file for a user
+
+=item Result of password change for :
+
+A unix password change for was attempted
+and the pipe returned
+
+=item LWP GET: for ()
+
+The lightweight process fetch for a resource failed
+with the local filename that should
+have existed/been created was the
+corresponding URI: This is emitted in several
+places.
+
+=item Unable to move to
+
+From fetch_user_file_handler - the user file was replicated but could not
+be mv'd to its final location.
+
+=item Looking for
+
+From user_has_session_handler - This should be a Debug call instead
+it indicates lond is about to check whether the specified user has a
+session active on the specified domain on the local host.
+
+=item Client () hanging up:
+
+lond has been asked to exit by its client. The and identify the
+client systemand is the full exit command sent to the server.
+
+=item Red CRITICAL: ABNORMAL EXIT. child for server died through a crass with this error->[].
+
+A lond child terminated. NOte that this termination can also occur when the
+child receives the QUIT or DIE signals. is the process id of the child,
+ the host lond is working for, and the reason the child died
+to the best of our ability to get it (I would guess that any numeric value
+represents and errno value). This is immediately followed by
+
+=item Famous last words: Catching exception -
+
+Where log is some recent information about the state of the child.
+
+=item Red CRITICAL: TIME OUT
+
+Some timeout occured for server . THis is normally a timeout on an LWP
+doing an HTTP::GET.
+
+=item child died
+
+The reaper caught a SIGCHILD for the lond child process
+This should be modified to also display the IP of the dying child
+$children{$pid}
+
+=item Unknown child 0 died
+A child died but the wait for it returned a pid of zero which really should not
+ever happen.
+
+=item Child - looks like we missed it's death
+
+When a sigchild is received, the reaper process checks all children to see if they are
+alive. If children are dying quite quickly, the lack of signal queuing can mean
+that a signal hearalds the death of more than one child. If so this message indicates
+which other one died. is the ip of a dead child
+
+=item Free socket:
+
+The HUNTSMAN sub was called due to a SIGINT in a child process. The socket is being shutdown.
+for whatever reason, is printed but in fact shutdown() is not documented
+to return anything. This is followed by:
+
+=item Red CRITICAL: Shutting down
+
+Just prior to exit.
+
+=item Free socket:
+
+The HUPSMAN sub was called due to a SIGHUP. all children get killsed, and lond execs itself.
+This is followed by:
+
+=item (Red) CRITICAL: Restarting
+
+lond is about to exec itself to restart.
+
+=item (Blue) Updating connections
+
+(In response to a USR2). All the children (except the one for localhost)
+are about to be killed, the hosts tab reread, and Apache reloaded via apachereload.
+
+=item (Blue) UpdateHosts killing child for ip
+
+Due to USR2 as above.
+
+=item (Green) keeping child for ip (pid = )
+
+In response to USR2 as above, the child indicated is not being restarted because
+it's assumed that we'll always need a child for the localhost.
+
+
+=item Going to check on the children
+
+Parent is about to check on the health of the child processes.
+Note that this is in response to a USR1 sent to the parent lond.
+there may be one or more of the next two messages:
+
+=item is dead
+
+A child that we have in our child hash as alive has evidently died.
+
+=item Child did not respond
+
+In the health check the child did not update/produce a pid_.txt
+file when sent it's USR1 signal. That process is killed with a 9 signal, as it's
+assumed to be hung in some un-fixable way.
+
+=item Finished checking children
+
+Master processs's USR1 processing is cojmplete.
+
+=item (Red) CRITICAL: ------- Starting ------
+
+(There are more '-'s on either side). Lond has forked itself off to
+form a new session and is about to start actual initialization.
+
+=item (Green) Attempting to start child ()
+
+Started a new child process for . Client is IO::Socket object
+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.
+
+=item Unable to determine clientip
+
+In child process initialization. The peer address from getpeername was not defined.
+The client address is stored as "Unavailable" and processing continues.
+
+=item (Yellow) INFO: Connection connection type =
+
+In child initialization. A good connectionw as received from .
+
+=over 2
+
+=item
+
+is the name of the client from hosts.tab.
+
+=item
+
+Is the connection type which is either
+
+=over 2
+
+=item manager
+
+The connection is from a manager node, not in hosts.tab
+
+=item client
+
+the connection is from a non-manager in the hosts.tab
+
+=item both
+
+The connection is from a manager in the hosts.tab.
+
+=back
+
+=back
+
+=item (Blue) Certificates not installed -- trying insecure auth
+
+One of the certificate file, key file or
+certificate authority file could not be found for a client attempting
+SSL connection intiation. COnnection will be attemptied in in-secure mode.
+(this would be a system with an up to date lond that has not gotten a
+certificate from us).
+
+=item (Green) Successful local authentication
+
+A local connection successfully negotiated the encryption key.
+In this case the IDEA key is in a file (that is hopefully well protected).
+
+=item (Green) Successful ssl authentication with
+
+The client ( is the peer's name in hosts.tab), has successfully
+negotiated an SSL connection with this child process.
+
+=item (Green) Successful insecure authentication with
+
+
+The client has successfully negotiated an insecure connection withthe child process.
+
+=item (Yellow) Attempted insecure connection disallowed
+
+The client attempted and failed to successfully negotiate a successful insecure
+connection. This can happen either because the variable londAllowInsecure is false
+or undefined, or becuse the child did not successfully echo back the challenge
+string.
+
+
+=back
+
+
+=cut